diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index dd4e63b77b..2d26dfb144 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -2,24 +2,33 @@ name: Pygments
 
 on: [push, pull_request]
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        exclude:
+          - os: ubuntu-latest
+            python-version: "3.6"
+        include:
+          - os: ubuntu-20.04
+            python-version: "3.6"
       max-parallel: 4
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        cache: 'pip'
     - name: Install package
       run: |
-        python -m pip install --upgrade pip
         pip install -r requirements.txt
         pip install .
     - name: Test package
@@ -28,8 +37,8 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
     - name: Run make check
       run: make check
     - name: Fail if the basic checks failed
@@ -39,8 +48,8 @@ jobs:
   check-mapfiles:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
     - name: Regenerate mapfiles
       run: make mapfiles
     - name: Fail if mapfiles changed
@@ -53,8 +62,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Check out regexlint
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 66a57b8dd3..41adf4e24f 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -5,8 +5,12 @@ on:
     branches:
       - master
 
+permissions: {}
 jobs:
   build:
+    permissions:
+      contents: write # to push pages branch (peaceiris/actions-gh-pages)
+
     runs-on: ubuntu-latest
     steps:
     - name: Setup Python
diff --git a/AUTHORS b/AUTHORS
index 9f417bf909..18a32c683f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -136,12 +136,14 @@ Other contributors, listed alphabetically, are:
 * Sylvestre Ledru -- Scilab lexer
 * Chee Sing Lee -- Flatline lexer
 * Mark Lee -- Vala lexer
+* Pete Lomax -- Phix lexer
 * Valentin Lorentz -- C++ lexer improvements
 * Ben Mabey -- Gherkin lexer
 * Angus MacArthur -- QML lexer
 * Louis Mandel -- X10 lexer
 * Louis Marchand -- Eiffel lexer
 * Simone Margaritelli -- Hybris lexer
+* Tim Martin - World of Warcraft TOC lexer
 * Kirk McDonald -- D lexer
 * Gordon McGregor -- SystemVerilog lexer
 * Stephen McKamey -- Duel/JBST lexer
diff --git a/CHANGES b/CHANGES
index cd9eb9a2ff..2aa54fac30 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,77 @@ Pygments changelog
 
 Pull request numbers before 2.4.2 are not linked as they refer to the now defunct Bitbucket project.
 
+Version 2.14.0
+--------------
+(released January 1st, 2023)
+
+- Added lexers:
+
+  * Arturo (#2259)
+  * GAP session (#2211)
+  * Fift (#2249)
+  * func (#2232)
+  * Jsonnet (#2239)
+  * Minecraft schema (#2276)
+  * MIPS (#2228)
+  * Phix (#2222)
+  * Portugol (#2300)
+  * TL-b (#2247)
+  * World of Warcraft TOC format (#2244, #2245)
+  * Wren (#2271)
+
+- Updated lexers:
+
+  * Abap: Update keywords (#2281)
+  * Alloy: Update for Alloy 6 (#1963)
+  * C family (C, C++ and many others):
+    
+    - Fix an issue where a chunk would be wrongly recognized as a function
+      definition due to braces in comments (#2210)
+    - Improve parantheses handling for function definitions (#2207, #2208)
+
+  * C#: Fix number and operator recognition (#2256, #2257)
+  * CSound: Updated builtins (#2268)
+  * F#: Add ``.fsx`` file extension (#2282)
+  * gas (GNU assembler): recognize braces as punctuation (#2230)
+  * HTTP: Add `CONNECT` keyword (#2242)
+  * Inform 6: Fix lexing of properties and doubles (#2214)
+  * INI: Allow comments that are not their own line (#2217, #2161)
+  * Java properties: Fix issue with whitespace-delimited keys, support
+    comments starting with `!` and escapes, no longer support undocumented
+    `;` and `//` comments (#2241)
+  * LilyPond: Improve heuristics, add ``\maxima`` duration (#2283)
+  * LLVM: Add opaque pointer type (#2269)
+  * Macaulay2: Update keywords (#2305)
+  * Minecraft-related lexers (SNB and Minecraft function) moved to
+    ``pygments.lexers.minecraft`` (#2276)
+  * Nim: General improvements (#1970)
+  * Nix: Fix single quotes inside indented strings (#2289)
+  * Objective J: Fix catastrophic backtracking (#2225)
+  * NASM: Add support for SSE/AVX/AVX-512 registers as well as 'rel'
+    and 'abs' address operators (#2212)
+  * Powershell:
+  
+    - Add ``local:`` keyword (#2254)
+    - Allow continuations without markers (#2262, #2263)
+
+  * Solidity: Add boolean operators (#2292)
+  * Spice: Add ``enum`` keyword and fix a bug regarding binary,
+    hexadecimal and octal number tokens (#2227)
+  * YAML: Accept colons in key names (#2277)
+
+- Fix `make mapfiles` when Pygments is not installed in editable mode
+  (#2223)
+
+- Support more filetypes and compression types in `autopygmentize` (#2219)
+- Merge consecutive tokens in Autohotkey, Clay (#2248)
+- Add ``.nasm`` as a recognized file type for NASM (#2280)
+- Add ``*Spec.hs`` as a recognized file type for ``HSpec`` (#2308)
+- Add ``*.pyi`` (for typing stub files) as a recognized file type for
+  Python (#2331)
+- The HTML lexer no longer emits empty spans for whitespace (#2304)
+- Fix ``IRCFormatter`` inserting linenumbers incorrectly (#2270)
+
 Version 2.13.0
 --------------
 (released August 15th, 2022)
@@ -22,29 +93,29 @@ Version 2.13.0
     elements of function headers, e.g. between the arguments and
     the opening brace for the body (#1891)
   * C++: Resolve several cases of ``Error`` tokens (#2207, #2208)
-  * Coq: add some common keywords, improve recognition of ``Set``
+  * Coq: Add some common keywords, improve recognition of ``Set``
     and qualified identifiers (#2158)
   * F*: Allow C-style comments anywhere in a line
-  * Fortran: fix catastrophic backtracking with backslashes in strings
+  * Fortran: Fix catastrophic backtracking with backslashes in strings
     (#2194)
   * Go: add support for generics (#2167)
-  * Inform: update for version 6.40 (#2190)
+  * Inform: Update for version 6.40 (#2190)
   * Isabelle: recognize cartouches (#2089)
   * Java: support multiline strings aka. text blocks (#2132)
-  * Kotlin: add ``value`` modifier (#2142)
-  * LilyPond: add some missing builtins
-  * Macaulay2: update builtins (#2139)
+  * Kotlin: Add ``value`` modifier (#2142)
+  * LilyPond: Add some missing builtins
+  * Macaulay2: Update builtins (#2139)
   * Matlab session: fix traceback when a line continuation ellipsis
     appears in the output (#2166)
-  * .NET: add aliases for LibreOffice Basic, OpenOfficeBasic and
+  * .NET: Add aliases for LibreOffice Basic, OpenOfficeBasic and
     StarOffice Basic (#2170)
-  * Nim: use ``Name.Builtin`` instead of ``Keyword.Type`` (#2136)
+  * Nim: Use ``Name.Builtin`` instead of ``Keyword.Type`` (#2136)
   * PHP: fix `\"$var\"` inside strings (#2105)
   * Python: only recognize ``\N``, ``\u`` and ``\U`` escape sequences
     in string literals, but not in bytes literals where they are
     not supported (#2204)
   * Tcl: support ``${name}`` variables (#2145)
-  * Terraform: accept leading whitespace for `<<` heredoc
+  * Terraform: Accept leading whitespace for `<<` heredoc
     delimiters (#2162)
   * Teraterm: Various improvements (#2165)
   * Spice: add support for the recently added features including more
diff --git a/Contributing.md b/Contributing.md
index 0d831f0b1f..93da428ca2 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -11,7 +11,7 @@ Goals & non-goals of Pygments
 Python support
 --------------
 
-Pygments supports all supported Python versions as per the [Python Developer's Guide](https://devguide.python.org/#status-of-python-branches). Additionally, the default Python version of the latest stable version of RHEL, Ubuntu LTS, and Debian are supported, even if they're officially EOL. Supporting other end-of-life versions is a non-goal of Pygments.
+Pygments supports all supported Python versions as per the [Python Developer's Guide](https://devguide.python.org/versions/). Additionally, the default Python version of the latest stable version of RHEL, Ubuntu LTS, and Debian are supported, even if they're officially EOL. Supporting other end-of-life versions is a non-goal of Pygments.
 
 Validation
 ----------
diff --git a/Makefile b/Makefile
index 427e5a47b0..e674732c2a 100644
--- a/Makefile
+++ b/Makefile
@@ -50,10 +50,10 @@ reindent:
 TEST = tests
 
 test:
-	@$(PYTHON) `which pytest` $(TEST)
+	@$(PYTHON) -m pytest $(TEST)
 
 test-coverage:
-	@$(PYTHON) `which pytest` --cov --cov-report=html --cov-report=term $(TEST)
+	@$(PYTHON) -m pytest --cov --cov-report=html --cov-report=term $(TEST)
 
 tox-test:
 	@tox -- $(TEST)
diff --git a/README.rst b/README.rst
index e9633e058d..204e46b146 100644
--- a/README.rst
+++ b/README.rst
@@ -48,11 +48,42 @@ Contribution guidelines are found in Contributing.md_.
 
 .. _Contributing.md: https://github.com/pygments/pygments/blob/master/Contributing.md
 
+Security considerations
+-----------------------
+
+Pygments provides no guarantees on execution time, which needs to be taken
+into consideration when using Pygments to process arbitrary user inputs. For
+example, if you have a web service which uses Pygments for highlighting, there
+may be inputs which will cause the Pygments process to run "forever" and/or use
+significant amounts of memory. This can subsequently be used to perform a
+remote denial-of-service attack on the server if the processes are not
+terminated quickly.
+
+Unfortunately, it's practically impossible to harden Pygments itself against 
+those issues: Some regular expressions can result in "catastrophic 
+backtracking", but other bugs like incorrect matchers can also
+cause similar problems, and there is no way to find them in an automated fashion
+(short of solving the halting problem.) Pygments has extensive unit tests, 
+automated randomized testing, and is also tested by `OSS-Fuzz <https://github.com/google/oss-fuzz/tree/master/projects/pygments>`_, 
+but we will never be able to eliminate all bugs in this area.
+
+Our recommendations are:
+
+* Ensure that the Pygments process is *terminated* after a reasonably short
+  timeout. In general Pygments should take seconds at most for reasonably-sized
+  input.
+* *Limit* the number of concurrent Pygments processes to avoid oversubscription
+  of resources.
+
+The Pygments authors will treat any bug resulting in long processing times with
+high priority -- it's one of those things that will be fixed in a patch release.
+When reporting a bug where you suspect super-linear execution times, please make
+sure to attach an input to reproduce it.
+
 The authors
 -----------
 
-Pygments is maintained by **Georg Brandl**, e-mail address *georg*\ *@*\ *python.org*
-and **Matthäus Chajdas**.
+Pygments is maintained by **Georg Brandl**, e-mail address *georg*\ *@*\ *python.org*, **Matthäus Chajdas** and **Jean Abou-Samra**.
 
 Many lexers and fixes have been contributed by **Armin Ronacher**, the rest of
 the `Pocoo <https://www.pocoo.org/>`_ team and **Tim Hatch**.
diff --git a/doc/_static/demo.css b/doc/_static/demo.css
index e14379af38..eaa4410418 100644
--- a/doc/_static/demo.css
+++ b/doc/_static/demo.css
@@ -17,6 +17,7 @@
     padding: 2px;
     width: 100%;
     min-height: 150px;
+    resize: vertical;
 }
 
 #hlcode {
diff --git a/doc/_templates/languages.html b/doc/_templates/languages.html
deleted file mode 100644
index e046a90612..0000000000
--- a/doc/_templates/languages.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "layout.html" %}
-
-{% block htmltitle %}<title>Languages {{ titlesuffix }}</title>{% endblock %}
-
-{% block body %}
-
-<h1>Languages</h1>
-
-<ul>
-{% for language in languages %}
-<li>
-    {% if language.url %}
-    <a href="{{language.url}}">{{language.name}}</a>
-    {% else %}
-    {{language.name}}
-    {% endif %}
-</li>
-{% endfor %}
-</ul>
-{{ body }}
-
-<h1>... that's all?</h1>
-
-Well, why not write your own? Contributing to Pygments is easy and fun. Take a
-look at the <a href="{{ pathto('docs/lexerdevelopment') }}">docs on lexer development</a>. Pull
-requests are welcome on <a href="https://github.com/pygments/pygments">GitHub</a>.
-
-Note: the languages listed here are supported in the development version. The
-latest release may lack a few of them.
-
-{% endblock %}
diff --git a/doc/conf.py b/doc/conf.py
index 0023585dfc..f42c35530b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -134,7 +134,6 @@
 # template names.
 html_additional_pages = {
     'styles': 'styles.html',
-    'languages': 'languages.html'
     }
 
 if os.environ.get('WEBSITE_BUILD'):
@@ -233,17 +232,8 @@
 def pg_context(app, pagename, templatename, ctx, event_arg):
     ctx['demo_active'] = bool(os.environ.get('WEBSITE_BUILD'))
 
-    if pagename in ('demo', 'languages'):
-        all_lexers = sorted(pygments.lexers.get_all_lexers(plugins=False), key=lambda x: x[0].lower())
     if pagename == 'demo':
-        ctx['lexers'] = all_lexers
-
-    if pagename == 'languages':
-        lexer_name_url = []
-        for entry in all_lexers:
-            lexer_cls = pygments.lexers.find_lexer_class(entry[0])
-            lexer_name_url.append({'name': entry[0], 'url': lexer_cls.url})
-        ctx['languages'] = lexer_name_url
+        ctx['lexers'] = sorted(pygments.lexers.get_all_lexers(plugins=False), key=lambda x: x[0].lower())
 
     if pagename in ('styles', 'demo'):
         with open('examples/example.py') as f:
diff --git a/doc/docs/index.rst b/doc/docs/index.rst
index 6910913e21..d35fe6f0da 100644
--- a/doc/docs/index.rst
+++ b/doc/docs/index.rst
@@ -58,6 +58,7 @@ Pygments documentation
 
    changelog
    authors
+   security
 
 If you find bugs or have suggestions for the documentation, please submit them
 on `GitHub <https://github.com/pygments/pygments>`_.
diff --git a/doc/docs/security.rst b/doc/docs/security.rst
new file mode 100644
index 0000000000..72f2d05dd3
--- /dev/null
+++ b/doc/docs/security.rst
@@ -0,0 +1,31 @@
+Security considerations
+-----------------------
+
+Pygments provides no guarantees on execution time, which needs to be taken
+into consideration when using Pygments to process arbitrary user inputs. For
+example, if you have a web service which uses Pygments for highlighting, there
+may be inputs which will cause the Pygments process to run "forever" and/or use
+significant amounts of memory. This can subsequently be used to perform a
+remote denial-of-service attack on the server if the processes are not
+terminated quickly.
+
+Unfortunately, it's practically impossible to harden Pygments itself against 
+those issues: Some regular expressions can result in "catastrophic 
+backtracking", but other bugs like incorrect matchers can also
+cause similar problems, and there is no way to find them in an automated fashion
+(short of solving the halting problem.) Pygments has extensive unit tests, 
+automated randomized testing, and is also tested by `OSS-Fuzz <https://github.com/google/oss-fuzz/tree/master/projects/pygments>`_, 
+but we will never be able to eliminate all bugs in this area.
+
+Our recommendations are:
+
+* Ensure that the Pygments process is *terminated* after a reasonably short
+  timeout. In general Pygments should take seconds at most for reasonably-sized
+  input.
+* *Limit* the number of concurrent Pygments processes to avoid oversubscription
+  of resources.
+
+The Pygments authors will treat any bug resulting in long processing times with
+high priority -- it's one of those things that will be fixed in a patch release.
+When reporting a bug where you suspect super-linear execution times, please make
+sure to attach an input to reproduce it.
\ No newline at end of file
diff --git a/doc/examples/example.py b/doc/examples/example.py
index ae5293af89..6c9e2f144c 100644
--- a/doc/examples/example.py
+++ b/doc/examples/example.py
@@ -4,7 +4,7 @@
 class Math:
     @staticmethod
     def fib(n: int) -> Iterator[int]:
-        """ Fibonacci series up to n """
+        """Fibonacci series up to n."""
         a, b = 0, 1
         while a < n:
             yield a
diff --git a/doc/index.rst b/doc/index.rst
index 7b1636d560..dbd1596866 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -35,8 +35,7 @@ below.
 The authors
 -----------
 
-Pygments is maintained by **Georg Brandl**, e-mail address *georg*\ *@*\ *python.org*
-and **Matthäus Chajdas**.
+Pygments is maintained by **Georg Brandl**, e-mail address *georg*\ *@*\ *python.org*, **Matthäus Chajdas** and **Jean Abou-Samra**.
 
 Many lexers and fixes have been contributed by **Armin Ronacher**, the rest of
 the `Pocoo <https://dev.pocoo.org/>`_ team and **Tim Hatch**.
diff --git a/doc/languages.rst b/doc/languages.rst
index a39b94f15d..8136442b74 100644
--- a/doc/languages.rst
+++ b/doc/languages.rst
@@ -1,5 +1,18 @@
 :orphan:
 
-This file is overridden by _templates/languages.html and just exists to
-allow the language list to be reliably linked from the documentation
-(since its location varies between `make html` and `make dirhtml`).
+Languages
+=========
+
+.. pygmentsdoc:: lexers_overview
+
+... that's all?
+---------------
+
+Well, why not write your own? Contributing to Pygments is easy and fun. Take a
+look at the :doc:`docs on lexer development <docs/lexerdevelopment>`. Pull
+requests are welcome on `GitHub <https://github.com/pygments/pygments>`_.
+
+.. note:: 
+    
+    The languages listed here are supported in the development version. The
+    latest release may lack a few of them.
diff --git a/external/autopygmentize b/external/autopygmentize
index 3a4aed7f15..85d236681e 100755
--- a/external/autopygmentize
+++ b/external/autopygmentize
@@ -23,37 +23,60 @@ case $(file --mime-type --uncompress $file_common_opts "$file") in
     text/x-awk) lexer=awk;;
     text/x-c) lexer=c;;
     text/x-c++) lexer=cpp;;
+    text/x-clojure) lexer=clojure;;
     text/x-crystal) lexer=crystal;;
     text/x-diff) lexer=diff;;
+    text/x-execline) lexer=execline;;
+    text/x-forth) lexer=forth;;
     text/x-fortran) lexer=fortran;;
     text/x-gawk) lexer=gawk;;
     text/x-java) lexer=java;;
     text/x-lisp) lexer=common-lisp;;
-    text/x-lua) lexer=lua;;
+    text/x-lua|text/x-luatex) lexer=lua;;
     text/x-makefile) lexer=make;;
     text/x-msdos-batch) lexer=bat;;
     text/x-nawk) lexer=nawk;;
+    text/x-objective-c) lexer=objective-c;;
     text/x-pascal) lexer=pascal;;
     text/x-perl) lexer=perl;;
     text/x-php) lexer=php;;
     text/x-po) lexer=po;;
     text/x-python) lexer=python;;
     text/x-ruby) lexer=ruby;;
+    text/x-script.python) lexer=python;;
     text/x-shellscript) lexer=sh;;
     text/x-tcl) lexer=tcl;;
     text/x-tex|text/x-texinfo) lexer=latex;; # FIXME: texinfo really needs its own lexer
+    text/xml) lexer=xml;;
+    text/vnd.graphviz) lexer=graphviz;;
 
-    # Types that file outputs which pygmentize didn't support as of file 5.20, pygments 2.0
+    # Types that file outputs which pygmentize didn't support as of file 5.41, pygments 2.11.2
+    # text/binary
     # text/calendar
-    # text/inf
     # text/PGP
+    # text/prs.lines.tag
     # text/rtf
+    # text/spreadsheet
     # text/texmacs
-    # text/vnd.graphviz
+    # text/vcard
+    # text/vnd.sosi
+    # text/x-Algol68
     # text/x-bcpl
+    # text/x-dmtf-mif
+    # text/x-gimp-curve
+    # text/x-gimp-ggr
+    # text/x-gimp-gpl
     # text/x-info
+    # text/x-installshield-lid
     # text/x-m4
+    # text/x-modulefile
+    # text/x-ms-adm
+    # text/x-ms-cpx
+    # text/x-ms-regedirt
+    # text/x-ms-tag
+    # text/x-systemtap
     # text/x-vcard
+    # text/x-wine-extension-reg
     # text/x-xmcd
 
     text/plain)  # special filenames. TODO: insert more
@@ -67,12 +90,27 @@ case $(file --mime-type --uncompress $file_common_opts "$file") in
 esac
 
 # Find a concatenator for compressed files
-concat=cat
+concat=
+concat_opts=
 case $(file $file_common_opts --mime-type "$file") in
-    application/gzip)    concat=zcat;;
-    application/x-bzip2) concat=bzcat;;
-    application/x-xz)    concat=xzcat;;
+    # TODO: add support
+    # application/x-rzip (does not decompress to stdout)
+    # application/x-dzip (Windows only)
+    application/gzip|application/x-gzip)  concat=zcat;;
+    application/x-bzip)                   concat=bzip; concat_opts=-dc;;
+    application/x-bzip2)                  concat=bzcat;;
+    application/x-lz4)                    concat=lz4; concat_opts=-dc;;
+    application/x-lzh-compressed)         concat=p7zip; concat_opts=-dc;;
+    application/x-lzma)                   concat=lzcat;;
+    application/x-lzip)                   concat=lzip; concat_opts=-dc;;
+    application/x-xz)                     concat=xzcat;;
+    application/x-zoo)                    concat=zoo; concat_opts=fu;;
 esac
+# If concat is unset or doesn't exist, use cat instead
+if [[ "$concat" == "" ]] || ! command -v "$concat"; then
+    concat=cat
+    concat_opts=
+fi
 
 # Find a suitable reader, preceded by a hex dump for binary files,
 # or fmt for text with very long lines
diff --git a/pygments/__init__.py b/pygments/__init__.py
index 49e51f0706..9cb60d1b4c 100644
--- a/pygments/__init__.py
+++ b/pygments/__init__.py
@@ -26,7 +26,7 @@
 """
 from io import StringIO, BytesIO
 
-__version__ = '2.13.0'
+__version__ = '2.14.0'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff --git a/pygments/formatters/__init__.py b/pygments/formatters/__init__.py
index 809f0168cb..58de5fe3c0 100644
--- a/pygments/formatters/__init__.py
+++ b/pygments/formatters/__init__.py
@@ -8,7 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
 import sys
 import types
 from fnmatch import fnmatch
diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py
index 791f749a38..ee53f1322b 100644
--- a/pygments/formatters/html.py
+++ b/pygments/formatters/html.py
@@ -878,10 +878,12 @@ def _format_lines(self, tokensource):
             # for all but the last line
             for part in parts[:-1]:
                 if line:
-                    if lspan != cspan:
+                    # Also check for part being non-empty, so we avoid creating
+                    # empty <span> tags
+                    if lspan != cspan and part:
                         line.extend(((lspan and '</span>'), cspan, part,
                                      (cspan and '</span>'), lsep))
-                    else:  # both are the same
+                    else:  # both are the same, or the current part was empty
                         line.extend((part, (lspan and '</span>'), lsep))
                     yield 1, ''.join(line)
                     line = []
diff --git a/pygments/formatters/irc.py b/pygments/formatters/irc.py
index fd263bb0b0..fd5c0d89d5 100644
--- a/pygments/formatters/irc.py
+++ b/pygments/formatters/irc.py
@@ -128,38 +128,12 @@ def __init__(self, **options):
         self._lineno = 0
 
     def _write_lineno(self, outfile):
-        self._lineno += 1
-        outfile.write("\n%04d: " % self._lineno)
-
-    def _format_unencoded_with_lineno(self, tokensource, outfile):
-        self._write_lineno(outfile)
-
-        for ttype, value in tokensource:
-            if value.endswith("\n"):
-                self._write_lineno(outfile)
-                value = value[:-1]
-            color = self.colorscheme.get(ttype)
-            while color is None:
-                ttype = ttype.parent
-                color = self.colorscheme.get(ttype)
-            if color:
-                color = color[self.darkbg]
-                spl = value.split('\n')
-                for line in spl[:-1]:
-                    self._write_lineno(outfile)
-                    if line:
-                        outfile.write(ircformat(color, line[:-1]))
-                if spl[-1]:
-                    outfile.write(ircformat(color, spl[-1]))
-            else:
-                outfile.write(value)
-
-        outfile.write("\n")
+        if self.linenos:
+            self._lineno += 1
+            outfile.write("%04d: " % self._lineno)
 
     def format_unencoded(self, tokensource, outfile):
-        if self.linenos:
-            self._format_unencoded_with_lineno(tokensource, outfile)
-            return
+        self._write_lineno(outfile)
 
         for ttype, value in tokensource:
             color = self.colorscheme.get(ttype)
@@ -173,6 +147,7 @@ def format_unencoded(self, tokensource, outfile):
                     if line:
                         outfile.write(ircformat(color, line))
                     outfile.write('\n')
+                    self._write_lineno(outfile)
                 if spl[-1]:
                     outfile.write(ircformat(color, spl[-1]))
             else:
diff --git a/pygments/lexer.py b/pygments/lexer.py
index 27d73ee1c3..7cbec96c83 100644
--- a/pygments/lexer.py
+++ b/pygments/lexer.py
@@ -14,15 +14,16 @@
 
 from pygments.filter import apply_filters, Filter
 from pygments.filters import get_filter_by_name
-from pygments.token import Error, Text, Other, _TokenType
+from pygments.token import Error, Text, Other, Whitespace, _TokenType
 from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
     make_analysator, Future, guess_decode
 from pygments.regexopt import regex_opt
 
 __all__ = ['Lexer', 'RegexLexer', 'ExtendedRegexLexer', 'DelegatingLexer',
            'LexerContext', 'include', 'inherit', 'bygroups', 'using', 'this',
-           'default', 'words']
+           'default', 'words', 'line_re']
 
+line_re = re.compile('.*?\n')
 
 _encoding_map = [(b'\xef\xbb\xbf', 'utf-8'),
                  (b'\xff\xfe\0\0', 'utf-32'),
@@ -670,7 +671,7 @@ def get_tokens_unprocessed(self, text, stack=('root',)):
                         # at EOL, reset state to "root"
                         statestack = ['root']
                         statetokens = tokendefs['root']
-                        yield pos, Text, '\n'
+                        yield pos, Whitespace, '\n'
                         pos += 1
                         continue
                     yield pos, Error, text[pos]
diff --git a/pygments/lexers/__init__.py b/pygments/lexers/__init__.py
index 8b163a03c0..83be0e4891 100644
--- a/pygments/lexers/__init__.py
+++ b/pygments/lexers/__init__.py
@@ -8,7 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
 import sys
 import types
 from fnmatch import fnmatch
diff --git a/pygments/lexers/_csound_builtins.py b/pygments/lexers/_csound_builtins.py
index b57043dc39..8e1724df98 100644
--- a/pygments/lexers/_csound_builtins.py
+++ b/pygments/lexers/_csound_builtins.py
@@ -34,7 +34,7 @@
 vbap1move
 '''.split())
 
-# Opcodes in Csound 6.17.0 using:
+# Opcodes in Csound 6.18.0 using:
 #   python3 -c "
 #   import re
 #   from subprocess import Popen, PIPE
@@ -431,6 +431,8 @@
 duserrnd
 dust
 dust2
+elapsedcycles
+elapsedtime
 envlpx
 envlpxr
 ephasor
@@ -438,6 +440,8 @@
 evalstr
 event
 event_i
+eventcycles
+eventtime
 exciter
 exitnow
 exp
@@ -1340,6 +1344,7 @@
 seqtime
 seqtime2
 sequ
+sequstate
 serialBegin
 serialEnd
 serialFlush
diff --git a/pygments/lexers/_lua_builtins.py b/pygments/lexers/_lua_builtins.py
index 08bcfb17c4..a31f6b3b57 100644
--- a/pygments/lexers/_lua_builtins.py
+++ b/pygments/lexers/_lua_builtins.py
@@ -176,7 +176,6 @@
 
 if __name__ == '__main__':  # pragma: no cover
     import re
-    import sys
     from urllib.request import urlopen
     import pprint
 
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 577d6645c9..d2d7880f3f 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -30,6 +30,7 @@
     'AppleScriptLexer': ('pygments.lexers.scripting', 'AppleScript', ('applescript',), ('*.applescript',), ()),
     'ArduinoLexer': ('pygments.lexers.c_like', 'Arduino', ('arduino',), ('*.ino',), ('text/x-arduino',)),
     'ArrowLexer': ('pygments.lexers.arrow', 'Arrow', ('arrow',), ('*.arw',), ()),
+    'ArturoLexer': ('pygments.lexers.arturo', 'Arturo', ('arturo', 'art'), ('*.art',), ()),
     'AscLexer': ('pygments.lexers.asc', 'ASCII armored', ('asc', 'pem'), ('*.asc', '*.pem', 'id_dsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_ed25519', 'id_ed25519_sk', 'id_rsa'), ('application/pgp-keys', 'application/pgp-encrypted', 'application/pgp-signature')),
     'AspectJLexer': ('pygments.lexers.jvm', 'AspectJ', ('aspectj',), ('*.aj',), ('text/x-aspectj',)),
     'AsymptoteLexer': ('pygments.lexers.graphics', 'Asymptote', ('asymptote', 'asy'), ('*.asy',), ('text/x-asymptote',)),
@@ -152,13 +153,14 @@
     'EvoqueXmlLexer': ('pygments.lexers.templates', 'XML+Evoque', ('xml+evoque',), ('*.xml',), ('application/xml+evoque',)),
     'ExeclineLexer': ('pygments.lexers.shell', 'execline', ('execline',), ('*.exec',), ()),
     'EzhilLexer': ('pygments.lexers.ezhil', 'Ezhil', ('ezhil',), ('*.n',), ('text/x-ezhil',)),
-    'FSharpLexer': ('pygments.lexers.dotnet', 'F#', ('fsharp', 'f#'), ('*.fs', '*.fsi'), ('text/x-fsharp',)),
+    'FSharpLexer': ('pygments.lexers.dotnet', 'F#', ('fsharp', 'f#'), ('*.fs', '*.fsi', '*.fsx'), ('text/x-fsharp',)),
     'FStarLexer': ('pygments.lexers.ml', 'FStar', ('fstar',), ('*.fst', '*.fsti'), ('text/x-fstar',)),
     'FactorLexer': ('pygments.lexers.factor', 'Factor', ('factor',), ('*.factor',), ('text/x-factor',)),
     'FancyLexer': ('pygments.lexers.ruby', 'Fancy', ('fancy', 'fy'), ('*.fy', '*.fancypack'), ('text/x-fancysrc',)),
     'FantomLexer': ('pygments.lexers.fantom', 'Fantom', ('fan',), ('*.fan',), ('application/x-fantom',)),
     'FelixLexer': ('pygments.lexers.felix', 'Felix', ('felix', 'flx'), ('*.flx', '*.flxh'), ('text/x-felix',)),
     'FennelLexer': ('pygments.lexers.lisp', 'Fennel', ('fennel', 'fnl'), ('*.fnl',), ()),
+    'FiftLexer': ('pygments.lexers.fift', 'Fift', ('fift', 'fif'), ('*.fif',), ()),
     'FishShellLexer': ('pygments.lexers.shell', 'Fish', ('fish', 'fishshell'), ('*.fish', '*.load'), ('application/x-fish',)),
     'FlatlineLexer': ('pygments.lexers.dsls', 'Flatline', ('flatline',), (), ('text/x-flatline',)),
     'FloScriptLexer': ('pygments.lexers.floscript', 'FloScript', ('floscript', 'flo'), ('*.flo',), ()),
@@ -167,7 +169,9 @@
     'FortranLexer': ('pygments.lexers.fortran', 'Fortran', ('fortran', 'f90'), ('*.f03', '*.f90', '*.F03', '*.F90'), ('text/x-fortran',)),
     'FoxProLexer': ('pygments.lexers.foxpro', 'FoxPro', ('foxpro', 'vfp', 'clipper', 'xbase'), ('*.PRG', '*.prg'), ()),
     'FreeFemLexer': ('pygments.lexers.freefem', 'Freefem', ('freefem',), ('*.edp',), ('text/x-freefem',)),
+    'FuncLexer': ('pygments.lexers.func', 'FunC', ('func', 'fc'), ('*.fc', '*.func'), ()),
     'FutharkLexer': ('pygments.lexers.futhark', 'Futhark', ('futhark',), ('*.fut',), ('text/x-futhark',)),
+    'GAPConsoleLexer': ('pygments.lexers.algebra', 'GAP session', ('gap-console', 'gap-repl'), ('*.tst',), ()),
     'GAPLexer': ('pygments.lexers.algebra', 'GAP', ('gap',), ('*.g', '*.gd', '*.gi', '*.gap'), ()),
     'GDScriptLexer': ('pygments.lexers.gdscript', 'GDScript', ('gdscript', 'gd'), ('*.gd',), ('text/x-gdscript', 'application/x-gdscript')),
     'GLShaderLexer': ('pygments.lexers.graphics', 'GLSL', ('glsl',), ('*.vert', '*.frag', '*.geo'), ('text/x-glslsrc',)),
@@ -196,7 +200,7 @@
     'HaxeLexer': ('pygments.lexers.haxe', 'Haxe', ('haxe', 'hxsl', 'hx'), ('*.hx', '*.hxsl'), ('text/haxe', 'text/x-haxe', 'text/x-hx')),
     'HexdumpLexer': ('pygments.lexers.hexdump', 'Hexdump', ('hexdump',), (), ()),
     'HsailLexer': ('pygments.lexers.asm', 'HSAIL', ('hsail', 'hsa'), ('*.hsail',), ('text/x-hsail',)),
-    'HspecLexer': ('pygments.lexers.haskell', 'Hspec', ('hspec',), (), ()),
+    'HspecLexer': ('pygments.lexers.haskell', 'Hspec', ('hspec',), ('*Spec.hs',), ()),
     'HtmlDjangoLexer': ('pygments.lexers.templates', 'HTML+Django/Jinja', ('html+django', 'html+jinja', 'htmldjango'), ('*.html.j2', '*.htm.j2', '*.xhtml.j2', '*.html.jinja2', '*.htm.jinja2', '*.xhtml.jinja2'), ('text/html+django', 'text/html+jinja')),
     'HtmlGenshiLexer': ('pygments.lexers.templates', 'HTML+Genshi', ('html+genshi', 'html+kid'), (), ('text/html+genshi',)),
     'HtmlLexer': ('pygments.lexers.html', 'HTML', ('html',), ('*.html', '*.htm', '*.xhtml', '*.xslt'), ('text/html', 'application/xhtml+xml')),
@@ -236,6 +240,7 @@
     'JsonBareObjectLexer': ('pygments.lexers.data', 'JSONBareObject', (), (), ()),
     'JsonLdLexer': ('pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
     'JsonLexer': ('pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', 'Pipfile.lock'), ('application/json', 'application/json-object')),
+    'JsonnetLexer': ('pygments.lexers.jsonnet', 'Jsonnet', ('jsonnet',), ('*.jsonnet', '*.libsonnet'), ()),
     'JspLexer': ('pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)),
     'JuliaConsoleLexer': ('pygments.lexers.julia', 'Julia console', ('jlcon', 'julia-repl'), (), ()),
     'JuliaLexer': ('pygments.lexers.julia', 'Julia', ('julia', 'jl'), ('*.jl',), ('text/x-julia', 'application/x-julia')),
@@ -270,8 +275,10 @@
     'LogosLexer': ('pygments.lexers.objective', 'Logos', ('logos',), ('*.x', '*.xi', '*.xm', '*.xmi'), ('text/x-logos',)),
     'LogtalkLexer': ('pygments.lexers.prolog', 'Logtalk', ('logtalk',), ('*.lgt', '*.logtalk'), ('text/x-logtalk',)),
     'LuaLexer': ('pygments.lexers.scripting', 'Lua', ('lua',), ('*.lua', '*.wlua'), ('text/x-lua', 'application/x-lua')),
-    'MCFunctionLexer': ('pygments.lexers.mcfunction', 'MCFunction', ('mcfunction', 'mcf'), ('*.mcfunction',), ('text/mcfunction',)),
+    'MCFunctionLexer': ('pygments.lexers.minecraft', 'MCFunction', ('mcfunction', 'mcf'), ('*.mcfunction',), ('text/mcfunction',)),
+    'MCSchemaLexer': ('pygments.lexers.minecraft', 'MCSchema', ('mcschema',), ('*.mcschema',), ('text/mcschema',)),
     'MIMELexer': ('pygments.lexers.mime', 'MIME', ('mime',), (), ('multipart/mixed', 'multipart/related', 'multipart/alternative')),
+    'MIPSLexer': ('pygments.lexers.mips', 'MIPS', ('mips',), ('*.mips', '*.MIPS'), ()),
     'MOOCodeLexer': ('pygments.lexers.scripting', 'MOOCode', ('moocode', 'moo'), ('*.moo',), ('text/x-moocode',)),
     'MSDOSSessionLexer': ('pygments.lexers.shell', 'MSDOS Session', ('doscon',), (), ()),
     'Macaulay2Lexer': ('pygments.lexers.macaulay2', 'Macaulay2', ('macaulay2',), ('*.m2',), ()),
@@ -316,7 +323,7 @@
     'MyghtyXmlLexer': ('pygments.lexers.templates', 'XML+Myghty', ('xml+myghty',), (), ('application/xml+myghty',)),
     'NCLLexer': ('pygments.lexers.ncl', 'NCL', ('ncl',), ('*.ncl',), ('text/ncl',)),
     'NSISLexer': ('pygments.lexers.installers', 'NSIS', ('nsis', 'nsi', 'nsh'), ('*.nsi', '*.nsh'), ('text/x-nsis',)),
-    'NasmLexer': ('pygments.lexers.asm', 'NASM', ('nasm',), ('*.asm', '*.ASM'), ('text/x-nasm',)),
+    'NasmLexer': ('pygments.lexers.asm', 'NASM', ('nasm',), ('*.asm', '*.ASM', '*.nasm'), ('text/x-nasm',)),
     'NasmObjdumpLexer': ('pygments.lexers.asm', 'objdump-nasm', ('objdump-nasm',), ('*.objdump-intel',), ('text/x-nasm-objdump',)),
     'NemerleLexer': ('pygments.lexers.dotnet', 'Nemerle', ('nemerle',), ('*.n',), ('text/x-nemerle',)),
     'NesCLexer': ('pygments.lexers.c_like', 'nesC', ('nesc',), ('*.nc',), ('text/x-nescsrc',)),
@@ -350,6 +357,7 @@
     'PegLexer': ('pygments.lexers.grammar_notation', 'PEG', ('peg',), ('*.peg',), ('text/x-peg',)),
     'Perl6Lexer': ('pygments.lexers.perl', 'Perl6', ('perl6', 'pl6', 'raku'), ('*.pl', '*.pm', '*.nqp', '*.p6', '*.6pl', '*.p6l', '*.pl6', '*.6pm', '*.p6m', '*.pm6', '*.t', '*.raku', '*.rakumod', '*.rakutest', '*.rakudoc'), ('text/x-perl6', 'application/x-perl6')),
     'PerlLexer': ('pygments.lexers.perl', 'Perl', ('perl', 'pl'), ('*.pl', '*.pm', '*.t', '*.perl'), ('text/x-perl', 'application/x-perl')),
+    'PhixLexer': ('pygments.lexers.phix', 'Phix', ('phix',), ('*.exw',), ('text/x-phix',)),
     'PhpLexer': ('pygments.lexers.php', 'PHP', ('php', 'php3', 'php4', 'php5'), ('*.php', '*.php[345]', '*.inc'), ('text/x-php',)),
     'PigLexer': ('pygments.lexers.jvm', 'Pig', ('pig',), ('*.pig',), ('text/x-pig',)),
     'PikeLexer': ('pygments.lexers.c_like', 'Pike', ('pike',), ('*.pike', '*.pmod'), ('text/x-pike',)),
@@ -357,6 +365,7 @@
     'PlPgsqlLexer': ('pygments.lexers.sql', 'PL/pgSQL', ('plpgsql',), (), ('text/x-plpgsql',)),
     'PointlessLexer': ('pygments.lexers.pointless', 'Pointless', ('pointless',), ('*.ptls',), ()),
     'PonyLexer': ('pygments.lexers.pony', 'Pony', ('pony',), ('*.pony',), ()),
+    'PortugolLexer': ('pygments.lexers.pascal', 'Portugol', ('portugol',), ('*.alg', '*.portugol'), ()),
     'PostScriptLexer': ('pygments.lexers.graphics', 'PostScript', ('postscript', 'postscr'), ('*.ps', '*.eps'), ('application/postscript',)),
     'PostgresConsoleLexer': ('pygments.lexers.sql', 'PostgreSQL console (psql)', ('psql', 'postgresql-console', 'postgres-console'), (), ('text/x-postgresql-psql',)),
     'PostgresLexer': ('pygments.lexers.sql', 'PostgreSQL SQL dialect', ('postgresql', 'postgres'), (), ('text/x-postgresql',)),
@@ -376,7 +385,7 @@
     'Python2Lexer': ('pygments.lexers.python', 'Python 2.x', ('python2', 'py2'), (), ('text/x-python2', 'application/x-python2')),
     'Python2TracebackLexer': ('pygments.lexers.python', 'Python 2.x Traceback', ('py2tb',), ('*.py2tb',), ('text/x-python2-traceback',)),
     'PythonConsoleLexer': ('pygments.lexers.python', 'Python console session', ('pycon',), (), ('text/x-python-doctest',)),
-    'PythonLexer': ('pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3'), ('*.py', '*.pyw', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
+    'PythonLexer': ('pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
     'PythonTracebackLexer': ('pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
     'PythonUL4Lexer': ('pygments.lexers.ul4', 'Python+UL4', ('py+ul4',), ('*.pyul4',), ()),
     'QBasicLexer': ('pygments.lexers.basic', 'QBasic', ('qbasic', 'basic'), ('*.BAS', '*.bas'), ('text/basic',)),
@@ -421,7 +430,7 @@
     'SASLexer': ('pygments.lexers.sas', 'SAS', ('sas',), ('*.SAS', '*.sas'), ('text/x-sas', 'text/sas', 'application/x-sas')),
     'SLexer': ('pygments.lexers.r', 'S', ('splus', 's', 'r'), ('*.S', '*.R', '.Rhistory', '.Rprofile', '.Renviron'), ('text/S-plus', 'text/S', 'text/x-r-source', 'text/x-r', 'text/x-R', 'text/x-r-history', 'text/x-r-profile')),
     'SMLLexer': ('pygments.lexers.ml', 'Standard ML', ('sml',), ('*.sml', '*.sig', '*.fun'), ('text/x-standardml', 'application/x-standardml')),
-    'SNBTLexer': ('pygments.lexers.mcfunction', 'SNBT', ('snbt',), ('*.snbt',), ('text/snbt',)),
+    'SNBTLexer': ('pygments.lexers.minecraft', 'SNBT', ('snbt',), ('*.snbt',), ('text/snbt',)),
     'SarlLexer': ('pygments.lexers.jvm', 'SARL', ('sarl',), ('*.sarl',), ('text/x-sarl',)),
     'SassLexer': ('pygments.lexers.css', 'Sass', ('sass',), ('*.sass',), ('text/x-sass',)),
     'SaviLexer': ('pygments.lexers.savi', 'Savi', ('savi',), ('*.savi',), ()),
@@ -485,6 +494,7 @@
     'ThingsDBLexer': ('pygments.lexers.thingsdb', 'ThingsDB', ('ti', 'thingsdb'), ('*.ti',), ()),
     'ThriftLexer': ('pygments.lexers.dsls', 'Thrift', ('thrift',), ('*.thrift',), ('application/x-thrift',)),
     'TiddlyWiki5Lexer': ('pygments.lexers.markup', 'tiddler', ('tid',), ('*.tid',), ('text/vnd.tiddlywiki',)),
+    'TlbLexer': ('pygments.lexers.tlb', 'Tl-b', ('tlb',), ('*.tlb',), ()),
     'TodotxtLexer': ('pygments.lexers.textfmts', 'Todotxt', ('todotxt',), ('todo.txt', '*.todotxt'), ('text/x-todo',)),
     'TransactSqlLexer': ('pygments.lexers.sql', 'Transact-SQL', ('tsql', 't-sql'), ('*.sql',), ('text/x-tsql',)),
     'TreetopLexer': ('pygments.lexers.parsers', 'Treetop', ('treetop',), ('*.treetop', '*.tt'), ()),
@@ -519,6 +529,8 @@
     'WatLexer': ('pygments.lexers.webassembly', 'WebAssembly', ('wast', 'wat'), ('*.wat', '*.wast'), ()),
     'WebIDLLexer': ('pygments.lexers.webidl', 'Web IDL', ('webidl',), ('*.webidl',), ()),
     'WhileyLexer': ('pygments.lexers.whiley', 'Whiley', ('whiley',), ('*.whiley',), ('text/x-whiley',)),
+    'WoWTocLexer': ('pygments.lexers.wowtoc', 'World of Warcraft TOC', ('wowtoc',), ('*.toc',), ()),
+    'WrenLexer': ('pygments.lexers.wren', 'Wren', ('wren',), ('*.wren',), ()),
     'X10Lexer': ('pygments.lexers.x10', 'X10', ('x10', 'xten'), ('*.x10',), ('text/x-x10',)),
     'XMLUL4Lexer': ('pygments.lexers.ul4', 'XML+UL4', ('xml+ul4',), ('*.xmlul4',), ()),
     'XQueryLexer': ('pygments.lexers.webmisc', 'XQuery', ('xquery', 'xqy', 'xq', 'xql', 'xqm'), ('*.xqy', '*.xquery', '*.xq', '*.xql', '*.xqm'), ('text/xquery', 'application/xquery')),
diff --git a/pygments/lexers/_sourcemod_builtins.py b/pygments/lexers/_sourcemod_builtins.py
index 3884b4b603..6f1392dc9d 100644
--- a/pygments/lexers/_sourcemod_builtins.py
+++ b/pygments/lexers/_sourcemod_builtins.py
@@ -1093,7 +1093,6 @@
 
 if __name__ == '__main__':  # pragma: no cover
     import re
-    import sys
     from urllib.request import FancyURLopener
 
     from pygments.util import format_lines
diff --git a/pygments/lexers/ada.py b/pygments/lexers/ada.py
index b241afe2a2..34fe989554 100644
--- a/pygments/lexers/ada.py
+++ b/pygments/lexers/ada.py
@@ -10,17 +10,12 @@
 
 import re
 
-from pygments.lexer import Lexer, RegexLexer, include, bygroups, words, \
-    using, this, default
-from pygments.util import get_bool_opt, get_list_opt
+from pygments.lexer import RegexLexer, include, bygroups, words, using, this, \
+    default
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Error
-from pygments.scanner import Scanner
+    Number, Punctuation
 from pygments.lexers._ada_builtins import KEYWORD_LIST, BUILTIN_LIST
 
-# compatibility import
-from pygments.lexers.modula2 import Modula2Lexer
-
 __all__ = ['AdaLexer']
 
 
diff --git a/pygments/lexers/algebra.py b/pygments/lexers/algebra.py
index 59072708dd..8c97eccca0 100644
--- a/pygments/lexers/algebra.py
+++ b/pygments/lexers/algebra.py
@@ -10,11 +10,12 @@
 
 import re
 
-from pygments.lexer import RegexLexer, bygroups, words
+from pygments.lexer import Lexer, RegexLexer, bygroups, do_insertions, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Whitespace
+    Number, Punctuation, Generic, Whitespace
 
-__all__ = ['GAPLexer', 'MathematicaLexer', 'MuPADLexer', 'BCLexer']
+__all__ = ['GAPLexer', 'GAPConsoleLexer', 'MathematicaLexer', 'MuPADLexer',
+           'BCLexer']
 
 
 class GAPLexer(RegexLexer):
@@ -88,6 +89,63 @@ def analyse_text(text):
         return min(score, 1.0)
 
 
+class GAPConsoleLexer(Lexer):
+    """
+    For GAP console sessions. Modeled after JuliaConsoleLexer.
+
+    .. versionadded:: 2.14
+    """
+    name = 'GAP session'
+    aliases = ['gap-console', 'gap-repl']
+    filenames = ['*.tst']
+
+    def get_tokens_unprocessed(self, text):
+        gaplexer = GAPLexer(**self.options)
+        start = 0
+        curcode = ''
+        insertions = []
+        output = False
+        error = False
+
+        for line in text.splitlines(keepends=True):
+            if line.startswith('gap> ') or line.startswith('brk> '):
+                insertions.append((len(curcode), [(0, Generic.Prompt, line[:5])]))
+                curcode += line[5:]
+                output = False
+                error = False
+            elif not output and line.startswith('> '):
+                insertions.append((len(curcode), [(0, Generic.Prompt, line[:2])]))
+                curcode += line[2:]
+            else:
+                if curcode:
+                    yield from do_insertions(
+                        insertions, gaplexer.get_tokens_unprocessed(curcode))
+                    curcode = ''
+                    insertions = []
+                if line.startswith('Error, ') or error:
+                    yield start, Generic.Error, line
+                    error = True
+                else:
+                    yield start, Generic.Output, line
+                output = True
+            start += len(line)
+
+        if curcode:
+            yield from do_insertions(
+                insertions, gaplexer.get_tokens_unprocessed(curcode))
+
+    # the following is needed to distinguish Scilab and GAP .tst files
+    def analyse_text(text):
+        # GAP prompts are a dead give away, although hypothetical;y a
+        # file in another language could be trying to compare a variable
+        # "gap" as in "gap> 0.1". But that this should happen at the
+        # start of a line seems unlikely...
+        if re.search(r"^gap> ", text):
+            return 0.9
+        else:
+            return 0.0
+
+
 class MathematicaLexer(RegexLexer):
     """
     Lexer for Mathematica source code.
diff --git a/pygments/lexers/ambient.py b/pygments/lexers/ambient.py
index a5a7c57687..abe612689b 100644
--- a/pygments/lexers/ambient.py
+++ b/pygments/lexers/ambient.py
@@ -11,7 +11,7 @@
 import re
 
 from pygments.lexer import RegexLexer, include, words, bygroups
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+from pygments.token import Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Whitespace
 
 __all__ = ['AmbientTalkLexer']
diff --git a/pygments/lexers/ampl.py b/pygments/lexers/ampl.py
index fc26f3cf16..a3cf6057c7 100644
--- a/pygments/lexers/ampl.py
+++ b/pygments/lexers/ampl.py
@@ -59,7 +59,8 @@ class AmplLexer(RegexLexer):
              bygroups(Keyword.Declaration, Whitespace, Punctuation, Whitespace,
                       Name.Variable, Whitespace, Punctuation, Whitespace, Name.Variable)),
             (r'(let|fix|unfix)(\s*)((?:\{.*\})?)(\s*)(\w+)',
-             bygroups(Keyword.Declaration, Whitespace, using(this), Whitespace, Name.Variable)),
+             bygroups(Keyword.Declaration, Whitespace, using(this), Whitespace,
+                      Name.Variable)),
             (words((
                 'abs', 'acos', 'acosh', 'alias', 'asin', 'asinh', 'atan', 'atan2',
                 'atanh', 'ceil', 'ctime', 'cos', 'exp', 'floor', 'log', 'log10',
diff --git a/pygments/lexers/apdlexer.py b/pygments/lexers/apdlexer.py
index 6bc1641458..74ef751179 100644
--- a/pygments/lexers/apdlexer.py
+++ b/pygments/lexers/apdlexer.py
@@ -11,7 +11,7 @@
 import re
 
 from pygments.lexer import RegexLexer, include, words
-from pygments.token import Comment, Keyword, Name, Text, Number, Operator, \
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
     String, Generic, Punctuation, Whitespace
 
 __all__ = ['apdlexer']
diff --git a/pygments/lexers/apl.py b/pygments/lexers/apl.py
index 944551f17e..57905b5323 100644
--- a/pygments/lexers/apl.py
+++ b/pygments/lexers/apl.py
@@ -9,7 +9,7 @@
 """
 
 from pygments.lexer import RegexLexer
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+from pygments.token import Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Whitespace
 
 __all__ = ['APLLexer']
diff --git a/pygments/lexers/archetype.py b/pygments/lexers/archetype.py
index 0afcce8afb..1496d2265d 100644
--- a/pygments/lexers/archetype.py
+++ b/pygments/lexers/archetype.py
@@ -40,7 +40,8 @@ class AtomsLexer(RegexLexer):
         ],
         'archetype_id': [
             (r'([ \t]*)(([a-zA-Z]\w+(\.[a-zA-Z]\w+)*::)?[a-zA-Z]\w+(-[a-zA-Z]\w+){2}'
-             r'\.\w+[\w-]*\.v\d+(\.\d+){,2}((-[a-z]+)(\.\d+)?)?)', bygroups(Whitespace, Name.Decorator)),
+             r'\.\w+[\w-]*\.v\d+(\.\d+){,2}((-[a-z]+)(\.\d+)?)?)',
+             bygroups(Whitespace, Name.Decorator)),
         ],
         'date_constraints': [
             # ISO 8601-based date/time constraints
@@ -271,7 +272,8 @@ class AdlLexer(AtomsLexer):
             # repeating the following two rules from the root state enable multi-line
             # strings that start in the first column to be dealt with
             (r'^(language|description|ontology|terminology|annotations|'
-             r'component_terminologies|revision_history)([ \t]*\n)', bygroups(Generic.Heading, Whitespace)),
+             r'component_terminologies|revision_history)([ \t]*\n)',
+             bygroups(Generic.Heading, Whitespace)),
             (r'^(definition)([ \t]*\n)', bygroups(Generic.Heading, Whitespace), 'cadl_section'),
             (r'^([ \t]*|[ \t]+.*)\n', using(OdinLexer)),
             (r'^([^"]*")(>[ \t]*\n)', bygroups(String, Punctuation)),
diff --git a/pygments/lexers/arturo.py b/pygments/lexers/arturo.py
new file mode 100644
index 0000000000..406bcc6fd4
--- /dev/null
+++ b/pygments/lexers/arturo.py
@@ -0,0 +1,250 @@
+"""
+    pygments.lexers.arturo
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for the Arturo language.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, bygroups, do_insertions, include, \
+    this, using, words
+from pygments.token import Comment, Error, Keyword, Name, Number, Operator, \
+    Punctuation, String, Text
+
+from pygments.util import ClassNotFound, get_bool_opt
+
+__all__ = ['ArturoLexer']
+
+
+class ArturoLexer(RegexLexer):
+    """
+    For Arturo source code.
+
+    See `Arturo's Github <https://github.com/arturo-lang/arturo>`_
+    and `Arturo's Website <https://arturo-lang.io/>`_.
+
+    .. versionadded:: 2.14.0
+    """
+
+    name = 'Arturo'
+    aliases = ['arturo', 'art']
+    filenames = ['*.art']
+    url = 'https://arturo-lang.io/'
+
+    def __init__(self, **options):
+        self.handle_annotateds = get_bool_opt(options, 'handle_annotateds',
+                                              True)
+        RegexLexer.__init__(self, **options)
+
+    def handle_annotated_strings(self, match):
+        """Adds syntax from another languages inside annotated strings
+
+        match args:
+            1:open_string,
+            2:exclamation_mark,
+            3:lang_name,
+            4:space_or_newline,
+            5:code,
+            6:close_string
+        """
+        from pygments.lexers import get_lexer_by_name
+
+        # Header's section
+        yield match.start(1), String.Double,   match.group(1)
+        yield match.start(2), String.Interpol, match.group(2)
+        yield match.start(3), String.Interpol, match.group(3)
+        yield match.start(4), Text.Whitespace, match.group(4)
+
+        lexer = None
+        if self.handle_annotateds:
+            try:
+                lexer = get_lexer_by_name(match.group(3).strip())
+            except ClassNotFound:
+                pass
+        code = match.group(5)
+
+        if lexer is None:
+            yield match.group(5), String, code
+        else:
+            yield from do_insertions([], lexer.get_tokens_unprocessed(code))
+
+        yield match.start(6), String.Double, match.group(6)
+
+    tokens = {
+        'root': [
+            (r';.*?$', Comment.Single),
+            (r'^((\s#!)|(#!)).*?$', Comment.Hashbang),
+
+            # Constants
+            (words(('false', 'true', 'maybe'),      # boolean
+                   suffix=r'\b'), Name.Constant),
+            (words(('this', 'init'),                # class related keywords
+                   prefix=r'\b', suffix=r'\b\??:?'), Name.Builtin.Pseudo),
+            (r'`.`', String.Char),                  # character
+            (r'\\\w+\b\??:?', Name.Property),       # array index
+            (r'#\w+', Name.Constant),               # color
+            (r'\b[0-9]+\.[0-9]+', Number.Float),    # float
+            (r'\b[0-9]+', Number.Integer),          # integer
+            (r'\w+\b\??:', Name.Label),             # label
+            # Note: Literals can be labeled too
+            (r'\'(?:\w+\b\??:?)', Keyword.Declaration),  # literal
+            (r'\:\w+', Keyword.Type),               # type
+            # Note: Attributes can be labeled too
+            (r'\.\w+\??:?', Name.Attribute),        # attributes
+
+            # Switch structure
+            (r'(\()(.*?)(\)\?)',
+             bygroups(Punctuation, using(this), Punctuation)),
+
+            # Single Line Strings
+            (r'"',   String.Double, 'inside-simple-string'),
+            (r'»',   String.Single, 'inside-smart-string'),
+            (r'«««', String.Double, 'inside-safe-string'),
+            (r'\{\/', String.Single, 'inside-regex-string'),
+
+            # Multi Line Strings
+            (r'\{\:', String.Double, 'inside-curly-verb-string'),
+            (r'(\{)(\!)(\w+)(\s|\n)([\w\W]*?)(^\})', handle_annotated_strings),
+            (r'\{', String.Single, 'inside-curly-string'),
+            (r'\-{3,}', String.Single, 'inside-eof-string'),
+
+            include('builtin-functions'),
+
+            # Operators
+            (r'[()[\],]', Punctuation),
+            (words(('->', '==>', '|', '::', '@', '#',  # sugar syntax
+                    '$', '&', '!', '!!', './')), Name.Decorator),
+            (words(('<:', ':>', ':<', '>:', '<\\', '<>', '<', '>',
+                    'ø', '∞',
+                    '+', '-', '*', '~', '=', '^', '%', '/', '//',
+                    '==>', '<=>', '<==>',
+                    '=>>', '<<=>>', '<<==>>',
+                    '-->', '<->', '<-->',
+                    '=|', '|=', '-:', ':-',
+                    '_', '.', '..', '\\')), Operator),
+
+            (r'\b\w+', Name),
+            (r'\s+', Text.Whitespace),
+            (r'.+$', Error),
+        ],
+
+        'inside-interpol': [
+            (r'\|', String.Interpol, '#pop'),
+            (r'[^|]+', using(this)),
+        ],
+        'inside-template': [
+            (r'\|\|\>', String.Interpol, '#pop'),
+            (r'[^|]+', using(this)),
+        ],
+        'string-escape': [
+            (words(('\\\\', '\\n', '\\t', '\\"')), String.Escape),
+        ],
+
+        'inside-simple-string': [
+            include('string-escape'),
+            (r'\|', String.Interpol, 'inside-interpol'),        # Interpolation
+            (r'\<\|\|', String.Interpol, 'inside-template'),    # Templates
+            (r'"', String.Double, '#pop'),   # Closing Quote
+            (r'[^|"]+', String)              # String Content
+        ],
+        'inside-smart-string': [
+            include('string-escape'),
+            (r'\|', String.Interpol, 'inside-interpol'),        # Interpolation
+            (r'\<\|\|', String.Interpol, 'inside-template'),    # Templates
+            (r'\n', String.Single, '#pop'),  # Closing Quote
+            (r'[^|\n]+', String)             # String Content
+        ],
+        'inside-safe-string': [
+            include('string-escape'),
+            (r'\|', String.Interpol, 'inside-interpol'),        # Interpolation
+            (r'\<\|\|', String.Interpol, 'inside-template'),    # Templates
+            (r'»»»', String.Double, '#pop'),    # Closing Quote
+            (r'[^|»]+', String)                 # String Content
+        ],
+        'inside-regex-string': [
+            (r'\\[sSwWdDbBZApPxucItnvfr0]+', String.Escape),
+            (r'\|', String.Interpol, 'inside-interpol'),        # Interpolation
+            (r'\<\|\|', String.Interpol, 'inside-template'),    # Templates
+            (r'\/\}', String.Single, '#pop'),  # Closing Quote
+            (r'[^|\/]+', String.Regex),        # String Content
+        ],
+        'inside-curly-verb-string': [
+            include('string-escape'),
+            (r'\|', String.Interpol, 'inside-interpol'),        # Interpolation
+            (r'\<\|\|', String.Interpol, 'inside-template'),    # Templates
+            (r'\:\}', String.Double, '#pop'),  # Closing Quote
+            (r'[^|<:]+', String),              # String Content
+        ],
+        'inside-curly-string': [
+            include('string-escape'),
+            (r'\|', String.Interpol, 'inside-interpol'),        # Interpolation
+            (r'\<\|\|', String.Interpol, 'inside-template'),    # Templates
+            (r'\}', String.Single, '#pop'),   # Closing Quote
+            (r'[^|<}]+', String),             # String Content
+        ],
+        'inside-eof-string': [
+            include('string-escape'),
+            (r'\|', String.Interpol, 'inside-interpol'),        # Interpolation
+            (r'\<\|\|', String.Interpol, 'inside-template'),    # Templates
+            (r'\Z', String.Single, '#pop'),   # Closing Quote
+            (r'[^|<]+', String),              # String Content
+        ],
+
+        'builtin-functions': [
+            (words((
+                'all', 'and', 'any', 'ascii', 'attr', 'attribute',
+                'attributeLabel', 'binary', 'block' 'char', 'contains',
+                'database', 'date', 'dictionary', 'empty', 'equal', 'even',
+                'every', 'exists', 'false', 'floatin', 'function', 'greater',
+                'greaterOrEqual', 'if', 'in', 'inline', 'integer', 'is',
+                'key', 'label', 'leap', 'less', 'lessOrEqual', 'literal',
+                'logical', 'lower', 'nand', 'negative', 'nor', 'not',
+                'notEqual', 'null', 'numeric', 'odd', 'or', 'path',
+                'pathLabel', 'positive', 'prefix', 'prime', 'set', 'some',
+                'sorted', 'standalone', 'string', 'subset', 'suffix',
+                'superset', 'ymbol', 'true', 'try', 'type', 'unless', 'upper',
+                'when', 'whitespace', 'word', 'xnor', 'xor', 'zero',
+            ), prefix=r'\b', suffix=r'\b\?'), Name.Builtin),
+            (words((
+                'abs', 'acos', 'acosh', 'acsec', 'acsech', 'actan', 'actanh',
+                'add', 'after', 'alphabet', 'and', 'angle', 'append', 'arg',
+                'args', 'arity', 'array', 'as', 'asec', 'asech', 'asin',
+                'asinh', 'atan', 'atan2', 'atanh', 'attr', 'attrs', 'average',
+                'before', 'benchmark', 'blend', 'break', 'builtins1',
+                'builtins2', 'call', 'capitalize', 'case', 'ceil', 'chop',
+                'chunk', 'clear', 'close', 'cluster', 'color', 'combine',
+                'conj', 'continue', 'copy', 'cos', 'cosh', 'couple', 'csec',
+                'csech', 'ctan', 'ctanh', 'cursor', 'darken', 'dec', 'decode',
+                'decouple', 'define', 'delete', 'desaturate', 'deviation',
+                'dictionary', 'difference', 'digest', 'digits', 'div', 'do',
+                'download', 'drop', 'dup', 'e', 'else', 'empty', 'encode',
+                'ensure', 'env', 'epsilon', 'escape', 'execute', 'exit', 'exp',
+                'extend', 'extract', 'factors', 'false', 'fdiv', 'filter',
+                'first', 'flatten', 'floor', 'fold', 'from', 'function',
+                'gamma', 'gcd', 'get', 'goto', 'hash', 'help', 'hypot', 'if',
+                'in', 'inc', 'indent', 'index', 'infinity', 'info', 'input',
+                'insert', 'inspect', 'intersection', 'invert', 'join', 'keys',
+                'kurtosis', 'last', 'let', 'levenshtein', 'lighten', 'list',
+                'ln', 'log', 'loop', 'lower', 'mail', 'map', 'match', 'max',
+                'maybe', 'median', 'min', 'mod', 'module', 'mul', 'nand',
+                'neg', 'new', 'nor', 'normalize', 'not', 'now', 'null', 'open',
+                'or', 'outdent', 'pad', 'panic', 'path', 'pause',
+                'permissions', 'permutate', 'pi', 'pop', 'pow', 'powerset',
+                'powmod', 'prefix', 'print', 'prints', 'process', 'product',
+                'query', 'random', 'range', 'read', 'relative', 'remove',
+                'rename', 'render', 'repeat', 'replace', 'request', 'return',
+                'reverse', 'round', 'sample', 'saturate', 'script', 'sec',
+                'sech', 'select', 'serve', 'set', 'shl', 'shr', 'shuffle',
+                'sin', 'sinh', 'size', 'skewness', 'slice', 'sort', 'split',
+                'sqrt', 'squeeze', 'stack', 'strip', 'sub', 'suffix', 'sum',
+                'switch', 'symbols', 'symlink', 'sys', 'take', 'tan', 'tanh',
+                'terminal', 'to', 'true', 'truncate', 'try', 'type', 'union',
+                'unique', 'unless', 'until', 'unzip', 'upper', 'values', 'var',
+                'variance', 'volume', 'webview', 'while', 'with', 'wordwrap',
+                'write', 'xnor', 'xor', 'zip'
+            ), prefix=r'\b', suffix=r'\b'), Name.Builtin)
+        ],
+
+    }
diff --git a/pygments/lexers/asc.py b/pygments/lexers/asc.py
index 18d779f6cb..415446734d 100644
--- a/pygments/lexers/asc.py
+++ b/pygments/lexers/asc.py
@@ -17,7 +17,8 @@
 
 class AscLexer(RegexLexer):
     """
-    Lexer for ASCII armored files, containing `-----BEGIN/END ...-----` wrapped base64 data.
+    Lexer for ASCII armored files, containing `-----BEGIN/END ...-----` wrapped
+    base64 data.
 
     .. versionadded:: 2.10
     """
@@ -26,9 +27,11 @@ class AscLexer(RegexLexer):
     filenames = [
         '*.asc',  # PGP; *.gpg, *.pgp, and *.sig too, but those can be binary
         '*.pem',  # X.509; *.cer, *.crt, *.csr, and key etc too, but those can be binary
-        'id_dsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_ed25519', 'id_ed25519_sk', 'id_rsa',  # SSH private keys
+        'id_dsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_ed25519', 'id_ed25519_sk',
+        'id_rsa',  # SSH private keys
     ]
-    mimetypes = ['application/pgp-keys', 'application/pgp-encrypted', 'application/pgp-signature']
+    mimetypes = ['application/pgp-keys', 'application/pgp-encrypted',
+                 'application/pgp-signature']
 
     flags = re.MULTILINE
 
@@ -40,7 +43,8 @@ class AscLexer(RegexLexer):
         ],
         'data': [
             (r'\s+', Whitespace),
-            (r'^([^:]+)(:)([ \t]+)(.*)', bygroups(Name.Attribute, Operator, Whitespace, String)),
+            (r'^([^:]+)(:)([ \t]+)(.*)',
+             bygroups(Name.Attribute, Operator, Whitespace, String)),
             (r'^-----END [^\n]+-----$', Generic.Heading, 'root'),
             (r'\S+', String),
         ],
diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py
index 8e803c9116..734f986ff0 100644
--- a/pygments/lexers/asm.py
+++ b/pygments/lexers/asm.py
@@ -95,7 +95,7 @@ class GasLexer(RegexLexer):
             (r'/[*][\w\W]*?[*]/', Comment.Multiline)
         ],
         'punctuation': [
-            (r'[-*,.()\[\]!:]+', Punctuation)
+            (r'[-*,.()\[\]!:{}]+', Punctuation)
         ]
     }
 
@@ -478,7 +478,7 @@ class LlvmLexer(RegexLexer):
             # Types
             (words(('void', 'half', 'bfloat', 'float', 'double', 'fp128',
                     'x86_fp80', 'ppc_fp128', 'label', 'metadata', 'x86_mmx',
-                    'x86_amx', 'token')),
+                    'x86_amx', 'token', 'ptr')),
                    Keyword.Type),
 
             # Integer types
@@ -713,7 +713,7 @@ class NasmLexer(RegexLexer):
     """
     name = 'NASM'
     aliases = ['nasm']
-    filenames = ['*.asm', '*.ASM']
+    filenames = ['*.asm', '*.ASM', '*.nasm']
     mimetypes = ['text/x-nasm']
 
     # Tasm uses the same file endings, but TASM is not as common as NASM, so
@@ -730,8 +730,9 @@ class NasmLexer(RegexLexer):
     declkw = r'(?:res|d)[bwdqt]|times'
     register = (r'(r[0-9][0-5]?[bwd]?|'
                 r'[a-d][lh]|[er]?[a-d]x|[er]?[sb]p|[er]?[sd]i|[c-gs]s|st[0-7]|'
-                r'mm[0-7]|cr[0-4]|dr[0-367]|tr[3-7])\b')
-    wordop = r'seg|wrt|strict'
+                r'mm[0-7]|cr[0-4]|dr[0-367]|tr[3-7]|k[0-7]|'
+                r'[xyz]mm(?:[12][0-9]?|3[01]?|[04-9]))\b')
+    wordop = r'seg|wrt|strict|rel|abs'
     type = r'byte|[dq]?word'
     # Directives must be followed by whitespace, otherwise CPU will match
     # cpuid for instance.
@@ -778,7 +779,7 @@ class NasmLexer(RegexLexer):
             (r'#.*', Comment.Single)
         ],
         'punctuation': [
-            (r'[,():\[\]]+', Punctuation),
+            (r'[,{}():\[\]]+', Punctuation),
             (r'[&|^<>+*/%~-]+', Operator),
             (r'[$]+', Keyword.Constant),
             (wordop, Operator.Word),
@@ -861,7 +862,8 @@ class TasmLexer(RegexLexer):
             (register, Name.Builtin),
             (identifier, Name.Variable),
             # Do not match newline when it's preceded by a backslash
-            (r'(\\)(\s*)(;.*)([\r\n])', bygroups(Text, Whitespace, Comment.Single, Whitespace)),
+            (r'(\\)(\s*)(;.*)([\r\n])',
+             bygroups(Text, Whitespace, Comment.Single, Whitespace)),
             (r'[\r\n]+', Whitespace, '#pop'),
             include('whitespace')
         ],
diff --git a/pygments/lexers/automation.py b/pygments/lexers/automation.py
index 00f448ea1c..8730226e72 100644
--- a/pygments/lexers/automation.py
+++ b/pygments/lexers/automation.py
@@ -50,8 +50,8 @@ class AutohotkeyLexer(RegexLexer):
         ],
         'incomment': [
             (r'^\s*\*/', Comment.Multiline, '#pop'),
-            (r'[^*/]', Comment.Multiline),
-            (r'[*/]', Comment.Multiline)
+            (r'[^*]+', Comment.Multiline),
+            (r'\*', Comment.Multiline)
         ],
         'incontinuation': [
             (r'^\s*\)', Generic, '#pop'),
diff --git a/pygments/lexers/bare.py b/pygments/lexers/bare.py
index c1d183370f..a9de9bad71 100644
--- a/pygments/lexers/bare.py
+++ b/pygments/lexers/bare.py
@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, words, bygroups
 from pygments.token import Text, Comment, Keyword, Name, Literal, Whitespace
 
@@ -66,7 +64,8 @@ class BareLexer(RegexLexer):
         'struct': [
             (r'\{', Text, '#push'),
             (r'\}', Text, '#pop'),
-            (r'([a-zA-Z0-9]+)(:)(\s*)', bygroups(Name.Attribute, Text, Whitespace), 'typedef'),
+            (r'([a-zA-Z0-9]+)(:)(\s*)',
+             bygroups(Name.Attribute, Text, Whitespace), 'typedef'),
             (r'\s+', Whitespace),
         ],
         'union': [
@@ -94,7 +93,8 @@ class BareLexer(RegexLexer):
         'enum': [
             (r'\{', Text, '#push'),
             (r'\}', Text, '#pop'),
-            (r'([A-Z][A-Z0-9_]*)(\s*=\s*)(\d+)', bygroups(Name.Attribute, Text, Literal)),
+            (r'([A-Z][A-Z0-9_]*)(\s*=\s*)(\d+)',
+             bygroups(Name.Attribute, Text, Literal)),
             (r'([A-Z][A-Z0-9_]*)', bygroups(Name.Attribute)),
             (r'#.*?$', Comment),
             (r'\s+', Whitespace),
diff --git a/pygments/lexers/basic.py b/pygments/lexers/basic.py
index f0a33ff9ac..e726e05eca 100644
--- a/pygments/lexers/basic.py
+++ b/pygments/lexers/basic.py
@@ -625,7 +625,8 @@ class BBCBasicLexer(RegexLexer):
 
             # Some special cases to make functions come out nicer
             (r'(DEF)(\s*)(FN|PROC)([A-Za-z_@][\w@]*)',
-             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration, Name.Function)),
+             bygroups(Keyword.Declaration, Whitespace,
+                      Keyword.Declaration, Name.Function)),
             (r'(FN|PROC)([A-Za-z_@][\w@]*)',
              bygroups(Keyword, Name.Function)),
 
@@ -633,7 +634,8 @@ class BBCBasicLexer(RegexLexer):
              bygroups(Keyword, Whitespace, Name.Label)),
 
             (r'(TRUE|FALSE)', Keyword.Constant),
-            (r'(PAGE|LOMEM|HIMEM|TIME|WIDTH|ERL|ERR|REPORT\$|POS|VPOS|VOICES)', Keyword.Pseudo),
+            (r'(PAGE|LOMEM|HIMEM|TIME|WIDTH|ERL|ERR|REPORT\$|POS|VPOS|VOICES)',
+             Keyword.Pseudo),
 
             (words(base_keywords), Keyword),
             (words(basic5_keywords), Keyword),
diff --git a/pygments/lexers/bdd.py b/pygments/lexers/bdd.py
index f9b582ceed..4dbe33efe3 100644
--- a/pygments/lexers/bdd.py
+++ b/pygments/lexers/bdd.py
@@ -2,7 +2,7 @@
     pygments.lexers.bdd
     ~~~~~~~~~~~~~~~~~~~
 
-    Lexer for BDD(Behavior-driven development). 
+    Lexer for BDD(Behavior-driven development).
     More information: https://en.wikipedia.org/wiki/Behavior-driven_development
 
     :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
@@ -10,14 +10,15 @@
 """
 
 from pygments.lexer import RegexLexer, include
-from pygments.token import Comment, Keyword, Name, String, Number, Text, Punctuation, Whitespace
+from pygments.token import Comment, Keyword, Name, String, Number, Text, \
+    Punctuation, Whitespace
 
 __all__ = ['BddLexer']
 
 class BddLexer(RegexLexer):
     """
-    Lexer for BDD(Behavior-driven development), which highlights not only keywords, 
-    but also comments, punctuations, strings, numbers, and variables.
+    Lexer for BDD(Behavior-driven development), which highlights not only
+    keywords, but also comments, punctuations, strings, numbers, and variables.
 
     .. versionadded:: 2.11
     """
@@ -27,7 +28,8 @@ class BddLexer(RegexLexer):
     filenames = ['*.feature']
     mimetypes = ['text/x-bdd']
 
-    step_keywords = r'Given|When|Then|Add|And|Feature|Scenario Outline|Scenario|Background|Examples|But'
+    step_keywords = (r'Given|When|Then|Add|And|Feature|Scenario Outline|'
+                     r'Scenario|Background|Examples|But')
 
     tokens = {
         'comments': [
@@ -47,7 +49,7 @@ class BddLexer(RegexLexer):
             (step_keywords, Keyword),
             include('comments'),
             include('miscellaneous'),
-            include('numbers'),            
+            include('numbers'),
             (r'\S+', Text),
         ]
     }
diff --git a/pygments/lexers/berry.py b/pygments/lexers/berry.py
index d7525e984d..cbdbb169bd 100644
--- a/pygments/lexers/berry.py
+++ b/pygments/lexers/berry.py
@@ -8,20 +8,19 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-from pygments.lexer import RegexLexer, words, default, include, bygroups
-from pygments.token import Text, Comment, Whitespace, Operator, Keyword, Name, String, Number, Punctuation
+from pygments.lexer import RegexLexer, words, include, bygroups
+from pygments.token import Comment, Whitespace, Operator, Keyword, Name, \
+    String, Number, Punctuation
 
 __all__ = ['BerryLexer']
 
-line_re = re.compile('.*?\n')
 
 class BerryLexer(RegexLexer):
     """
     For `berry <http://github.com/berry-lang/berry>`_ source code.
 
     .. versionadded:: 2.12.0
-    """    
+    """
     name = 'Berry'
     aliases = ['berry', 'be']
     filenames = ['*.be']
@@ -34,9 +33,12 @@ class BerryLexer(RegexLexer):
             include('whitespace'),
             include('numbers'),
             include('keywords'),
-            (rf'(def)(\s+)({_name})', bygroups(Keyword.Declaration, Whitespace, Name.Function)),
-            (rf'\b(class)(\s+)({_name})', bygroups(Keyword.Declaration, Whitespace, Name.Class)),
-            (rf'\b(import)(\s+)({_name})', bygroups(Keyword.Namespace, Whitespace, Name.Namespace)),
+            (rf'(def)(\s+)({_name})',
+             bygroups(Keyword.Declaration, Whitespace, Name.Function)),
+            (rf'\b(class)(\s+)({_name})',
+             bygroups(Keyword.Declaration, Whitespace, Name.Class)),
+            (rf'\b(import)(\s+)({_name})',
+             bygroups(Keyword.Namespace, Whitespace, Name.Namespace)),
             include('expr')
         ],
         'expr': [
@@ -57,14 +59,14 @@ class BerryLexer(RegexLexer):
         ],
         'keywords': [
             (words((
-                'as', 'break', 'continue', 'import', 'static', 'self', 'super'), 
+                'as', 'break', 'continue', 'import', 'static', 'self', 'super'),
                 suffix=r'\b'), Keyword.Reserved),
             (r'(true|false|nil)\b', Keyword.Constant),
             (r'(var|def)\b', Keyword.Declaration)
         ],
         'controls': [
             (words((
-                'if', 'elif', 'else', 'for', 'while', 'do', 'end', 'break', 
+                'if', 'elif', 'else', 'for', 'while', 'do', 'end', 'break',
                 'continue', 'return', 'try', 'except', 'raise'),
                 suffix=r'\b'), Keyword)
         ],
@@ -73,7 +75,7 @@ class BerryLexer(RegexLexer):
                 'assert', 'bool', 'input', 'classname', 'classof', 'number', 'real',
                 'bytes', 'compile', 'map', 'list', 'int', 'isinstance', 'print',
                 'range', 'str', 'super', 'module', 'size', 'issubclass', 'open',
-                'file', 'type', 'call'), 
+                'file', 'type', 'call'),
                 suffix=r'\b'), Name.Builtin)
         ],
         'numbers': [
diff --git a/pygments/lexers/bibtex.py b/pygments/lexers/bibtex.py
index 4a7c1e51c3..cbc5a8e996 100644
--- a/pygments/lexers/bibtex.py
+++ b/pygments/lexers/bibtex.py
@@ -12,8 +12,8 @@
 
 from pygments.lexer import RegexLexer, ExtendedRegexLexer, include, default, \
     words
-from pygments.token import Name, Comment, String, Error, Number, Text, \
-    Keyword, Punctuation, Whitespace
+from pygments.token import Name, Comment, String, Error, Number, Keyword, \
+    Punctuation, Whitespace
 
 __all__ = ['BibTeXLexer', 'BSTLexer']
 
diff --git a/pygments/lexers/boa.py b/pygments/lexers/boa.py
index ce5e09be02..96e34a9aa7 100644
--- a/pygments/lexers/boa.py
+++ b/pygments/lexers/boa.py
@@ -8,16 +8,12 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, words
-from pygments.token import String, Comment, Keyword, Name, Number, Text, \
-    Operator, Punctuation, Whitespace
+from pygments.token import String, Comment, Keyword, Name, Number, Operator, \
+    Punctuation, Whitespace
 
 __all__ = ['BoaLexer']
 
-line_re = re.compile('.*?\n')
-
 
 class BoaLexer(RegexLexer):
     """
diff --git a/pygments/lexers/business.py b/pygments/lexers/business.py
index 45c653dfdb..bffcd8ab2c 100644
--- a/pygments/lexers/business.py
+++ b/pygments/lexers/business.py
@@ -299,7 +299,7 @@ class ABAPLexer(RegexLexer):
              r'CLASS-DATA|CLASS-EVENTS|CLASS-METHODS|CLASS-POOL|'
              r'DELETE-ADJACENT|DIVIDE-CORRESPONDING|'
              r'EDITOR-CALL|ENHANCEMENT-POINT|ENHANCEMENT-SECTION|EXIT-COMMAND|'
-             r'FIELD-GROUPS|FIELD-SYMBOLS|FUNCTION-POOL|'
+             r'FIELD-GROUPS|FIELD-SYMBOLS|FIELD-SYMBOL|FUNCTION-POOL|'
              r'INTERFACE-POOL|INVERTED-DATE|'
              r'LOAD-OF-PROGRAM|LOG-POINT|'
              r'MESSAGE-ID|MOVE-CORRESPONDING|MULTIPLY-CORRESPONDING|'
@@ -373,7 +373,7 @@ class ABAPLexer(RegexLexer):
             (r'(^|(?<=(\s|\.)))(ABBREVIATED|ABSTRACT|ADD|ALIASES|ALIGN|ALPHA|'
              r'ASSERT|AS|ASSIGN(ING)?|AT(\s+FIRST)?|'
              r'BACK|BLOCK|BREAK-POINT|'
-             r'CASE|CATCH|CHANGING|CHECK|CLASS|CLEAR|COLLECT|COLOR|COMMIT|'
+             r'CASE|CAST|CATCH|CHANGING|CHECK|CLASS|CLEAR|COLLECT|COLOR|COMMIT|COND|CONV|'
              r'CREATE|COMMUNICATION|COMPONENTS?|COMPUTE|CONCATENATE|CONDENSE|'
              r'CONSTANTS|CONTEXTS|CONTINUE|CONTROLS|COUNTRY|CURRENCY|'
              r'DATA|DATE|DECIMALS|DEFAULT|DEFINE|DEFINITION|DEFERRED|DEMAND|'
@@ -388,15 +388,15 @@ class ABAPLexer(RegexLexer):
              r'LANGUAGE|LEAVE|LENGTH|LINES|LOAD|LOCAL|'
              r'JOIN|'
              r'KEY|'
-             r'NEXT|'
+             r'NEW|NEXT|'
              r'MAXIMUM|MESSAGE|METHOD[S]?|MINIMUM|MODULE|MODIFIER|MODIFY|MOVE|MULTIPLY|'
              r'NODES|NUMBER|'
              r'OBLIGATORY|OBJECT|OF|OFF|ON|OTHERS|OVERLAY|'
              r'PACK|PAD|PARAMETERS|PERCENTAGE|POSITION|PROGRAM|PROVIDE|PUBLIC|PUT|PF\d\d|'
              r'RAISE|RAISING|RANGES?|READ|RECEIVE|REDEFINITION|REFRESH|REJECT|REPORT|RESERVE|'
-             r'RESUME|RETRY|RETURN|RETURNING|RIGHT|ROLLBACK|REPLACE|'
+             r'REF|RESUME|RETRY|RETURN|RETURNING|RIGHT|ROLLBACK|REPLACE|'
              r'SCROLL|SEARCH|SELECT|SHIFT|SIGN|SINGLE|SIZE|SKIP|SORT|SPLIT|STATICS|STOP|'
-             r'STYLE|SUBMATCHES|SUBMIT|SUBTRACT|SUM(?!\()|SUMMARY|SUMMING|SUPPLY|'
+             r'STYLE|SUBMATCHES|SUBMIT|SUBTRACT|SUM(?!\()|SUMMARY|SUMMING|SUPPLY|SWITCH|'
              r'TABLE|TABLES|TIMESTAMP|TIMES?|TIMEZONE|TITLE|\??TO|'
              r'TOP-OF-PAGE|TRANSFER|TRANSLATE|TRY|TYPES|'
              r'ULINE|UNDER|UNPACK|UPDATE|USING|'
diff --git a/pygments/lexers/c_cpp.py b/pygments/lexers/c_cpp.py
index 59749fa670..65f3c4bcec 100644
--- a/pygments/lexers/c_cpp.py
+++ b/pygments/lexers/c_cpp.py
@@ -64,9 +64,12 @@ class CFamilyLexer(RegexLexer):
             ('^(' + _ws1 + ')(#)',
              bygroups(using(this), Comment.Preproc), 'macro'),
             # Labels:
-            (r'(^[ \t]*)'                                  # Line start and possible indentation.
-             r'(?!(?:public|private|protected|default)\b)' # Not followed by keywords which can be mistaken as labels.
-             r'(' + _ident + r')(\s*)(:)(?!:)',            # Actual label, followed by a single colon.
+            # Line start and possible indentation.
+            (r'(^[ \t]*)'
+             # Not followed by keywords which can be mistaken as labels.
+             r'(?!(?:public|private|protected|default)\b)'
+             # Actual label, followed by a single colon.
+             r'(' + _ident + r')(\s*)(:)(?!:)',
              bygroups(Whitespace, Name.Label, Whitespace, Punctuation)),
             (r'\n', Whitespace),
             (r'[^\S\n]+', Whitespace),
@@ -84,10 +87,13 @@ class CFamilyLexer(RegexLexer):
              bygroups(String.Affix, String.Char, String.Char, String.Char)),
 
              # Hexadecimal floating-point literals (C11, C++17)
-            (r'0[xX](' + _hexpart + r'\.' + _hexpart + r'|\.' + _hexpart + r'|' + _hexpart + r')[pP][+-]?' + _hexpart + r'[lL]?', Number.Float),
+            (r'0[xX](' + _hexpart + r'\.' + _hexpart + r'|\.' + _hexpart +
+             r'|' + _hexpart + r')[pP][+-]?' + _hexpart + r'[lL]?', Number.Float),
 
-            (r'(-)?(' + _decpart + r'\.' + _decpart + r'|\.' + _decpart + r'|' + _decpart + r')[eE][+-]?' + _decpart + r'[fFlL]?', Number.Float),
-            (r'(-)?((' + _decpart + r'\.(' + _decpart + r')?|\.' + _decpart + r')[fFlL]?)|(' + _decpart + r'[fFlL])', Number.Float),
+            (r'(-)?(' + _decpart + r'\.' + _decpart + r'|\.' + _decpart + r'|' +
+             _decpart + r')[eE][+-]?' + _decpart + r'[fFlL]?', Number.Float),
+            (r'(-)?((' + _decpart + r'\.(' + _decpart + r')?|\.' +
+             _decpart + r')[fFlL]?)|(' + _decpart + r'[fFlL])', Number.Float),
             (r'(-)?0[xX]' + _hexpart + _intsuffix, Number.Hex),
             (r'(-)?0[bB][01](\'?[01])*' + _intsuffix, Number.Bin),
             (r'(-)?0(\'?[0-7])+' + _intsuffix, Number.Oct),
@@ -106,7 +112,7 @@ class CFamilyLexer(RegexLexer):
         'keywords': [
             (r'(struct|union)(\s+)', bygroups(Keyword, Whitespace), 'classname'),
             (r'case\b', Keyword, 'case-value'),
-            (words(('asm', 'auto', 'break', 'const', 'continue', 'default', 
+            (words(('asm', 'auto', 'break', 'const', 'continue', 'default',
                     'do', 'else', 'enum', 'extern', 'for', 'goto', 'if',
                     'register', 'restricted', 'return', 'sizeof', 'struct',
                     'static', 'switch', 'typedef', 'volatile', 'while', 'union',
@@ -129,25 +135,29 @@ class CFamilyLexer(RegexLexer):
             include('keywords'),
             # functions
             (r'(' + _namespaced_ident + r'(?:[&*\s])+)'  # return arguments
-             r'(' + _possible_comments + r')'    # possible comments
+             r'(' + _possible_comments + r')'
              r'(' + _namespaced_ident + r')'             # method name
-             r'(' + _possible_comments + r')'    # possible comments
-             r'(\([^;"\']*?\))'                          # signature
-             r'(' + _possible_comments + r')'    # possible comments
+             r'(' + _possible_comments + r')'
+             r'(\([^;"\')]*?\))'                         # signature
+             r'(' + _possible_comments + r')'
              r'([^;{/"\']*)(\{)',
-             bygroups(using(this), using(this, state='whitespace'), Name.Function, using(this, state='whitespace'),
-                      using(this), using(this, state='whitespace'), using(this), Punctuation),
+             bygroups(using(this), using(this, state='whitespace'),
+                      Name.Function, using(this, state='whitespace'),
+                      using(this), using(this, state='whitespace'),
+                      using(this), Punctuation),
              'function'),
             # function declarations
             (r'(' + _namespaced_ident + r'(?:[&*\s])+)'  # return arguments
-             r'(' + _possible_comments + r')'    # possible comments
+             r'(' + _possible_comments + r')'
              r'(' + _namespaced_ident + r')'             # method name
-             r'(' + _possible_comments + r')'    # possible comments
-             r'(\([^;"\']*?\))'                          # signature
-             r'(' + _possible_comments + r')'    # possible comments
+             r'(' + _possible_comments + r')'
+             r'(\([^;"\')]*?\))'                         # signature
+             r'(' + _possible_comments + r')'
              r'([^;/"\']*)(;)',
-             bygroups(using(this), using(this, state='whitespace'), Name.Function, using(this, state='whitespace'),
-                      using(this), using(this, state='whitespace'), using(this), Punctuation)),
+             bygroups(using(this), using(this, state='whitespace'),
+                      Name.Function, using(this, state='whitespace'),
+                      using(this), using(this, state='whitespace'),
+                      using(this), Punctuation)),
             include('types'),
             default('statement'),
         ],
@@ -174,9 +184,11 @@ class CFamilyLexer(RegexLexer):
         ],
         'macro': [
             (r'('+_ws1+r')(include)('+_ws1+r')("[^"]+")([^\n]*)',
-                bygroups(using(this), Comment.Preproc, using(this), Comment.PreprocFile, Comment.Single)),
+                bygroups(using(this), Comment.Preproc, using(this),
+                         Comment.PreprocFile, Comment.Single)),
             (r'('+_ws1+r')(include)('+_ws1+r')(<[^>]+>)([^\n]*)',
-                bygroups(using(this), Comment.Preproc, using(this), Comment.PreprocFile, Comment.Single)),
+                bygroups(using(this), Comment.Preproc, using(this),
+                         Comment.PreprocFile, Comment.Single)),
             (r'[^/\n]+', Comment.Preproc),
             (r'/[*](.|\n)*?[*]/', Comment.Multiline),
             (r'//.*?\n', Comment.Single, '#pop'),
@@ -221,12 +233,12 @@ class CFamilyLexer(RegexLexer):
         'mode_t', 'nfds_t', 'pid_t', 'rlim_t', 'sig_t', 'sighandler_t', 'siginfo_t',
         'sigset_t', 'sigval_t', 'socklen_t', 'timer_t', 'uid_t'}
     c11_atomic_types = {
-        'atomic_bool', 'atomic_char', 'atomic_schar', 'atomic_uchar', 'atomic_short', 
+        'atomic_bool', 'atomic_char', 'atomic_schar', 'atomic_uchar', 'atomic_short',
         'atomic_ushort', 'atomic_int', 'atomic_uint', 'atomic_long', 'atomic_ulong',
-        'atomic_llong', 'atomic_ullong', 'atomic_char16_t', 'atomic_char32_t', 'atomic_wchar_t', 
-        'atomic_int_least8_t', 'atomic_uint_least8_t', 'atomic_int_least16_t', 
+        'atomic_llong', 'atomic_ullong', 'atomic_char16_t', 'atomic_char32_t', 'atomic_wchar_t',
+        'atomic_int_least8_t', 'atomic_uint_least8_t', 'atomic_int_least16_t',
         'atomic_uint_least16_t', 'atomic_int_least32_t', 'atomic_uint_least32_t',
-        'atomic_int_least64_t', 'atomic_uint_least64_t', 'atomic_int_fast8_t', 
+        'atomic_int_least64_t', 'atomic_uint_least64_t', 'atomic_int_fast8_t',
         'atomic_uint_fast8_t', 'atomic_int_fast16_t', 'atomic_uint_fast16_t',
         'atomic_int_fast32_t', 'atomic_uint_fast32_t', 'atomic_int_fast64_t',
         'atomic_uint_fast64_t', 'atomic_intptr_t', 'atomic_uintptr_t', 'atomic_size_t',
@@ -286,7 +298,7 @@ class CLexer(CFamilyLexer):
     tokens = {
         'keywords': [
             (words((
-                '_Alignas', '_Alignof', '_Noreturn', '_Generic', '_Thread_local', 
+                '_Alignas', '_Alignof', '_Noreturn', '_Generic', '_Thread_local',
                 '_Static_assert', '_Imaginary', 'noreturn', 'imaginary', 'complex'),
                 suffix=r'\b'), Keyword),
             inherit
@@ -370,7 +382,7 @@ class CppLexer(CFamilyLexer):
                 'private', 'protected', 'public', 'reinterpret_cast', 'class',
                 'restrict', 'static_cast', 'template', 'this', 'throw', 'throws',
                 'try', 'typeid', 'using', 'virtual', 'constexpr', 'nullptr', 'concept',
-                'decltype', 'noexcept', 'override', 'final', 'constinit', 'consteval', 
+                'decltype', 'noexcept', 'override', 'final', 'constinit', 'consteval',
                 'co_await', 'co_return', 'co_yield', 'requires', 'import', 'module',
                 'typename'),
                suffix=r'\b'), Keyword),
diff --git a/pygments/lexers/c_like.py b/pygments/lexers/c_like.py
index fb09ca8d82..96a322601d 100644
--- a/pygments/lexers/c_like.py
+++ b/pygments/lexers/c_like.py
@@ -38,10 +38,11 @@ class PikeLexer(CppLexer):
         'statements': [
             (words((
                 'catch', 'new', 'private', 'protected', 'public', 'gauge',
-                'throw', 'throws', 'class', 'interface', 'implement', 'abstract', 'extends', 'from',
-                'this', 'super', 'constant', 'final', 'static', 'import', 'use', 'extern',
-                'inline', 'proto', 'break', 'continue', 'if', 'else', 'for',
-                'while', 'do', 'switch', 'case', 'as', 'in', 'version', 'return', 'true', 'false', 'null',
+                'throw', 'throws', 'class', 'interface', 'implement', 'abstract',
+                'extends', 'from', 'this', 'super', 'constant', 'final', 'static',
+                'import', 'use', 'extern', 'inline', 'proto', 'break', 'continue',
+                'if', 'else', 'for', 'while', 'do', 'switch', 'case', 'as', 'in',
+                'version', 'return', 'true', 'false', 'null',
                 '__VERSION__', '__MAJOR__', '__MINOR__', '__BUILD__', '__REAL_VERSION__',
                 '__REAL_MAJOR__', '__REAL_MINOR__', '__REAL_BUILD__', '__DATE__', '__TIME__',
                 '__FILE__', '__DIR__', '__LINE__', '__AUTO_BIGNUM__', '__NT__', '__PIKE__',
@@ -126,7 +127,7 @@ class ClayLexer(RegexLexer):
         ],
         'strings': [
             (r'(?i)\\(x[0-9a-f]{2}|.)', String.Escape),
-            (r'.', String),
+            (r'[^\\"]+', String),
         ],
         'nl': [
             (r'\n', String),
diff --git a/pygments/lexers/capnproto.py b/pygments/lexers/capnproto.py
index 202b072706..18107964f3 100644
--- a/pygments/lexers/capnproto.py
+++ b/pygments/lexers/capnproto.py
@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, default
 from pygments.token import Text, Comment, Keyword, Name, Literal, Whitespace
 
diff --git a/pygments/lexers/cddl.py b/pygments/lexers/cddl.py
index 1d29787c1e..e55b655a5a 100644
--- a/pygments/lexers/cddl.py
+++ b/pygments/lexers/cddl.py
@@ -12,24 +12,12 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
+from pygments.lexer import RegexLexer, bygroups, include, words
+from pygments.token import Comment, Error, Keyword, Name, Number, Operator, \
+    Punctuation, String, Whitespace
 
 __all__ = ['CddlLexer']
 
-from pygments.lexer import RegexLexer, bygroups, include, words
-from pygments.token import (
-    Comment,
-    Error,
-    Keyword,
-    Name,
-    Number,
-    Operator,
-    Punctuation,
-    String,
-    Text,
-    Whitespace,
-)
-
 
 class CddlLexer(RegexLexer):
     """
@@ -143,15 +131,11 @@ class CddlLexer(RegexLexer):
             # Barewords as member keys (must be matched before values, types, typenames,
             # groupnames).
             # Token type is String as barewords are always interpreted as such.
-            (
-                r"({bareword})(\s*)(:)".format(bareword=_re_id),
-                bygroups(String, Whitespace, Punctuation),
-            ),
+            (r"({bareword})(\s*)(:)".format(bareword=_re_id),
+             bygroups(String, Whitespace, Punctuation)),
             # predefined types
-            (
-                words(_prelude_types, prefix=r"(?![\-_$@])\b", suffix=r"\b(?![\-_$@])"),
-                Name.Builtin,
-            ),
+            (words(_prelude_types, prefix=r"(?![\-_$@])\b", suffix=r"\b(?![\-_$@])"),
+             Name.Builtin),
             # user-defined groupnames, typenames
             (_re_id, Name.Class),
             # values
@@ -160,10 +144,8 @@ class CddlLexer(RegexLexer):
             (r"0x[0-9a-fA-F]+(\.[0-9a-fA-F]+)?p[+-]?\d+", Number.Hex),  # hexfloat
             (r"0x[0-9a-fA-F]+", Number.Hex),  # hex
             # Float
-            (
-                r"{int}(?=(\.\d|e[+-]?\d))(?:\.\d+)?(?:e[+-]?\d+)?".format(int=_re_int),
-                Number.Float,
-            ),
+            (r"{int}(?=(\.\d|e[+-]?\d))(?:\.\d+)?(?:e[+-]?\d+)?".format(int=_re_int),
+             Number.Float),
             # Int
             (_re_int, Number.Integer),
             (r'"(\\\\|\\"|[^"])*"', String.Double),
diff --git a/pygments/lexers/comal.py b/pygments/lexers/comal.py
index 0235cab637..258d32e93f 100644
--- a/pygments/lexers/comal.py
+++ b/pygments/lexers/comal.py
@@ -34,7 +34,7 @@ class Comal80Lexer(RegexLexer):
     #
     _suffix = r"\b(?!['\[\]←£\\])"
     _identifier = r"[a-z]['\[\]←£\\\w]*"
-    
+
     tokens = {
         'root': [
             (r'//.*\n', Comment.Single),
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py
index 40493af4f8..eaf6fd3919 100644
--- a/pygments/lexers/compiled.py
+++ b/pygments/lexers/compiled.py
@@ -16,7 +16,7 @@
 from pygments.lexers.go import GoLexer
 from pygments.lexers.rust import RustLexer
 from pygments.lexers.c_like import ECLexer, ValaLexer, CudaLexer
-from pygments.lexers.pascal import DelphiLexer, Modula2Lexer
+from pygments.lexers.pascal import DelphiLexer, PortugolLexer, Modula2Lexer
 from pygments.lexers.ada import AdaLexer
 from pygments.lexers.business import CobolLexer, CobolFreeformatLexer
 from pygments.lexers.fortran import FortranLexer
diff --git a/pygments/lexers/configs.py b/pygments/lexers/configs.py
index 1209e4e70f..e04c722e22 100644
--- a/pygments/lexers/configs.py
+++ b/pygments/lexers/configs.py
@@ -11,7 +11,7 @@
 import re
 
 from pygments.lexer import ExtendedRegexLexer, RegexLexer, default, words, \
-    bygroups, include, using
+    bygroups, include, using, line_re
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Whitespace, Literal, Error, Generic
 from pygments.lexers.shell import BashLexer
@@ -45,12 +45,22 @@ class IniLexer(RegexLexer):
         'root': [
             (r'\s+', Whitespace),
             (r'[;#].*', Comment.Single),
-            (r'\[.*?\]$', Keyword),
-            (r'(.*?)([ \t]*)(=)([ \t]*)([^\t\n]*)',
+            (r'(\[.*?\])([ \t]*)$', bygroups(Keyword, Whitespace)),
+            (r'(.*?)([  \t]*)([=:])([ \t]*)([^;#\n]*)(\\)(\s+)',
+             bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String,
+                      Text, Whitespace),
+             "value"),
+            (r'(.*?)([ \t]*)([=:])([  \t]*)([^ ;#\n]*(?: +[^ ;#\n]+)*)',
              bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String)),
             # standalone option, supported by some INI parsers
             (r'(.+?)$', Name.Attribute),
         ],
+        'value': [     # line continuation
+            (r'\s+', Whitespace),
+            (r'(\s*)(.*)(\\)([ \t]*)',
+             bygroups(Whitespace, String, Text, Whitespace)),
+            (r'.*$', String, "#pop"),
+        ],
     }
 
     def analyse_text(text):
@@ -119,14 +129,26 @@ class PropertiesLexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r'^(\w+)([ \t])(\w+\s*)$', bygroups(Name.Attribute, Whitespace, String)),
-            (r'^\w+(\\[ \t]\w*)*$', Name.Attribute),
-            (r'(^ *)([#!].*)', bygroups(Whitespace, Comment)),
-            # More controversial comments
-            (r'(^ *)((?:;|//).*)', bygroups(Whitespace, Comment)),
-            (r'(.*?)([ \t]*)([=:])([ \t]*)(.*(?:(?<=\\)\n.*)*)',
-             bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String)),
-            (r'\s', Whitespace),
+            (r'\s+', Whitespace),
+            (r'[!#].*|/{2}.*', Comment.Single),
+            # search for first separator
+            (r'([^\\\n]|\\.)*?(?=[ \f\t=:])', Name.Attribute, "separator"),
+            # empty key
+            (r'.+?$', Name.Attribute),
+        ],
+        'separator': [
+            # search for line continuation escape
+            (r'([ \f\t]*)([=:]*)([ \f\t]*)(.*(?<!\\)(?:\\{2})*)(\\)(?!\\)$',
+             bygroups(Whitespace, Operator, Whitespace, String, Text), "value", "#pop"),
+            (r'([ \f\t]*)([=:]*)([ \f\t]*)(.*)',
+             bygroups(Whitespace, Operator, Whitespace, String), "#pop"),
+        ],
+        'value': [     # line continuation
+            (r'\s+', Whitespace),
+            # search for line continuation escape
+            (r'(\s*)(.*(?<!\\)(?:\\{2})*)(\\)(?!\\)([ \t]*)',
+             bygroups(Whitespace, String, Text, Whitespace)),
+            (r'.*$', String, "#pop"),
         ],
     }
 
@@ -653,7 +675,6 @@ def heredoc_callback(self, match, ctx):
         tolerant = True  # leading whitespace is always accepted
 
         lines = []
-        line_re = re.compile('.*?\n')
 
         for match in line_re.finditer(ctx.text, ctx.pos):
             if tolerant:
@@ -723,14 +744,12 @@ def heredoc_callback(self, match, ctx):
              bygroups(Keyword.Reserved, Whitespace, Name.Class, Whitespace, Name.Variable, Whitespace, Punctuation)),
 
             # here-doc style delimited strings
-            (
-                r'(<<-?)\s*([a-zA-Z_]\w*)(.*?\n)',
-                heredoc_callback,
-            )
+            (r'(<<-?)\s*([a-zA-Z_]\w*)(.*?\n)', heredoc_callback),
         ],
         'identifier': [
             (r'\b(var\.[0-9a-zA-Z-_\.\[\]]+)\b', bygroups(Name.Variable)),
-            (r'\b([0-9a-zA-Z-_\[\]]+\.[0-9a-zA-Z-_\.\[\]]+)\b', bygroups(Name.Variable)),
+            (r'\b([0-9a-zA-Z-_\[\]]+\.[0-9a-zA-Z-_\.\[\]]+)\b',
+             bygroups(Name.Variable)),
         ],
         'punctuation': [
             (r'[\[\]()\{\},.?:!=]', Punctuation),
diff --git a/pygments/lexers/cplint.py b/pygments/lexers/cplint.py
index 5c10885f61..9ef3c9bec2 100644
--- a/pygments/lexers/cplint.py
+++ b/pygments/lexers/cplint.py
@@ -3,25 +3,22 @@
     ~~~~~~~~~~~~~~~~~~~~~~
 
     Lexer for the cplint language
-    
+
     :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import bygroups, inherit, words
 from pygments.lexers import PrologLexer
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation
+from pygments.token import Operator, Keyword, Name, String, Punctuation
 
 __all__ = ['CplintLexer']
 
 
 class CplintLexer(PrologLexer):
     """
-    Lexer for cplint files, including CP-logic, Logic Programs with Annotated Disjunctions, 
-    Distributional Clauses syntax, ProbLog, DTProbLog
+    Lexer for cplint files, including CP-logic, Logic Programs with Annotated
+    Disjunctions, Distributional Clauses syntax, ProbLog, DTProbLog.
 
     .. versionadded:: 2.12
     """
@@ -33,15 +30,15 @@ class CplintLexer(PrologLexer):
 
     tokens = {
         'root': [
-            (r'map_query',Keyword),
-            (words(('gaussian','uniform_dens','dirichlet','gamma','beta','poisson','binomial','geometric',
-              'exponential','pascal','multinomial','user','val',
-              'uniform','discrete','finite')),Name.Builtin),
-            (r'([a-z]+)(:)', bygroups(String.Atom, Punctuation)), # annotations of atoms
+            (r'map_query', Keyword),
+            (words(('gaussian', 'uniform_dens', 'dirichlet', 'gamma', 'beta',
+                    'poisson', 'binomial', 'geometric', 'exponential', 'pascal',
+                    'multinomial', 'user', 'val', 'uniform', 'discrete',
+                    'finite')), Name.Builtin),
+            # annotations of atoms
+            (r'([a-z]+)(:)', bygroups(String.Atom, Punctuation)),
             (r':(-|=)|::?|~=?|=>', Operator),
             (r'\?', Name.Builtin),
             inherit,
         ],
     }
-
-
diff --git a/pygments/lexers/crystal.py b/pygments/lexers/crystal.py
index 7154a9b69e..2a0238e8a8 100644
--- a/pygments/lexers/crystal.py
+++ b/pygments/lexers/crystal.py
@@ -10,15 +10,13 @@
 
 import re
 
-from pygments.lexer import ExtendedRegexLexer, include, \
-    bygroups, default, words
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Error, Whitespace
+from pygments.lexer import ExtendedRegexLexer, include, bygroups, default, \
+    words, line_re
+from pygments.token import Comment, Operator, Keyword, Name, String, Number, \
+    Punctuation, Error, Whitespace
 
 __all__ = ['CrystalLexer']
 
-line_re = re.compile('.*?\n')
-
 
 CRYSTAL_OPERATORS = [
     '!=', '!~', '!', '%', '&&', '&', '**', '*', '+', '-', '/', '<=>', '<<', '<=', '<',
diff --git a/pygments/lexers/csound.py b/pygments/lexers/csound.py
index eddc834e78..014a6f575c 100644
--- a/pygments/lexers/csound.py
+++ b/pygments/lexers/csound.py
@@ -25,7 +25,7 @@
 
 class CsoundLexer(RegexLexer):
     url = 'https://csound.com/'
-    
+
     tokens = {
         'whitespace': [
             (r'[ \t]+', Whitespace),
diff --git a/pygments/lexers/css.py b/pygments/lexers/css.py
index 9cbd0d33ac..4d7cb46fe3 100644
--- a/pygments/lexers/css.py
+++ b/pygments/lexers/css.py
@@ -13,8 +13,8 @@
 
 from pygments.lexer import ExtendedRegexLexer, RegexLexer, include, bygroups, \
     default, words, inherit
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Whitespace
+from pygments.token import Comment, Operator, Keyword, Name, String, Number, \
+    Punctuation, Whitespace
 from pygments.lexers._css_builtins import _css_properties
 
 __all__ = ['CssLexer', 'SassLexer', 'ScssLexer', 'LessCssLexer']
diff --git a/pygments/lexers/d.py b/pygments/lexers/d.py
index 672ffd3ee9..10fa3b55c5 100644
--- a/pygments/lexers/d.py
+++ b/pygments/lexers/d.py
@@ -9,8 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer, include, words, bygroups
-from pygments.token import Text, Comment, Keyword, Name, String, \
-    Number, Punctuation, Whitespace
+from pygments.token import Comment, Keyword, Name, String, Number, \
+    Punctuation, Whitespace
 
 __all__ = ['DLexer', 'CrocLexer', 'MiniDLexer']
 
diff --git a/pygments/lexers/dalvik.py b/pygments/lexers/dalvik.py
index 11cc230d18..4380f0e04a 100644
--- a/pygments/lexers/dalvik.py
+++ b/pygments/lexers/dalvik.py
@@ -51,8 +51,10 @@ class SmaliLexer(RegexLexer):
              r'sparse-switch|catchall|catch|line|parameter|local|prologue|'
              r'epilogue|source))', bygroups(Whitespace, Keyword)),
             (r'^([ \t]*)(\.end)( )(field|subannotation|annotation|method|array-data|'
-             'packed-switch|sparse-switch|parameter|local)', bygroups(Whitespace, Keyword, Whitespace, Keyword)),
-            (r'^([ \t]*)(\.restart)( )(local)', bygroups(Whitespace, Keyword, Whitespace, Keyword)),
+             'packed-switch|sparse-switch|parameter|local)',
+             bygroups(Whitespace, Keyword, Whitespace, Keyword)),
+            (r'^([ \t]*)(\.restart)( )(local)',
+             bygroups(Whitespace, Keyword, Whitespace, Keyword)),
         ],
         'access-modifier': [
             (r'(public|private|protected|static|final|synchronized|bridge|'
diff --git a/pygments/lexers/data.py b/pygments/lexers/data.py
index e7d0a8436d..d1887304c7 100644
--- a/pygments/lexers/data.py
+++ b/pygments/lexers/data.py
@@ -231,7 +231,7 @@ def callback(lexer, match, context):
             # whitespaces separating tokens
             (r'[ ]+', Whitespace),
             # key with colon
-            (r'''([^#,:?\[\]{}"'\n]+)(:)(?=[ ]|$)''',
+            (r'''([^#,?\[\]{}"'\n]+)(:)(?=[ ]|$)''',
              bygroups(Name.Tag, set_indent(Punctuation, implicit=True))),
             # tags, anchors and aliases,
             include('descriptors'),
diff --git a/pygments/lexers/dotnet.py b/pygments/lexers/dotnet.py
index 17360dfdfc..0778ffef03 100644
--- a/pygments/lexers/dotnet.py
+++ b/pygments/lexers/dotnet.py
@@ -12,7 +12,7 @@
 from pygments.lexer import RegexLexer, DelegatingLexer, bygroups, include, \
     using, this, default, words
 from pygments.token import Punctuation, Text, Comment, Operator, Keyword, \
-        Name, String, Number, Literal, Other, Whitespace
+    Name, String, Number, Literal, Other, Whitespace
 from pygments.util import get_choice_opt
 from pygments import unistring as uni
 
@@ -62,9 +62,9 @@ class CSharpLexer(RegexLexer):
                   '[' + uni.combine('Lu', 'Ll', 'Lt', 'Lm', 'Nl', 'Nd', 'Pc',
                                     'Cf', 'Mn', 'Mc') + ']*'),
         'full': ('@?(?:_|[^' +
-                 uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl') + '])'
-                 + '[^' + uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl',
-                                        'Nd', 'Pc', 'Cf', 'Mn', 'Mc') + ']*'),
+                 uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl') + '])' +
+                 '[^' + uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl',
+                                      'Nd', 'Pc', 'Cf', 'Mn', 'Mc') + ']*'),
     }
 
     tokens = {}
@@ -78,24 +78,31 @@ class CSharpLexer(RegexLexer):
                  r'(' + cs_ident + ')'                            # method name
                  r'(\s*)(\()',                               # signature start
                  bygroups(Whitespace, using(this), Name.Function, Whitespace,
-                     Punctuation)),
+                          Punctuation)),
                 (r'^(\s*)(\[.*?\])', bygroups(Whitespace, Name.Attribute)),
                 (r'[^\S\n]+', Whitespace),
                 (r'(\\)(\n)', bygroups(Text, Whitespace)),  # line continuation
                 (r'//.*?\n', Comment.Single),
                 (r'/[*].*?[*]/', Comment.Multiline),
                 (r'\n', Whitespace),
-                (r'[~!%^&*()+=|\[\]:;,.<>/?-]', Punctuation),
+                (words((
+                    '>>>=', '>>=', '<<=', '<=', '>=', '+=', '-=', '*=', '/=',
+                    '%=', '&=', '|=', '^=', '??=', '=>', '??', '?.', '!=', '==',
+                    '&&', '||', '>>>', '>>', '<<', '++', '--', '+', '-', '*',
+                    '/', '%', '&', '|', '^', '<', '>', '?', '!', '~', '=',
+                )), Operator),
+                (r'=~|!=|==|<<|>>|[-+/*%=<>&^|]', Operator),
+                (r'[()\[\];:,.]', Punctuation),
                 (r'[{}]', Punctuation),
                 (r'@"(""|[^"])*"', String),
                 (r'\$?"(\\\\|\\[^\\]|[^"\\\n])*["\n]', String),
                 (r"'\\.'|'[^\\]'", String.Char),
-                (r"[0-9](\.[0-9]*)?([eE][+-][0-9]+)?"
+                (r"[0-9]+(\.[0-9]*)?([eE][+-][0-9]+)?"
                  r"[flFLdD]?|0[xX][0-9a-fA-F]+[Ll]?", Number),
                 (r'(#)([ \t]*)(if|endif|else|elif|define|undef|'
                  r'line|error|warning|region|endregion|pragma)\b(.*?)(\n)',
                  bygroups(Comment.Preproc, Whitespace, Comment.Preproc,
-                     Comment.Preproc, Whitespace)),
+                          Comment.Preproc, Whitespace)),
                 (r'\b(extern)(\s+)(alias)\b', bygroups(Keyword, Whitespace,
                  Keyword)),
                 (r'(abstract|as|async|await|base|break|by|case|catch|'
@@ -178,9 +185,9 @@ class NemerleLexer(RegexLexer):
                   '[' + uni.combine('Lu', 'Ll', 'Lt', 'Lm', 'Nl', 'Nd', 'Pc',
                                     'Cf', 'Mn', 'Mc') + ']*'),
         'full': ('@?(?:_|[^' +
-                 uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl') + '])'
-                 + '[^' + uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl',
-                                        'Nd', 'Pc', 'Cf', 'Mn', 'Mc') + ']*'),
+                 uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl') + '])' +
+                 '[^' + uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl',
+                                      'Nd', 'Pc', 'Cf', 'Mn', 'Mc') + ']*'),
     }
 
     tokens = {}
@@ -194,7 +201,7 @@ class NemerleLexer(RegexLexer):
                  r'(' + cs_ident + ')'                            # method name
                  r'(\s*)(\()',                               # signature start
                  bygroups(Whitespace, using(this), Name.Function, Whitespace, \
-                     Punctuation)),
+                          Punctuation)),
                 (r'^(\s*)(\[.*?\])', bygroups(Whitespace, Name.Attribute)),
                 (r'[^\S\n]+', Whitespace),
                 (r'(\\)(\n)', bygroups(Text, Whitespace)),  # line continuation
@@ -207,8 +214,8 @@ class NemerleLexer(RegexLexer):
                     'splice-string2'),
                 (r'<#', String, 'recursive-string'),
 
-                (r'(<\[)(\s*)(' + cs_ident + ':)?', bygroups(Keyword,
-                    Whitespace, Keyword)),
+                (r'(<\[)(\s*)(' + cs_ident + ':)?',
+                 bygroups(Keyword, Whitespace, Keyword)),
                 (r'\]\>', Keyword),
 
                 # quasiquotation only
@@ -414,8 +421,9 @@ class VbNetLexer(RegexLexer):
              Comment.Preproc),
             (r'[(){}!#,.:]', Punctuation),
             (r'(Option)(\s+)(Strict|Explicit|Compare)(\s+)'
-             r'(On|Off|Binary|Text)', bygroups(Keyword.Declaration, Whitespace,
-                 Keyword.Declaration, Whitespace, Keyword.Declaration)),
+             r'(On|Off|Binary|Text)',
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration,
+                      Whitespace, Keyword.Declaration)),
             (words((
                 'AddHandler', 'Alias', 'ByRef', 'ByVal', 'Call', 'Case',
                 'Catch', 'CBool', 'CByte', 'CChar', 'CDate', 'CDec', 'CDbl',
@@ -567,9 +575,9 @@ class FSharpLexer(RegexLexer):
     """
 
     name = 'F#'
-    url= 'https://fsharp.org/'
+    url = 'https://fsharp.org/'
     aliases = ['fsharp', 'f#']
-    filenames = ['*.fs', '*.fsi']
+    filenames = ['*.fs', '*.fsi', '*.fsx']
     mimetypes = ['text/x-fsharp']
 
     keywords = [
@@ -649,7 +657,7 @@ class FSharpLexer(RegexLexer):
             (r'\b(%s)\b' % '|'.join(primitives), Keyword.Type),
             (r'(#)([ \t]*)(if|endif|else|line|nowarn|light|\d+)\b(.*?)(\n)',
              bygroups(Comment.Preproc, Whitespace, Comment.Preproc,
-                 Comment.Preproc, Whitespace)),
+                      Comment.Preproc, Whitespace)),
 
             (r"[^\W\d][\w']*", Name),
 
diff --git a/pygments/lexers/dsls.py b/pygments/lexers/dsls.py
index 0b51341a81..ea16766483 100644
--- a/pygments/lexers/dsls.py
+++ b/pygments/lexers/dsls.py
@@ -232,7 +232,7 @@ class ZeekLexer(RegexLexer):
         'directives': [
             (r'@(load-plugin|load-sigs|load|unload)\b.*$', Comment.Preproc),
             (r'@(DEBUG|DIR|FILENAME|deprecated|if|ifdef|ifndef|else|endif)\b', Comment.Preproc),
-            (r'(@prefixes)(\s*)((\+?=).*)$', bygroups(Comment.Preproc, 
+            (r'(@prefixes)(\s*)((\+?=).*)$', bygroups(Comment.Preproc,
                 Whitespace, Comment.Preproc)),
         ],
 
@@ -601,7 +601,8 @@ class AlloyLexer(RegexLexer):
 
     flags = re.MULTILINE | re.DOTALL
 
-    iden_rex = r'[a-zA-Z_][\w\']*'
+    iden_rex = r'[a-zA-Z_][\w]*"*'
+    string_rex = r'"\b(\\\\|\\[^\\]|[^"\\])*"'
     text_tuple = (r'[^\S\n]+', Whitespace)
 
     tokens = {
@@ -621,6 +622,10 @@ class AlloyLexer(RegexLexer):
             (r'\{', Operator, '#pop'),
             (iden_rex, Name, '#pop'),
         ],
+        'fact': [
+            include('fun'),
+            (string_rex, String, '#pop'),
+        ],
         'root': [
             (r'--.*?$', Comment.Single),
             (r'//.*?$', Comment.Single),
@@ -631,17 +636,20 @@ class AlloyLexer(RegexLexer):
             (r'(sig|enum)(\s+)', bygroups(Keyword.Declaration, Whitespace), 'sig'),
             (r'(iden|univ|none)\b', Keyword.Constant),
             (r'(int|Int)\b', Keyword.Type),
-            (r'(this|abstract|extends|set|seq|one|lone|let)\b', Keyword),
+            (r'(var|this|abstract|extends|set|seq|one|lone|let)\b', Keyword),
             (r'(all|some|no|sum|disj|when|else)\b', Keyword),
-            (r'(run|check|for|but|exactly|expect|as)\b', Keyword),
+            (r'(run|check|for|but|exactly|expect|as|steps)\b', Keyword),
+            (r'(always|after|eventually|until|release)\b', Keyword), # future time operators
+            (r'(historically|before|once|since|triggered)\b', Keyword), # past time operators
             (r'(and|or|implies|iff|in)\b', Operator.Word),
-            (r'(fun|pred|fact|assert)(\s+)', bygroups(Keyword, Whitespace), 'fun'),
-            (r'!|#|&&|\+\+|<<|>>|>=|<=>|<=|\.|->', Operator),
-            (r'[-+/*%=<>&!^|~{}\[\]().]', Operator),
+            (r'(fun|pred|assert)(\s+)', bygroups(Keyword, Whitespace), 'fun'),
+            (r'(fact)(\s+)', bygroups(Keyword, Whitespace), 'fact'),
+            (r'!|#|&&|\+\+|<<|>>|>=|<=>|<=|\.\.|\.|->', Operator),
+            (r'[-+/*%=<>&!^|~{}\[\]().\';]', Operator),
             (iden_rex, Name),
             (r'[:,]', Punctuation),
             (r'[0-9]+', Number.Integer),
-            (r'"(\\\\|\\[^\\]|[^"\\])*"', String),
+            (string_rex, String),
             (r'\n', Whitespace),
         ]
     }
diff --git a/pygments/lexers/dylan.py b/pygments/lexers/dylan.py
index 38ddfb4a91..4d0acb90e1 100644
--- a/pygments/lexers/dylan.py
+++ b/pygments/lexers/dylan.py
@@ -10,8 +10,9 @@
 
 import re
 
-from pygments.lexer import Lexer, RegexLexer, bygroups, do_insertions, default
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+from pygments.lexer import Lexer, RegexLexer, bygroups, do_insertions, \
+    default, line_re
+from pygments.token import Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Literal, Whitespace
 
 __all__ = ['DylanLexer', 'DylanConsoleLexer', 'DylanLidLexer']
@@ -259,7 +260,6 @@ class DylanConsoleLexer(Lexer):
     filenames = ['*.dylan-console']
     mimetypes = ['text/x-dylan-console']
 
-    _line_re = re.compile('.*?\n')
     _prompt_re = re.compile(r'\?| ')
 
     def get_tokens_unprocessed(self, text):
@@ -267,7 +267,7 @@ def get_tokens_unprocessed(self, text):
 
         curcode = ''
         insertions = []
-        for match in self._line_re.finditer(text):
+        for match in line_re.finditer(text):
             line = match.group()
             m = self._prompt_re.match(line)
             if m is not None:
diff --git a/pygments/lexers/ecl.py b/pygments/lexers/ecl.py
index 7fa243a0b2..e092997a39 100644
--- a/pygments/lexers/ecl.py
+++ b/pygments/lexers/ecl.py
@@ -11,7 +11,7 @@
 import re
 
 from pygments.lexer import RegexLexer, include, bygroups, words
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+from pygments.token import Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Whitespace
 
 __all__ = ['ECLLexer']
@@ -79,39 +79,48 @@ class ECLLexer(RegexLexer):
              Keyword.Reserved),
             # These are classed differently, check later
             (words((
-                'ALL', 'AND', 'ANY', 'AS', 'ATMOST', 'BEFORE', 'BEGINC++', 'BEST', 'BETWEEN', 'CASE',
-                'CONST', 'COUNTER', 'CSV', 'DESCEND', 'ENCRYPT', 'ENDC++', 'ENDMACRO', 'EXCEPT',
-                'EXCLUSIVE', 'EXPIRE', 'EXPORT', 'EXTEND', 'FALSE', 'FEW', 'FIRST', 'FLAT', 'FULL',
-                'FUNCTION', 'GROUP', 'HEADER', 'HEADING', 'HOLE', 'IFBLOCK', 'IMPORT', 'IN', 'JOINED',
-                'KEEP', 'KEYED', 'LAST', 'LEFT', 'LIMIT', 'LOAD', 'LOCAL', 'LOCALE', 'LOOKUP', 'MACRO',
-                'MANY', 'MAXCOUNT', 'MAXLENGTH', 'MIN SKEW', 'MODULE', 'INTERFACE', 'NAMED', 'NOCASE',
-                'NOROOT', 'NOSCAN', 'NOSORT', 'NOT', 'OF', 'ONLY', 'OPT', 'OR', 'OUTER', 'OVERWRITE',
-                'PACKED', 'PARTITION', 'PENALTY', 'PHYSICALLENGTH', 'PIPE', 'QUOTE', 'RELATIONSHIP',
-                'REPEAT', 'RETURN', 'RIGHT', 'SCAN', 'SELF', 'SEPARATOR', 'SERVICE', 'SHARED', 'SKEW',
-                'SKIP', 'SQL', 'STORE', 'TERMINATOR', 'THOR', 'THRESHOLD', 'TOKEN', 'TRANSFORM', 'TRIM',
-                'TRUE', 'TYPE', 'UNICODEORDER', 'UNSORTED', 'VALIDATE', 'VIRTUAL', 'WHOLE', 'WILD',
-                'WITHIN', 'XML', 'XPATH', '__COMPRESSED__'), suffix=r'\b'),
+                'ALL', 'AND', 'ANY', 'AS', 'ATMOST', 'BEFORE', 'BEGINC++', 'BEST',
+                'BETWEEN', 'CASE', 'CONST', 'COUNTER', 'CSV', 'DESCEND', 'ENCRYPT',
+                'ENDC++', 'ENDMACRO', 'EXCEPT', 'EXCLUSIVE', 'EXPIRE', 'EXPORT',
+                'EXTEND', 'FALSE', 'FEW', 'FIRST', 'FLAT', 'FULL', 'FUNCTION',
+                'GROUP', 'HEADER', 'HEADING', 'HOLE', 'IFBLOCK', 'IMPORT', 'IN',
+                'JOINED', 'KEEP', 'KEYED', 'LAST', 'LEFT', 'LIMIT', 'LOAD', 'LOCAL',
+                'LOCALE', 'LOOKUP', 'MACRO', 'MANY', 'MAXCOUNT', 'MAXLENGTH',
+                'MIN SKEW', 'MODULE', 'INTERFACE', 'NAMED', 'NOCASE', 'NOROOT',
+                'NOSCAN', 'NOSORT', 'NOT', 'OF', 'ONLY', 'OPT', 'OR', 'OUTER',
+                'OVERWRITE', 'PACKED', 'PARTITION', 'PENALTY', 'PHYSICALLENGTH',
+                'PIPE', 'QUOTE', 'RELATIONSHIP', 'REPEAT', 'RETURN', 'RIGHT',
+                'SCAN', 'SELF', 'SEPARATOR', 'SERVICE', 'SHARED', 'SKEW', 'SKIP',
+                'SQL', 'STORE', 'TERMINATOR', 'THOR', 'THRESHOLD', 'TOKEN',
+                'TRANSFORM', 'TRIM', 'TRUE', 'TYPE', 'UNICODEORDER', 'UNSORTED',
+                'VALIDATE', 'VIRTUAL', 'WHOLE', 'WILD', 'WITHIN', 'XML', 'XPATH',
+                '__COMPRESSED__'), suffix=r'\b'),
              Keyword.Reserved),
         ],
         'functions': [
             (words((
-                'ABS', 'ACOS', 'ALLNODES', 'ASCII', 'ASIN', 'ASSTRING', 'ATAN', 'ATAN2', 'AVE', 'CASE',
-                'CHOOSE', 'CHOOSEN', 'CHOOSESETS', 'CLUSTERSIZE', 'COMBINE', 'CORRELATION', 'COS',
-                'COSH', 'COUNT', 'COVARIANCE', 'CRON', 'DATASET', 'DEDUP', 'DEFINE', 'DENORMALIZE',
-                'DISTRIBUTE', 'DISTRIBUTED', 'DISTRIBUTION', 'EBCDIC', 'ENTH', 'ERROR', 'EVALUATE',
-                'EVENT', 'EVENTEXTRA', 'EVENTNAME', 'EXISTS', 'EXP', 'FAILCODE', 'FAILMESSAGE',
-                'FETCH', 'FROMUNICODE', 'GETISVALID', 'GLOBAL', 'GRAPH', 'GROUP', 'HASH', 'HASH32',
-                'HASH64', 'HASHCRC', 'HASHMD5', 'HAVING', 'IF', 'INDEX', 'INTFORMAT', 'ISVALID',
-                'ITERATE', 'JOIN', 'KEYUNICODE', 'LENGTH', 'LIBRARY', 'LIMIT', 'LN', 'LOCAL', 'LOG', 'LOOP',
-                'MAP', 'MATCHED', 'MATCHLENGTH', 'MATCHPOSITION', 'MATCHTEXT', 'MATCHUNICODE',
-                'MAX', 'MERGE', 'MERGEJOIN', 'MIN', 'NOLOCAL', 'NONEMPTY', 'NORMALIZE', 'PARSE', 'PIPE',
-                'POWER', 'PRELOAD', 'PROCESS', 'PROJECT', 'PULL', 'RANDOM', 'RANGE', 'RANK', 'RANKED',
-                'REALFORMAT', 'RECORDOF', 'REGEXFIND', 'REGEXREPLACE', 'REGROUP', 'REJECTED',
-                'ROLLUP', 'ROUND', 'ROUNDUP', 'ROW', 'ROWDIFF', 'SAMPLE', 'SET', 'SIN', 'SINH', 'SIZEOF',
-                'SOAPCALL', 'SORT', 'SORTED', 'SQRT', 'STEPPED', 'STORED', 'SUM', 'TABLE', 'TAN', 'TANH',
-                'THISNODE', 'TOPN', 'TOUNICODE', 'TRANSFER', 'TRIM', 'TRUNCATE', 'TYPEOF', 'UNGROUP',
-                'UNICODEORDER', 'VARIANCE', 'WHICH', 'WORKUNIT', 'XMLDECODE', 'XMLENCODE',
-                'XMLTEXT', 'XMLUNICODE'), suffix=r'\b'),
+                'ABS', 'ACOS', 'ALLNODES', 'ASCII', 'ASIN', 'ASSTRING', 'ATAN',
+                'ATAN2', 'AVE', 'CASE', 'CHOOSE', 'CHOOSEN', 'CHOOSESETS',
+                'CLUSTERSIZE', 'COMBINE', 'CORRELATION', 'COS', 'COSH', 'COUNT',
+                'COVARIANCE', 'CRON', 'DATASET', 'DEDUP', 'DEFINE', 'DENORMALIZE',
+                'DISTRIBUTE', 'DISTRIBUTED', 'DISTRIBUTION', 'EBCDIC', 'ENTH',
+                'ERROR', 'EVALUATE', 'EVENT', 'EVENTEXTRA', 'EVENTNAME', 'EXISTS',
+                'EXP', 'FAILCODE', 'FAILMESSAGE', 'FETCH', 'FROMUNICODE',
+                'GETISVALID', 'GLOBAL', 'GRAPH', 'GROUP', 'HASH', 'HASH32',
+                'HASH64', 'HASHCRC', 'HASHMD5', 'HAVING', 'IF', 'INDEX',
+                'INTFORMAT', 'ISVALID', 'ITERATE', 'JOIN', 'KEYUNICODE', 'LENGTH',
+                'LIBRARY', 'LIMIT', 'LN', 'LOCAL', 'LOG', 'LOOP', 'MAP', 'MATCHED',
+                'MATCHLENGTH', 'MATCHPOSITION', 'MATCHTEXT', 'MATCHUNICODE', 'MAX',
+                'MERGE', 'MERGEJOIN', 'MIN', 'NOLOCAL', 'NONEMPTY', 'NORMALIZE',
+                'PARSE', 'PIPE', 'POWER', 'PRELOAD', 'PROCESS', 'PROJECT', 'PULL',
+                'RANDOM', 'RANGE', 'RANK', 'RANKED', 'REALFORMAT', 'RECORDOF',
+                'REGEXFIND', 'REGEXREPLACE', 'REGROUP', 'REJECTED', 'ROLLUP',
+                'ROUND', 'ROUNDUP', 'ROW', 'ROWDIFF', 'SAMPLE', 'SET', 'SIN',
+                'SINH', 'SIZEOF', 'SOAPCALL', 'SORT', 'SORTED', 'SQRT', 'STEPPED',
+                'STORED', 'SUM', 'TABLE', 'TAN', 'TANH', 'THISNODE', 'TOPN',
+                'TOUNICODE', 'TRANSFER', 'TRIM', 'TRUNCATE', 'TYPEOF', 'UNGROUP',
+                'UNICODEORDER', 'VARIANCE', 'WHICH', 'WORKUNIT', 'XMLDECODE',
+                'XMLENCODE', 'XMLTEXT', 'XMLUNICODE'), suffix=r'\b'),
              Name.Function),
         ],
         'string': [
diff --git a/pygments/lexers/eiffel.py b/pygments/lexers/eiffel.py
index 793fad882d..db7858c6bc 100644
--- a/pygments/lexers/eiffel.py
+++ b/pygments/lexers/eiffel.py
@@ -9,8 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer, include, words, bygroups
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Whitespace
+from pygments.token import Comment, Operator, Keyword, Name, String, Number, \
+    Punctuation, Whitespace
 
 __all__ = ['EiffelLexer']
 
@@ -35,8 +35,10 @@ class EiffelLexer(RegexLexer):
             # Please note that keyword and operator are case insensitive.
             (r'(?i)(true|false|void|current|result|precursor)\b', Keyword.Constant),
             (r'(?i)(not|xor|implies|or)\b', Operator.Word),
-            (r'(?i)(and)(?:(\s+)(then))?\b', bygroups(Operator.Word, Whitespace, Operator.Word)),
-            (r'(?i)(or)(?:(\s+)(else))?\b', bygroups(Operator.Word, Whitespace, Operator.Word)),
+            (r'(?i)(and)(?:(\s+)(then))?\b',
+             bygroups(Operator.Word, Whitespace, Operator.Word)),
+            (r'(?i)(or)(?:(\s+)(else))?\b',
+             bygroups(Operator.Word, Whitespace, Operator.Word)),
             (words((
                 'across', 'agent', 'alias', 'all', 'as', 'assign', 'attached',
                 'attribute', 'check', 'class', 'convert', 'create', 'debug',
diff --git a/pygments/lexers/elm.py b/pygments/lexers/elm.py
index c9fce501b6..4174f2b289 100644
--- a/pygments/lexers/elm.py
+++ b/pygments/lexers/elm.py
@@ -9,8 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer, words, include, bygroups
-from pygments.token import Comment, Keyword, Name, Number, Punctuation, String, \
-    Text, Whitespace
+from pygments.token import Comment, Keyword, Name, Number, Punctuation, \
+    String, Whitespace
 
 __all__ = ['ElmLexer']
 
diff --git a/pygments/lexers/elpi.py b/pygments/lexers/elpi.py
index e1fc19d419..4fb3aced0b 100644
--- a/pygments/lexers/elpi.py
+++ b/pygments/lexers/elpi.py
@@ -9,16 +9,17 @@
 """
 
 from pygments.lexer import RegexLexer, bygroups, include
-from pygments.token import \
-    Text, Comment, Operator, Keyword, Name, String, Number
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number
 
 __all__ = ['ElpiLexer']
 
+
 class ElpiLexer(RegexLexer):
     """
     Lexer for the Elpi programming language.
 
-    .. versionadded::2.11
+    .. versionadded:: 2.11
     """
 
     name = 'Elpi'
@@ -26,7 +27,7 @@ class ElpiLexer(RegexLexer):
     aliases = ['elpi']
     filenames = ['*.elpi']
     mimetypes = ['text/x-elpi']
-    
+
     lcase_re = r"[a-z]"
     ucase_re = r"[A-Z]"
     digit_re = r"[0-9]"
@@ -35,88 +36,107 @@ class ElpiLexer(RegexLexer):
     idchar_re = r"({}|{}|{}|{})".format(lcase_re,ucase_re,digit_re,schar_re)
     idcharstarns_re = r"({}*(\.({}|{}){}*)*)".format(idchar_re, lcase_re, ucase_re, idchar_re)
     symbchar_re = r"({}|{}|{}|{}|:)".format(lcase_re, ucase_re, digit_re, schar_re)
-    constant_re = r"({}{}*|{}{}|{}{}*|_{}+)".format(ucase_re, idchar_re, lcase_re, idcharstarns_re,schar2_re, symbchar_re,idchar_re)
-    symbol_re=r"(,|<=>|->|:-|;|\?-|->|&|=>|\bas\b|\buvar\b|<|=<|=|==|>=|>|\bi<|\bi=<|\bi>=|\bi>|\bis\b|\br<|\br=<|\br>=|\br>|\bs<|\bs=<|\bs>=|\bs>|@|::|\[\]|`->|`:|`:=|\^|-|\+|\bi-|\bi\+|r-|r\+|/|\*|\bdiv\b|\bi\*|\bmod\b|\br\*|~|\bi~|\br~)"
-    escape_re=r"\(({}|{})\)".format(constant_re,symbol_re)
+    constant_re = r"({}{}*|{}{}|{}{}*|_{}+)".format(ucase_re, idchar_re, lcase_re, idcharstarns_re, schar2_re, symbchar_re, idchar_re)
+    symbol_re = r"(,|<=>|->|:-|;|\?-|->|&|=>|\bas\b|\buvar\b|<|=<|=|==|>=|>|\bi<|\bi=<|\bi>=|\bi>|\bis\b|\br<|\br=<|\br>=|\br>|\bs<|\bs=<|\bs>=|\bs>|@|::|\[\]|`->|`:|`:=|\^|-|\+|\bi-|\bi\+|r-|r\+|/|\*|\bdiv\b|\bi\*|\bmod\b|\br\*|~|\bi~|\br~)"
+    escape_re = r"\(({}|{})\)".format(constant_re,symbol_re)
     const_sym_re = r"({}|{}|{})".format(constant_re,symbol_re,escape_re)
 
     tokens = {
-        'root': [ include('elpi') ],
+        'root': [
+            include('elpi')
+        ],
 
         'elpi': [
-
             include('_elpi-comment'),
 
-            (r"(:before|:after|:if|:name)(\s*)(\")",bygroups(Keyword.Mode,Text.Whitespace,String.Double),'elpi-string'),
-            (r"(:index)(\s*\()",bygroups(Keyword.Mode,Text.Whitespace),'elpi-indexing-expr'),
-            (r"\b(external pred|pred)(\s+)({})".format(const_sym_re),bygroups(Keyword.Declaration,Text.Whitespace,Name.Function),'elpi-pred-item'),
-            (r"\b(external type|type)(\s+)(({}(,\s*)?)+)".format(const_sym_re),bygroups(Keyword.Declaration,Text.Whitespace,Name.Function),'elpi-type'),
-            (r"\b(kind)(\s+)(({}|,)+)".format(const_sym_re),bygroups(Keyword.Declaration,Text.Whitespace,Name.Function),'elpi-type'),
-            (r"\b(typeabbrev)(\s+)({})".format(const_sym_re),bygroups(Keyword.Declaration,Text.Whitespace,Name.Function),'elpi-type'),
-            (r"\b(accumulate)(\s+)(\")",bygroups(Keyword.Declaration,Text.Whitespace,String.Double),'elpi-string'),
-            (r"\b(accumulate|namespace|local)(\s+)({})".format(constant_re),bygroups(Keyword.Declaration,Text.Whitespace,Text)),
-            (r"\b(shorten)(\s+)({}\.)".format(constant_re),bygroups(Keyword.Declaration,Text.Whitespace,Text)),
-            (r"\b(pi|sigma)(\s+)([a-zA-Z][A-Za-z0-9_ ]*)(\\)",bygroups(Keyword.Declaration,Text.Whitespace,Name.Variable,Text)),
-            (r"\b(constraint)(\s+)(({}(\s+)?)+)".format(const_sym_re),bygroups(Keyword.Declaration,Text.Whitespace,Name.Function),'elpi-chr-rule-start'),
+            (r"(:before|:after|:if|:name)(\s*)(\")",
+             bygroups(Keyword.Mode, Text.Whitespace, String.Double),
+             'elpi-string'),
+            (r"(:index)(\s*\()", bygroups(Keyword.Mode, Text.Whitespace),
+             'elpi-indexing-expr'),
+            (r"\b(external pred|pred)(\s+)({})".format(const_sym_re),
+             bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
+             'elpi-pred-item'),
+            (r"\b(external type|type)(\s+)(({}(,\s*)?)+)".format(const_sym_re),
+             bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
+             'elpi-type'),
+            (r"\b(kind)(\s+)(({}|,)+)".format(const_sym_re),
+             bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
+             'elpi-type'),
+            (r"\b(typeabbrev)(\s+)({})".format(const_sym_re),
+             bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
+             'elpi-type'),
+            (r"\b(accumulate)(\s+)(\")",
+             bygroups(Keyword.Declaration, Text.Whitespace, String.Double),
+             'elpi-string'),
+            (r"\b(accumulate|namespace|local)(\s+)({})".format(constant_re),
+             bygroups(Keyword.Declaration, Text.Whitespace, Text)),
+            (r"\b(shorten)(\s+)({}\.)".format(constant_re),
+             bygroups(Keyword.Declaration, Text.Whitespace, Text)),
+            (r"\b(pi|sigma)(\s+)([a-zA-Z][A-Za-z0-9_ ]*)(\\)",
+             bygroups(Keyword.Declaration, Text.Whitespace, Name.Variable, Text)),
+            (r"\b(constraint)(\s+)(({}(\s+)?)+)".format(const_sym_re),
+             bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
+             'elpi-chr-rule-start'),
 
-            (r"(?=[A-Z_]){}".format(constant_re),Name.Variable),
-            (r"(?=[a-z_]){}\\".format(constant_re),Name.Variable),
-            (r"_",Name.Variable),
-            (r"({}|!|=>|;)".format(symbol_re),Keyword.Declaration),
-            (constant_re,Text),
-            (r"\[|\]|\||=>",Keyword.Declaration),
+            (r"(?=[A-Z_]){}".format(constant_re), Name.Variable),
+            (r"(?=[a-z_]){}\\".format(constant_re), Name.Variable),
+            (r"_", Name.Variable),
+            (r"({}|!|=>|;)".format(symbol_re), Keyword.Declaration),
+            (constant_re, Text),
+            (r"\[|\]|\||=>", Keyword.Declaration),
             (r'"', String.Double, 'elpi-string'),
             (r'`', String.Double, 'elpi-btick'),
             (r'\'', String.Double, 'elpi-tick'),
             (r'\{[^\{]', Text, 'elpi-spill'),
-            (r"\(",Text,'elpi-in-parens'),
+            (r"\(", Text, 'elpi-in-parens'),
             (r'\d[\d_]*', Number.Integer),
             (r'-?\d[\d_]*(.[\d_]*)?([eE][+\-]?\d[\d_]*)', Number.Float),
             (r"[\+\*\-/\^\.]", Operator),
         ],
         '_elpi-comment': [
-            (r'%[^\n]*\n',Comment),
-            (r'/\*',Comment,'elpi-multiline-comment'),
-            (r"\s+",Text.Whitespace),
+            (r'%[^\n]*\n', Comment),
+            (r'/\*', Comment, 'elpi-multiline-comment'),
+            (r"\s+", Text.Whitespace),
         ],
         'elpi-multiline-comment': [
-            (r'\*/',Comment,'#pop'),
-            (r'.',Comment)
+            (r'\*/', Comment, '#pop'),
+            (r'.', Comment)
         ],
         'elpi-indexing-expr':[
-            (r'[0-9 _]+',Number.Integer),
-            (r'\)',Text,'#pop'),
+            (r'[0-9 _]+', Number.Integer),
+            (r'\)', Text, '#pop'),
         ],
         'elpi-type': [
-            (r"(ctype\s+)(\")",bygroups(Keyword.Type,String.Double),'elpi-string'),
-            (r'->',Keyword.Type),
-            (constant_re,Keyword.Type),
-            (r"\(|\)",Keyword.Type),
-            (r"\.",Text,'#pop'),
+            (r"(ctype\s+)(\")", bygroups(Keyword.Type, String.Double), 'elpi-string'),
+            (r'->', Keyword.Type),
+            (constant_re, Keyword.Type),
+            (r"\(|\)", Keyword.Type),
+            (r"\.", Text, '#pop'),
             include('_elpi-comment'),
         ],
         'elpi-chr-rule-start': [
-            (r"\{",Text,'elpi-chr-rule'),
+            (r"\{", Text, 'elpi-chr-rule'),
             include('_elpi-comment'),
         ],
         'elpi-chr-rule': [
-           (r"\brule\b",Keyword.Declaration),
-           (r"\\",Keyword.Declaration),
-           (r"\}",Text,'#pop:2'),
+           (r"\brule\b", Keyword.Declaration),
+           (r"\\", Keyword.Declaration),
+           (r"\}", Text, '#pop:2'),
            include('elpi'),
         ],
         'elpi-pred-item': [
-            (r"[io]:",Keyword.Mode,'elpi-ctype'),
-            (r"\.",Text,'#pop'),
+            (r"[io]:", Keyword.Mode, 'elpi-ctype'),
+            (r"\.", Text, '#pop'),
             include('_elpi-comment'),
         ],
         'elpi-ctype': [
-            (r"(ctype\s+)(\")",bygroups(Keyword.Type,String.Double),'elpi-string'),
-            (r'->',Keyword.Type),
-            (constant_re,Keyword.Type),
-            (r"\(|\)",Keyword.Type),
-            (r",",Text,'#pop'),
-            (r"\.",Text,'#pop:2'),
+            (r"(ctype\s+)(\")", bygroups(Keyword.Type, String.Double), 'elpi-string'),
+            (r'->', Keyword.Type),
+            (constant_re, Keyword.Type),
+            (r"\(|\)", Keyword.Type),
+            (r",", Text, '#pop'),
+            (r"\.", Text, '#pop:2'),
             include('_elpi-comment'),
         ],
         'elpi-btick': [
diff --git a/pygments/lexers/email.py b/pygments/lexers/email.py
index 7d9f17e5c7..1de01ff106 100644
--- a/pygments/lexers/email.py
+++ b/pygments/lexers/email.py
@@ -63,11 +63,9 @@ def get_x_header_tokens(self, match):
             (r"\b(\w[\w\.-]*\.[\w\.-]*\w[a-zA-Z]+)\b", Name.Function),
 
             # IPv4
-            (
-                r"(?<=\b)(?:(?:25[0-5]|2[0-4][0-9]|1?[0-9][0-9]?)\.){3}(?:25[0"
-                r"-5]|2[0-4][0-9]|1?[0-9][0-9]?)(?=\b)",
-                Number.Integer,
-            ),
+            (r"(?<=\b)(?:(?:25[0-5]|2[0-4][0-9]|1?[0-9][0-9]?)\.){3}(?:25[0"
+             r"-5]|2[0-4][0-9]|1?[0-9][0-9]?)(?=\b)",
+             Number.Integer),
 
             # IPv6
             (r"(?<=\b)([0-9a-fA-F]{1,4}:){1,7}:(?!\b)", Number.Hex),
@@ -83,43 +81,27 @@ def get_x_header_tokens(self, match):
              Number.Hex),
             (r"(?<=\b)([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}(?=\b)",
              Number.Hex),
-            (
-                r"(?<=\b)::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}"
-                r"[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}"
-                r"[0-9])(?=\b)",
-                Number.Hex,
-            ),
-            (
-                r"(?<=\b)([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-"
-                r"9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-"
-                r"9])(?=\b)",
-                Number.Hex,
-            ),
+            (r"(?<=\b)::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}"
+             r"[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}"
+             r"[0-9])(?=\b)",
+             Number.Hex),
+            (r"(?<=\b)([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9])"
+             r"{0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])(?=\b)",
+             Number.Hex),
 
             # Date time
-            (
-                r"(?:(Sun|Mon|Tue|Wed|Thu|Fri|Sat),\s+)?(0[1-9]|[1-2]?[0-9]|3["
-                r"01])\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+("
-                r"19[0-9]{2}|[2-9][0-9]{3})\s+(2[0-3]|[0-1][0-9]):([0-5][0-9])"
-                r"(?::(60|[0-5][0-9]))?(?:\.\d{1,5})?\s+([-\+][0-9]{2}[0-5][0-"
-                r"9]|\(?(?:UTC?|GMT|(?:E|C|M|P)(?:ST|ET|DT)|[A-IK-Z])\)?)",
-                Name.Decorator,
-            ),
+            (r"(?:(Sun|Mon|Tue|Wed|Thu|Fri|Sat),\s+)?(0[1-9]|[1-2]?[0-9]|3["
+             r"01])\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+("
+             r"19[0-9]{2}|[2-9][0-9]{3})\s+(2[0-3]|[0-1][0-9]):([0-5][0-9])"
+             r"(?::(60|[0-5][0-9]))?(?:\.\d{1,5})?\s+([-\+][0-9]{2}[0-5][0-"
+             r"9]|\(?(?:UTC?|GMT|(?:E|C|M|P)(?:ST|ET|DT)|[A-IK-Z])\)?)",
+             Name.Decorator),
 
             # RFC-2047 encoded string
-            (
-                r"(=\?)([\w-]+)(\?)([BbQq])(\?)([\[\w!\"#$%&\'()*+,-./:;<=>@[\\"
-                r"\]^_`{|}~]+)(\?=)",
-                bygroups(
-                    String.Affix,
-                    Name.Constant,
-                    String.Affix,
-                    Keyword.Constant,
-                    String.Affix,
-                    Number.Hex,
-                    String.Affix
-                )
-            ),
+            (r"(=\?)([\w-]+)(\?)([BbQq])(\?)([\[\w!\"#$%&\'()*+,-./:;<=>@[\\"
+             r"\]^_`{|}~]+)(\?=)",
+             bygroups(String.Affix, Name.Constant, String.Affix, Keyword.Constant,
+                      String.Affix, Number.Hex, String.Affix)),
 
             # others
             (r'[\s]+', Text.Whitespace),
diff --git a/pygments/lexers/erlang.py b/pygments/lexers/erlang.py
index 6cdca98447..c14cbe560e 100644
--- a/pygments/lexers/erlang.py
+++ b/pygments/lexers/erlang.py
@@ -11,17 +11,14 @@
 import re
 
 from pygments.lexer import Lexer, RegexLexer, bygroups, words, do_insertions, \
-    include, default
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    include, default, line_re
+from pygments.token import Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Whitespace
 
 __all__ = ['ErlangLexer', 'ErlangShellLexer', 'ElixirConsoleLexer',
            'ElixirLexer']
 
 
-line_re = re.compile('.*?\n')
-
-
 class ErlangLexer(RegexLexer):
     """
     For the Erlang functional programming language.
diff --git a/pygments/lexers/esoteric.py b/pygments/lexers/esoteric.py
index a0d1f1e268..aa09463cb8 100644
--- a/pygments/lexers/esoteric.py
+++ b/pygments/lexers/esoteric.py
@@ -9,8 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer, include, words, bygroups
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Error, Whitespace
+from pygments.token import Comment, Operator, Keyword, Name, String, Number, \
+    Punctuation, Error, Whitespace
 
 __all__ = ['BrainfuckLexer', 'BefungeLexer', 'RedcodeLexer', 'CAmkESLexer',
            'CapDLLexer', 'AheuiLexer']
diff --git a/pygments/lexers/ezhil.py b/pygments/lexers/ezhil.py
index 73b7c8b489..caa52d5481 100644
--- a/pygments/lexers/ezhil.py
+++ b/pygments/lexers/ezhil.py
@@ -9,9 +9,10 @@
 """
 
 import re
-from pygments.lexer import RegexLexer, include, words, bygroups
-from pygments.token import Keyword, Text, Comment, Name
-from pygments.token import String, Number, Punctuation, Operator, Whitespace
+
+from pygments.lexer import RegexLexer, include, words
+from pygments.token import Keyword, Comment, Name, String, Number, \
+    Punctuation, Operator, Whitespace
 
 __all__ = ['EzhilLexer']
 
diff --git a/pygments/lexers/factor.py b/pygments/lexers/factor.py
index 9697ac3959..db10652d4a 100644
--- a/pygments/lexers/factor.py
+++ b/pygments/lexers/factor.py
@@ -8,11 +8,9 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, bygroups, default, words
 from pygments.token import Text, Comment, Keyword, Name, String, Number, \
-        Whitespace, Punctuation
+    Whitespace, Punctuation
 
 __all__ = ['FactorLexer']
 
diff --git a/pygments/lexers/fift.py b/pygments/lexers/fift.py
new file mode 100644
index 0000000000..2cd8c383ed
--- /dev/null
+++ b/pygments/lexers/fift.py
@@ -0,0 +1,67 @@
+"""
+    pygments.lexers.fift
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for fift.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include
+from pygments.token import Literal, Comment, Name, String, Number, Whitespace
+
+__all__ = ['FiftLexer']
+
+
+class FiftLexer(RegexLexer):
+    """
+    For Fift source code.
+    """
+
+    name = 'Fift'
+    aliases = ['fift', 'fif']
+    filenames = ['*.fif']
+    url = 'https://ton-blockchain.github.io/docs/fiftbase.pdf'
+
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+
+            include('comments'),
+
+            (r'[\.+]?\"', String, 'string'),
+
+            # numbers
+            (r'0x[0-9a-fA-F]+', Number.Hex),
+            (r'0b[01]+', Number.Bin),
+            (r'-?[0-9]+("/"-?[0-9]+)?', Number.Decimal),
+
+            # slices
+            (r'b\{[01]+\}', Literal),
+            (r'x\{[0-9a-fA-F_]+\}', Literal),
+
+            # byte literal
+            (r'B\{[0-9a-fA-F_]+\}', Literal),
+
+            # treat anything as word
+            (r'\S+', Name)
+        ],
+
+        'string': [
+            (r'\\.', String.Escape),
+            (r'\"', String, '#pop'),
+            (r'[^\"\r\n\\]+', String)
+        ],
+
+        'comments': [
+            (r'//.*', Comment.Singleline),
+            (r'/\*', Comment.Multiline, 'comment'),
+        ],
+        'comment': [
+            (r'[^/*]+', Comment.Multiline),
+            (r'/\*', Comment.Multiline, '#push'),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[*/]', Comment.Multiline),
+        ],
+    }
diff --git a/pygments/lexers/forth.py b/pygments/lexers/forth.py
index 6655cda5ed..2207908bc8 100644
--- a/pygments/lexers/forth.py
+++ b/pygments/lexers/forth.py
@@ -12,7 +12,7 @@
 
 from pygments.lexer import RegexLexer, bygroups
 from pygments.token import Text, Comment, Keyword, Name, String, Number, \
-        Whitespace
+    Whitespace
 
 
 __all__ = ['ForthLexer']
diff --git a/pygments/lexers/fortran.py b/pygments/lexers/fortran.py
index 8d5ea2a210..d45581acd1 100644
--- a/pygments/lexers/fortran.py
+++ b/pygments/lexers/fortran.py
@@ -68,8 +68,8 @@ class FortranLexer(RegexLexer):
                 'FUNCTION', 'GENERIC', 'IF', 'IMAGES', 'IMPLICIT',
                 'IMPORT', 'IMPURE', 'INCLUDE', 'INQUIRE', 'INTENT', 'INTERFACE',
                 'INTRINSIC', 'IS', 'LOCK', 'MEMORY', 'MODULE', 'NAMELIST', 'NULLIFY',
-                'NONE', 'NON_INTRINSIC', 'NON_OVERRIDABLE', 'NOPASS', 'ONLY', 'OPEN', 
-                'OPTIONAL', 'OPTIONS', 'PARAMETER', 'PASS', 'PAUSE', 'POINTER', 'PRINT', 
+                'NONE', 'NON_INTRINSIC', 'NON_OVERRIDABLE', 'NOPASS', 'ONLY', 'OPEN',
+                'OPTIONAL', 'OPTIONS', 'PARAMETER', 'PASS', 'PAUSE', 'POINTER', 'PRINT',
                 'PRIVATE', 'PROGRAM', 'PROCEDURE', 'PROTECTED', 'PUBLIC', 'PURE', 'READ',
                 'RECURSIVE', 'RESULT', 'RETURN', 'REWIND', 'SAVE', 'SELECT', 'SEQUENCE',
                 'STOP', 'SUBMODULE', 'SUBROUTINE', 'SYNC', 'SYNCALL', 'SYNCIMAGES',
diff --git a/pygments/lexers/foxpro.py b/pygments/lexers/foxpro.py
index 62edef8e5c..578c22a02b 100644
--- a/pygments/lexers/foxpro.py
+++ b/pygments/lexers/foxpro.py
@@ -12,7 +12,7 @@
 
 from pygments.lexer import RegexLexer
 from pygments.token import Punctuation, Text, Comment, Operator, Keyword, \
-     Name, String
+    Name, String
 
 __all__ = ['FoxProLexer']
 
diff --git a/pygments/lexers/freefem.py b/pygments/lexers/freefem.py
index a7b15a7e18..6150c152c9 100644
--- a/pygments/lexers/freefem.py
+++ b/pygments/lexers/freefem.py
@@ -8,13 +8,9 @@
     :license: BSD, see LICENSE for details.
 """
 
-from pygments.lexer import RegexLexer, include, bygroups, inherit, words, \
-    default
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation
+from pygments.token import Comment, Operator, Keyword, Name
 
-from pygments.lexers.c_cpp import CLexer, CppLexer
-from pygments.lexers import _mql_builtins
+from pygments.lexers.c_cpp import CppLexer
 
 __all__ = ['FreeFemLexer']
 
diff --git a/pygments/lexers/func.py b/pygments/lexers/func.py
new file mode 100644
index 0000000000..6018f85bf9
--- /dev/null
+++ b/pygments/lexers/func.py
@@ -0,0 +1,108 @@
+"""
+    pygments.lexers.func
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for FunC.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include, words
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number, Whitespace, Punctuation
+
+__all__ = ['FuncLexer']
+
+
+class FuncLexer(RegexLexer):
+    """
+    For FunC source code.
+    """
+
+    name = 'FunC'
+    aliases = ['func', 'fc']
+    filenames = ['*.fc', '*.func']
+
+    # 1. Does not start from "
+    # 2. Can start from ` and end with `, containing any character
+    # 3. Starts with underscore or { or } and have more than 1 character after it
+    # 4. Starts with letter, contains letters, numbers and underscores
+    identifier = r'(?!")(`([^`]+)`|((?=_)_|(?=\{)\{|(?=\})\}|(?![_`{}]))([^;,\[\]\(\)\s~.]+))'
+
+    tokens = {
+        'root': [
+            (r'\n', Whitespace),
+            (r'\s+', Whitespace),
+
+            include('keywords'),
+            include('strings'),
+            include('directives'),
+            include('numeric'),
+            include('comments'),
+            include('storage'),
+            include('functions'),
+            include('variables'),
+
+            (r'[.;(),\[\]~{}]', Punctuation)
+        ],
+        'keywords': [
+            (words((
+                '<=>', '>=', '<=', '!=', '==', '^>>', '~>>',
+                '>>', '<<', '/%', '^%', '~%', '^/', '~/', '+=',
+                '-=', '*=', '/=', '~/=', '^/=', '%=', '^%=', '<<=',
+                '>>=', '~>>=', '^>>=', '&=', '|=', '^=', '^', '=',
+                '~', '/', '%', '-', '*', '+','>',
+                '<', '&', '|', ':', '?'), prefix=r'(?<=\s)', suffix=r'(?=\s)'),
+             Operator),
+            (words((
+                'if', 'ifnot',
+                'else', 'elseif', 'elseifnot',
+                'while', 'do', 'until', 'repeat',
+                'return', 'impure', 'method_id',
+                'forall', 'asm', 'inline', 'inline_ref'), prefix=r'\b', suffix=r'\b'),
+             Keyword),
+            (words(('true', 'false'), prefix=r'\b', suffix=r'\b'), Keyword.Constant),
+        ],
+        'directives': [
+            (r'#include|#pragma', Keyword, 'directive'),
+        ],
+        'directive': [
+            include('strings'),
+            (r'\s+', Whitespace),
+            (r'version|not-version', Keyword),
+            (r'(>=|<=|=|>|<|\^)?([0-9]+)(.[0-9]+)?(.[0-9]+)?', Number), # version
+            (r';', Text, '#pop')
+        ],
+        'strings': [
+            (r'\"([^\n\"]+)\"[Hhcusa]?', String),
+        ],
+        'numeric': [
+            (r'\b(-?(?!_)([\d_]+|0x[\d_a-fA-F]+)|0b[1_0]+)(?<!_)(?=[\s\)\],;])', Number)
+        ],
+        'comments': [
+            (r';;([^\n]*)', Comment.Singleline),
+            (r'\{-', Comment.Multiline, 'comment'),
+        ],
+        'comment': [
+            (r'[^-}{]+', Comment.Multiline),
+            (r'\{-', Comment.Multiline, '#push'),
+            (r'-\}', Comment.Multiline, '#pop'),
+            (r'[-}{]', Comment.Multiline),
+        ],
+        'storage': [
+            (words((
+                'var', 'int', 'slice', 'tuple',
+                'cell', 'builder', 'cont', '_'),
+                prefix=r'\b', suffix=r'(?=[\s\(\),\[\]])'),
+             Keyword.Type),
+            (words(('global', 'const'), prefix=r'\b', suffix=r'\b'), Keyword.Constant),
+        ],
+        'variables': [
+            (identifier, Name.Variable),
+        ],
+        'functions': [
+            # identifier followed by (
+            (identifier + r'(?=[\(])', Name.Function),
+        ]
+    }
diff --git a/pygments/lexers/futhark.py b/pygments/lexers/futhark.py
index 8e3d54f449..95b624d39c 100644
--- a/pygments/lexers/futhark.py
+++ b/pygments/lexers/futhark.py
@@ -8,19 +8,14 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, bygroups
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+from pygments.token import Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Whitespace
 from pygments import unistring as uni
 
 __all__ = ['FutharkLexer']
 
 
-line_re = re.compile('.*?\n')
-
-
 class FutharkLexer(RegexLexer):
     """
     A Futhark lexer
diff --git a/pygments/lexers/gdscript.py b/pygments/lexers/gdscript.py
index f5054f4646..0bfb43f42b 100644
--- a/pygments/lexers/gdscript.py
+++ b/pygments/lexers/gdscript.py
@@ -20,8 +20,6 @@
 
 __all__ = ["GDScriptLexer"]
 
-line_re = re.compile(".*?\n")
-
 
 class GDScriptLexer(RegexLexer):
     """
@@ -37,11 +35,9 @@ class GDScriptLexer(RegexLexer):
     def innerstring_rules(ttype):
         return [
             # the old style '%s' % (...) string formatting
-            (
-                r"%(\(\w+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?"
-                "[hlL]?[E-GXc-giorsux%]",
-                String.Interpol,
-            ),
+            (r"%(\(\w+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?"
+             "[hlL]?[E-GXc-giorsux%]",
+             String.Interpol),
             # backslashes, quotes and formatting signs must be parsed one at a time
             (r'[^\\\'"%\n]+', ttype),
             (r'[\'"\\]', ttype),
@@ -53,239 +49,84 @@ def innerstring_rules(ttype):
     tokens = {
         "root": [
             (r"\n", Whitespace),
-            (
-                r'^(\s*)([rRuUbB]{,2})("""(?:.|\n)*?""")',
-                bygroups(Whitespace, String.Affix, String.Doc),
-            ),
-            (
-                r"^(\s*)([rRuUbB]{,2})('''(?:.|\n)*?''')",
-                bygroups(Whitespace, String.Affix, String.Doc),
-            ),
+            (r'^(\s*)([rRuUbB]{,2})("""(?:.|\n)*?""")',
+             bygroups(Whitespace, String.Affix, String.Doc)),
+            (r"^(\s*)([rRuUbB]{,2})('''(?:.|\n)*?''')",
+             bygroups(Whitespace, String.Affix, String.Doc)),
             (r"[^\S\n]+", Whitespace),
             (r"#.*$", Comment.Single),
             (r"[]{}:(),;[]", Punctuation),
             (r"(\\)(\n)", bygroups(Text, Whitespace)),
             (r"\\", Text),
             (r"(in|and|or|not)\b", Operator.Word),
-            (
-                r"!=|==|<<|>>|&&|\+=|-=|\*=|/=|%=|&=|\|=|\|\||[-~+/*%=<>&^.!|$]",
-                Operator,
-            ),
+            (r"!=|==|<<|>>|&&|\+=|-=|\*=|/=|%=|&=|\|=|\|\||[-~+/*%=<>&^.!|$]",
+             Operator),
             include("keywords"),
             (r"(func)(\s+)", bygroups(Keyword, Whitespace), "funcname"),
             (r"(class)(\s+)", bygroups(Keyword, Whitespace), "classname"),
             include("builtins"),
-            (
-                '([rR]|[uUbB][rR]|[rR][uUbB])(""")',
-                bygroups(String.Affix, String.Double),
-                "tdqs",
-            ),
-            (
-                "([rR]|[uUbB][rR]|[rR][uUbB])(''')",
-                bygroups(String.Affix, String.Single),
-                "tsqs",
-            ),
-            (
-                '([rR]|[uUbB][rR]|[rR][uUbB])(")',
-                bygroups(String.Affix, String.Double),
-                "dqs",
-            ),
-            (
-                "([rR]|[uUbB][rR]|[rR][uUbB])(')",
-                bygroups(String.Affix, String.Single),
-                "sqs",
-            ),
-            (
-                '([uUbB]?)(""")',
-                bygroups(String.Affix, String.Double),
-                combined("stringescape", "tdqs"),
-            ),
-            (
-                "([uUbB]?)(''')",
-                bygroups(String.Affix, String.Single),
-                combined("stringescape", "tsqs"),
-            ),
-            (
-                '([uUbB]?)(")',
-                bygroups(String.Affix, String.Double),
-                combined("stringescape", "dqs"),
-            ),
-            (
-                "([uUbB]?)(')",
-                bygroups(String.Affix, String.Single),
-                combined("stringescape", "sqs"),
-            ),
+            ('([rR]|[uUbB][rR]|[rR][uUbB])(""")',
+             bygroups(String.Affix, String.Double),
+             "tdqs"),
+            ("([rR]|[uUbB][rR]|[rR][uUbB])(''')",
+             bygroups(String.Affix, String.Single),
+             "tsqs"),
+            ('([rR]|[uUbB][rR]|[rR][uUbB])(")',
+             bygroups(String.Affix, String.Double),
+             "dqs"),
+            ("([rR]|[uUbB][rR]|[rR][uUbB])(')",
+             bygroups(String.Affix, String.Single),
+             "sqs"),
+            ('([uUbB]?)(""")',
+             bygroups(String.Affix, String.Double),
+             combined("stringescape", "tdqs")),
+            ("([uUbB]?)(''')",
+             bygroups(String.Affix, String.Single),
+             combined("stringescape", "tsqs")),
+            ('([uUbB]?)(")',
+             bygroups(String.Affix, String.Double),
+             combined("stringescape", "dqs")),
+            ("([uUbB]?)(')",
+             bygroups(String.Affix, String.Single),
+             combined("stringescape", "sqs")),
             include("name"),
             include("numbers"),
         ],
         "keywords": [
-            (
-                words(
-                    (
-                        "and",
-                        "in",
-                        "not",
-                        "or",
-                        "as",
-                        "breakpoint",
-                        "class",
-                        "class_name",
-                        "extends",
-                        "is",
-                        "func",
-                        "setget",
-                        "signal",
-                        "tool",
-                        "const",
-                        "enum",
-                        "export",
-                        "onready",
-                        "static",
-                        "var",
-                        "break",
-                        "continue",
-                        "if",
-                        "elif",
-                        "else",
-                        "for",
-                        "pass",
-                        "return",
-                        "match",
-                        "while",
-                        "remote",
-                        "master",
-                        "puppet",
-                        "remotesync",
-                        "mastersync",
-                        "puppetsync",
-                    ),
-                    suffix=r"\b",
-                ),
-                Keyword,
-            ),
+            (words(("and", "in", "not", "or", "as", "breakpoint", "class",
+                    "class_name", "extends", "is", "func", "setget", "signal",
+                    "tool", "const", "enum", "export", "onready", "static",
+                    "var", "break", "continue", "if", "elif", "else", "for",
+                    "pass", "return", "match", "while", "remote", "master",
+                    "puppet", "remotesync", "mastersync", "puppetsync"),
+                   suffix=r"\b"), Keyword),
         ],
         "builtins": [
-            (
-                words(
-                    (
-                        "Color8",
-                        "ColorN",
-                        "abs",
-                        "acos",
-                        "asin",
-                        "assert",
-                        "atan",
-                        "atan2",
-                        "bytes2var",
-                        "ceil",
-                        "char",
-                        "clamp",
-                        "convert",
-                        "cos",
-                        "cosh",
-                        "db2linear",
-                        "decimals",
-                        "dectime",
-                        "deg2rad",
-                        "dict2inst",
-                        "ease",
-                        "exp",
-                        "floor",
-                        "fmod",
-                        "fposmod",
-                        "funcref",
-                        "hash",
-                        "inst2dict",
-                        "instance_from_id",
-                        "is_inf",
-                        "is_nan",
-                        "lerp",
-                        "linear2db",
-                        "load",
-                        "log",
-                        "max",
-                        "min",
-                        "nearest_po2",
-                        "pow",
-                        "preload",
-                        "print",
-                        "print_stack",
-                        "printerr",
-                        "printraw",
-                        "prints",
-                        "printt",
-                        "rad2deg",
-                        "rand_range",
-                        "rand_seed",
-                        "randf",
-                        "randi",
-                        "randomize",
-                        "range",
-                        "round",
-                        "seed",
-                        "sign",
-                        "sin",
-                        "sinh",
-                        "sqrt",
-                        "stepify",
-                        "str",
-                        "str2var",
-                        "tan",
-                        "tan",
-                        "tanh",
-                        "type_exist",
-                        "typeof",
-                        "var2bytes",
-                        "var2str",
-                        "weakref",
-                        "yield",
-                    ),
-                    prefix=r"(?<!\.)",
-                    suffix=r"\b",
-                ),
-                Name.Builtin,
-            ),
-            (r"((?<!\.)(self|false|true)|(PI|TAU|NAN|INF)" r")\b", Name.Builtin.Pseudo),
-            (
-                words(
-                    (
-                        "bool",
-                        "int",
-                        "float",
-                        "String",
-                        "NodePath",
-                        "Vector2",
-                        "Rect2",
-                        "Transform2D",
-                        "Vector3",
-                        "Rect3",
-                        "Plane",
-                        "Quat",
-                        "Basis",
-                        "Transform",
-                        "Color",
-                        "RID",
-                        "Object",
-                        "NodePath",
-                        "Dictionary",
-                        "Array",
-                        "PackedByteArray",
-                        "PackedInt32Array",
-                        "PackedInt64Array",
-                        "PackedFloat32Array",
-                        "PackedFloat64Array",
-                        "PackedStringArray",
-                        "PackedVector2Array",
-                        "PackedVector3Array",
-                        "PackedColorArray",
-                        "null",
-                        "void",
-                    ),
-                    prefix=r"(?<!\.)",
-                    suffix=r"\b",
-                ),
-                Name.Builtin.Type,
-            ),
+            (words(("Color8", "ColorN", "abs", "acos", "asin", "assert", "atan",
+                    "atan2", "bytes2var", "ceil", "char", "clamp", "convert",
+                    "cos", "cosh", "db2linear", "decimals", "dectime", "deg2rad",
+                    "dict2inst", "ease", "exp", "floor", "fmod", "fposmod",
+                    "funcref", "hash", "inst2dict", "instance_from_id", "is_inf",
+                    "is_nan", "lerp", "linear2db", "load", "log", "max", "min",
+                    "nearest_po2", "pow", "preload", "print", "print_stack",
+                    "printerr", "printraw", "prints", "printt", "rad2deg",
+                    "rand_range", "rand_seed", "randf", "randi", "randomize",
+                    "range", "round", "seed", "sign", "sin", "sinh", "sqrt",
+                    "stepify", "str", "str2var", "tan", "tan", "tanh",
+                    "type_exist", "typeof", "var2bytes", "var2str", "weakref",
+                    "yield"), prefix=r"(?<!\.)", suffix=r"\b"),
+             Name.Builtin),
+            (r"((?<!\.)(self|false|true)|(PI|TAU|NAN|INF)" r")\b",
+             Name.Builtin.Pseudo),
+            (words(("bool", "int", "float", "String", "NodePath", "Vector2",
+                    "Rect2", "Transform2D", "Vector3", "Rect3", "Plane", "Quat",
+                    "Basis", "Transform", "Color", "RID", "Object", "NodePath",
+                    "Dictionary", "Array", "PackedByteArray", "PackedInt32Array",
+                    "PackedInt64Array", "PackedFloat32Array", "PackedFloat64Array",
+                    "PackedStringArray", "PackedVector2Array", "PackedVector3Array",
+                    "PackedColorArray", "null", "void"),
+                   prefix=r"(?<!\.)", suffix=r"\b"),
+             Name.Builtin.Type),
         ],
         "numbers": [
             (r"(\d+\.\d*|\d*\.\d+)([eE][+-]?[0-9]+)?j?", Number.Float),
diff --git a/pygments/lexers/go.py b/pygments/lexers/go.py
index a5de48afd7..8b7d8695a0 100644
--- a/pygments/lexers/go.py
+++ b/pygments/lexers/go.py
@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, bygroups, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Whitespace
diff --git a/pygments/lexers/grammar_notation.py b/pygments/lexers/grammar_notation.py
index 6acc47e2dc..4be4144fc6 100644
--- a/pygments/lexers/grammar_notation.py
+++ b/pygments/lexers/grammar_notation.py
@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, bygroups, include, this, using, words
 from pygments.token import Comment, Keyword, Literal, Name, Number, \
     Operator, Punctuation, String, Text, Whitespace
@@ -196,7 +194,7 @@ class JsgfLexer(RegexLexer):
             (r'\*/', Comment.Multiline, '#pop'),
             (r'^(\s*)(\*?)(\s*)(@(?:example|see))(\s+)'
              r'([\w\W]*?(?=(?:^\s*\*?\s*@|\*/)))',
-             bygroups(Whitespace,Comment.Multiline, Whitespace, Comment.Special,
+             bygroups(Whitespace, Comment.Multiline, Whitespace, Comment.Special,
                       Whitespace, using(this, state='example'))),
             (r'(^\s*\*?\s*)(@\S*)',
              bygroups(Comment.Multiline, Comment.Special)),
diff --git a/pygments/lexers/graph.py b/pygments/lexers/graph.py
index de10e50278..69e5bf15cf 100644
--- a/pygments/lexers/graph.py
+++ b/pygments/lexers/graph.py
@@ -77,10 +77,10 @@ class CypherLexer(RegexLexer):
             (r'(using)(\s+)(periodic)(\s+)(commit)\b',
                 bygroups(Keyword, Whitespace, Keyword, Whitespace, Keyword)),
             (words((
-                'all', 'any', 'as', 'asc', 'ascending', 'assert', 'call', 'case', 'create', 
-                'delete', 'desc', 'descending', 'distinct', 'end', 'fieldterminator', 
-                'foreach', 'in', 'limit', 'match', 'merge', 'none', 'not', 'null', 
-                'remove', 'return', 'set', 'skip', 'single', 'start', 'then', 'union', 
+                'all', 'any', 'as', 'asc', 'ascending', 'assert', 'call', 'case', 'create',
+                'delete', 'desc', 'descending', 'distinct', 'end', 'fieldterminator',
+                'foreach', 'in', 'limit', 'match', 'merge', 'none', 'not', 'null',
+                'remove', 'return', 'set', 'skip', 'single', 'start', 'then', 'union',
                 'unwind', 'yield', 'where', 'when', 'with'), suffix=r'\b'), Keyword),
         ],
         'relations': [
diff --git a/pygments/lexers/gsql.py b/pygments/lexers/gsql.py
index 6af99b27ce..8c7674de20 100755
--- a/pygments/lexers/gsql.py
+++ b/pygments/lexers/gsql.py
@@ -11,16 +11,17 @@
 import re
 
 from pygments.lexer import RegexLexer, include, bygroups, using, this, words
-from pygments.token import Keyword, Punctuation, Comment, Operator, Name,\
-    String, Number, Whitespace, Token
-
+from pygments.token import Keyword, Punctuation, Comment, Operator, Name, \
+    String, Number, Whitespace
 
 __all__ = ["GSQLLexer"]
 
+
 class GSQLLexer(RegexLexer):
 
     """
     For GSQL queries (version 3.x).
+
     .. versionadded:: 2.10
     """
 
@@ -49,25 +50,35 @@ class GSQLLexer(RegexLexer):
         ],
         'keywords': [
             (words((
-             'ACCUM', 'AND', 'ANY', 'API', 'AS', 'ASC', 'AVG', 'BAG', 'BATCH', 'BETWEEN', 'BOOL', 'BOTH',
-             'BREAK', 'BY', 'CASE', 'CATCH', 'COALESCE', 'COMPRESS', 'CONTINUE', 'COUNT',
-             'CREATE', 'DATETIME', 'DATETIME_ADD', 'DATETIME_SUB', 'DELETE', 'DESC', 'DISTRIBUTED', 'DO',
-             'DOUBLE', 'EDGE', 'ELSE', 'END', 'ESCAPE', 'EXCEPTION', 'FALSE', 'FILE', 'FILTER', 'FLOAT', 'FOREACH', 'FOR',
-             'FROM', 'GRAPH', 'GROUP', 'GSQL_INT_MAX', 'GSQL_INT_MIN', 'GSQL_UINT_MAX', 'HAVING', 'IF',
-             'IN', 'INSERT', 'INT', 'INTERPRET', 'INTERSECT', 'INTERVAL', 'INTO', 'IS', 'ISEMPTY', 'JSONARRAY', 'JSONOBJECT', 'LASTHOP',
-             'LEADING', 'LIKE', 'LIMIT', 'LIST', 'LOAD_ACCUM', 'LOG', 'MAP', 'MATCH', 'MAX', 'MIN', 'MINUS', 'NOT',
-             'NOW', 'NULL', 'OFFSET', 'OR', 'ORDER', 'PATH', 'PER', 'PINNED', 'POST_ACCUM', 'POST-ACCUM', 'PRIMARY_ID', 'PRINT',
-             'QUERY', 'RAISE', 'RANGE', 'REPLACE', 'RESET_COLLECTION_ACCUM', 'RETURN', 'RETURNS', 'RUN', 'SAMPLE', 'SELECT', 'SELECT_VERTEX',
-             'SET', 'SRC', 'STATIC', 'STRING', 'SUM', 'SYNTAX', 'TARGET', 'TAGSTGT', 'THEN', 'TO', 'TO_CSV', 'TO_DATETIME', 'TRAILING', 'TRIM', 'TRUE',
-             'TRY', 'TUPLE', 'TYPEDEF', 'UINT', 'UNION', 'UPDATE', 'VALUES', 'VERTEX', 'WHEN', 'WHERE', 'WHILE', 'WITH'), prefix=r'(?<!\.)', suffix=r'\b'), Token.Keyword)
+                'ACCUM', 'AND', 'ANY', 'API', 'AS', 'ASC', 'AVG', 'BAG', 'BATCH',
+                'BETWEEN', 'BOOL', 'BOTH', 'BREAK', 'BY', 'CASE', 'CATCH', 'COALESCE',
+                'COMPRESS', 'CONTINUE', 'COUNT', 'CREATE', 'DATETIME', 'DATETIME_ADD',
+                'DATETIME_SUB', 'DELETE', 'DESC', 'DISTRIBUTED', 'DO', 'DOUBLE',
+                'EDGE', 'ELSE', 'END', 'ESCAPE', 'EXCEPTION', 'FALSE', 'FILE',
+                'FILTER', 'FLOAT', 'FOREACH', 'FOR', 'FROM', 'GRAPH', 'GROUP',
+                'GSQL_INT_MAX', 'GSQL_INT_MIN', 'GSQL_UINT_MAX', 'HAVING', 'IF',
+                'IN', 'INSERT', 'INT', 'INTERPRET', 'INTERSECT', 'INTERVAL', 'INTO',
+                'IS', 'ISEMPTY', 'JSONARRAY', 'JSONOBJECT', 'LASTHOP', 'LEADING',
+                'LIKE', 'LIMIT', 'LIST', 'LOAD_ACCUM', 'LOG', 'MAP', 'MATCH', 'MAX',
+                'MIN', 'MINUS', 'NOT', 'NOW', 'NULL', 'OFFSET', 'OR', 'ORDER', 'PATH',
+                'PER', 'PINNED', 'POST_ACCUM', 'POST-ACCUM', 'PRIMARY_ID', 'PRINT',
+                'QUERY', 'RAISE', 'RANGE', 'REPLACE', 'RESET_COLLECTION_ACCUM',
+                'RETURN', 'RETURNS', 'RUN', 'SAMPLE', 'SELECT', 'SELECT_VERTEX',
+                'SET', 'SRC', 'STATIC', 'STRING', 'SUM', 'SYNTAX', 'TARGET',
+                'TAGSTGT', 'THEN', 'TO', 'TO_CSV', 'TO_DATETIME', 'TRAILING',
+                'TRIM', 'TRUE', 'TRY', 'TUPLE', 'TYPEDEF', 'UINT', 'UNION', 'UPDATE',
+                'VALUES', 'VERTEX', 'WHEN', 'WHERE', 'WHILE', 'WITH'),
+                   prefix=r'(?<!\.)', suffix=r'\b'), Keyword),
         ],
         'clauses': [
-            (words(('accum', 'having', 'limit', 'order', 'postAccum', 'sample', 'where')), Name.Builtin)
+            (words(('accum', 'having', 'limit', 'order', 'postAccum', 'sample', 'where')),
+             Name.Builtin),
         ],
         'accums': [
             (words(('andaccum', 'arrayaccum', 'avgaccum', 'bagaccum', 'bitwiseandaccum',
-             'bitwiseoraccum', 'groupbyaccum', 'heapaccum', 'listaccum', 'MapAccum',
-             'maxaccum', 'minaccum', 'oraccum', 'setaccum', 'sumaccum')), Name.Builtin),
+                    'bitwiseoraccum', 'groupbyaccum', 'heapaccum', 'listaccum',
+                    'MapAccum', 'maxaccum', 'minaccum', 'oraccum', 'setaccum',
+                    'sumaccum')), Name.Builtin),
         ],
         'relations': [
             (r'(-\s?)(\(.*\:\w?\))(\s?-)', bygroups(Operator, using(this), Operator)),
@@ -86,7 +97,8 @@ class GSQLLexer(RegexLexer):
             (r'(\d+\.\d+|\d+)', Number),
         ],
         'operators': [
-            (r'\$|[^0-9|\/|\-](\-\=|\+\=|\*\=|\\\=|\=|\=\=|\=\=\=|\+|\-|\*|\\|\+\=|\>|\<)[^\>|\/]', Operator),
+            (r'\$|[^0-9|\/|\-](\-\=|\+\=|\*\=|\\\=|\=|\=\=|\=\=\=|'
+             r'\+|\-|\*|\\|\+\=|\>|\<)[^\>|\/]', Operator),
             (r'(\||\(|\)|\,|\;|\=|\-|\+|\*|\/|\>|\<|\:)', Operator),
         ],
     }
diff --git a/pygments/lexers/haskell.py b/pygments/lexers/haskell.py
index 2f03174f2f..6b11ca5600 100644
--- a/pygments/lexers/haskell.py
+++ b/pygments/lexers/haskell.py
@@ -11,7 +11,7 @@
 import re
 
 from pygments.lexer import Lexer, RegexLexer, bygroups, do_insertions, \
-    default, include, inherit
+    default, include, inherit, line_re
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Whitespace
 from pygments import unistring as uni
@@ -21,9 +21,6 @@
            'LiterateCryptolLexer', 'KokaLexer']
 
 
-line_re = re.compile('.*?\n')
-
-
 class HaskellLexer(RegexLexer):
     """
     A Haskell lexer based on the lexemes defined in the Haskell 98 Report.
@@ -166,7 +163,7 @@ class HspecLexer(HaskellLexer):
 
     name = 'Hspec'
     aliases = ['hspec']
-    filenames = []
+    filenames = ['*Spec.hs']
     mimetypes = []
 
     tokens = {
diff --git a/pygments/lexers/hexdump.py b/pygments/lexers/hexdump.py
index 58f0e8d641..b766d1de83 100644
--- a/pygments/lexers/hexdump.py
+++ b/pygments/lexers/hexdump.py
@@ -9,7 +9,7 @@
 """
 
 from pygments.lexer import RegexLexer, bygroups, include
-from pygments.token import Text, Name, Number, String, Punctuation, Whitespace
+from pygments.token import Name, Number, String, Punctuation, Whitespace
 
 __all__ = ['HexdumpLexer']
 
diff --git a/pygments/lexers/html.py b/pygments/lexers/html.py
index 1c46504895..f2e0463b03 100644
--- a/pygments/lexers/html.py
+++ b/pygments/lexers/html.py
@@ -13,7 +13,7 @@
 from pygments.lexer import RegexLexer, ExtendedRegexLexer, include, bygroups, \
     default, using
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Punctuation
+    Punctuation, Whitespace
 from pygments.util import looks_like_xml, html_doctype_matches
 
 from pygments.lexers.javascript import JavascriptLexer
@@ -207,7 +207,8 @@ class XmlLexer(RegexLexer):
 
     tokens = {
         'root': [
-            ('[^<&]+', Text),
+            (r'[^<&\s]+', Text),
+            (r'[^<&\S]+', Whitespace),
             (r'&\S*?;', Name.Entity),
             (r'\<\!\[CDATA\[.*?\]\]\>', Comment.Preproc),
             (r'<!--.*?-->', Comment.Multiline),
@@ -217,12 +218,12 @@ class XmlLexer(RegexLexer):
             (r'<\s*/\s*[\w:.-]+\s*>', Name.Tag),
         ],
         'tag': [
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'[\w.:-]+\s*=', Name.Attribute, 'attr'),
             (r'/?\s*>', Name.Tag, '#pop'),
         ],
         'attr': [
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             ('".*?"', String, '#pop'),
             ("'.*?'", String, '#pop'),
             (r'[^\s>]+', String, '#pop'),
diff --git a/pygments/lexers/inferno.py b/pygments/lexers/inferno.py
index 93122b3c64..a3bee4ff22 100644
--- a/pygments/lexers/inferno.py
+++ b/pygments/lexers/inferno.py
@@ -11,7 +11,7 @@
 import re
 
 from pygments.lexer import RegexLexer, include, bygroups, default
-from pygments.token import Punctuation, Text, Comment, Operator, Keyword, \
+from pygments.token import Punctuation, Comment, Operator, Keyword, \
     Name, String, Number, Whitespace
 
 __all__ = ['LimboLexer']
diff --git a/pygments/lexers/int_fiction.py b/pygments/lexers/int_fiction.py
index 0e7c81802c..a31a1e31c0 100644
--- a/pygments/lexers/int_fiction.py
+++ b/pygments/lexers/int_fiction.py
@@ -125,7 +125,7 @@ class Inform6Lexer(RegexLexer):
             (r'[%s]' % _squote, String.Single, ('#pop', 'dictionary-word')),
             (r'[%s]' % _dquote, String.Double, ('#pop', 'string')),
             # Numbers
-            (r'\$[+%s][0-9]*\.?[0-9]*([eE][+%s]?[0-9]+)?' % (_dash, _dash),
+            (r'\$[<>]?[+%s][0-9]*\.?[0-9]*([eE][+%s]?[0-9]+)?' % (_dash, _dash),
              Number.Float, '#pop'),
             (r'\$[0-9a-fA-F]+', Number.Hex, '#pop'),
             (r'\$\$[01]+', Number.Bin, '#pop'),
@@ -160,9 +160,10 @@ class Inform6Lexer(RegexLexer):
             # Other built-in symbols
             (words((
                 'call', 'copy', 'create', 'DEBUG', 'destroy', 'DICT_CHAR_SIZE',
-                'DICT_ENTRY_BYTES', 'DICT_IS_UNICODE', 'DICT_WORD_SIZE', 'false',
-                'FLOAT_INFINITY', 'FLOAT_NAN', 'FLOAT_NINFINITY', 'GOBJFIELD_CHAIN',
-                'GOBJFIELD_CHILD', 'GOBJFIELD_NAME', 'GOBJFIELD_PARENT',
+                'DICT_ENTRY_BYTES', 'DICT_IS_UNICODE', 'DICT_WORD_SIZE', 'DOUBLE_HI_INFINITY',
+                'DOUBLE_HI_NAN', 'DOUBLE_HI_NINFINITY', 'DOUBLE_LO_INFINITY', 'DOUBLE_LO_NAN',
+                'DOUBLE_LO_NINFINITY', 'false', 'FLOAT_INFINITY', 'FLOAT_NAN', 'FLOAT_NINFINITY',
+                'GOBJFIELD_CHAIN', 'GOBJFIELD_CHILD', 'GOBJFIELD_NAME', 'GOBJFIELD_PARENT',
                 'GOBJFIELD_PROPTAB', 'GOBJFIELD_SIBLING', 'GOBJ_EXT_START',
                 'GOBJ_TOTAL_LENGTH', 'Grammar__Version', 'INDIV_PROP_START', 'INFIX',
                 'infix__watching', 'MODULE_MODE', 'name', 'nothing', 'NUM_ATTR_BYTES', 'print',
@@ -411,7 +412,8 @@ class Inform6Lexer(RegexLexer):
         ],
         'property-keyword*': [
             include('_whitespace'),
-            (words(('additive', 'individual', 'long'), suffix=r'\b(?!(\s*|(![^%s]*))*;)' % _newline),
+            (words(('additive', 'individual', 'long'),
+                suffix=r'\b(?=(\s*|(![^%s]*[%s]))*[_a-zA-Z])' % (_newline, _newline)),
              Keyword),
             default('#pop')
         ],
diff --git a/pygments/lexers/iolang.py b/pygments/lexers/iolang.py
index da247d918e..a760d1cfc4 100644
--- a/pygments/lexers/iolang.py
+++ b/pygments/lexers/iolang.py
@@ -9,8 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Whitespace
+from pygments.token import Comment, Operator, Keyword, Name, String, Number, \
+    Whitespace
 
 __all__ = ['IoLexer']
 
diff --git a/pygments/lexers/j.py b/pygments/lexers/j.py
index d33207d159..7e5f9a1b49 100644
--- a/pygments/lexers/j.py
+++ b/pygments/lexers/j.py
@@ -9,8 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer, words, include, bygroups
-from pygments.token import Comment, Keyword, Name, Number, Operator, Punctuation, \
-    String, Text, Whitespace
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
+    Punctuation, String, Whitespace
 
 __all__ = ['JLexer']
 
diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py
index 1896fb46f6..eed71f9519 100644
--- a/pygments/lexers/javascript.py
+++ b/pygments/lexers/javascript.py
@@ -11,7 +11,7 @@
 import re
 
 from pygments.lexer import bygroups, combined, default, do_insertions, include, \
-    inherit, Lexer, RegexLexer, this, using, words
+    inherit, Lexer, RegexLexer, this, using, words, line_re
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Other, Generic, Whitespace
 from pygments.util import get_bool_opt
@@ -29,7 +29,6 @@
                  '\u200c\u200d]|\\\\u[a-fA-F0-9]{4})')
 JS_IDENT = JS_IDENT_START + '(?:' + JS_IDENT_PART + ')*'
 
-line_re = re.compile('.*?\n')
 
 class JavascriptLexer(RegexLexer):
     """
@@ -801,7 +800,7 @@ class ObjectiveJLexer(RegexLexer):
     mimetypes = ['text/x-objective-j']
 
     #: optional Comment or Whitespace
-    _ws = r'(?:\s|//.*?\n|/[*].*?[*]/)*'
+    _ws = r'(?:\s|//[^\n]*\n|/[*](?:[^*]|[*][^/])*[*]/)*'
 
     flags = re.DOTALL | re.MULTILINE
 
diff --git a/pygments/lexers/jsonnet.py b/pygments/lexers/jsonnet.py
new file mode 100644
index 0000000000..305058cb9f
--- /dev/null
+++ b/pygments/lexers/jsonnet.py
@@ -0,0 +1,168 @@
+"""
+    pygments.lexers.jsonnet
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for Jsonnet data templating language.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import include, RegexLexer, words
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
+    Punctuation, String, Text, Whitespace
+
+__all__ = ['JsonnetLexer']
+
+jsonnet_token = r'[^\W\d]\w*'
+jsonnet_function_token = jsonnet_token + r'(?=\()'
+
+
+def string_rules(quote_mark):
+    return [
+        (r"[^{}\\]".format(quote_mark), String),
+        (r"\\.", String.Escape),
+        (quote_mark, String, '#pop'),
+    ]
+
+
+def quoted_field_name(quote_mark):
+    return [
+        (r'([^{quote}\\]|\\.)*{quote}'.format(quote=quote_mark),
+         Name.Variable, 'field_separator')
+    ]
+
+
+class JsonnetLexer(RegexLexer):
+    """Lexer for Jsonnet source code."""
+
+    name = 'Jsonnet'
+    aliases = ['jsonnet']
+    filenames = ['*.jsonnet', '*.libsonnet']
+    url = "https://jsonnet.org"
+    tokens = {
+        # Not used by itself
+        '_comments': [
+            (r'(//|#).*\n', Comment.Single),
+            (r'/\*\*([^/]|/(?!\*))*\*/', String.Doc),
+            (r'/\*([^/]|/(?!\*))*\*/', Comment),
+        ],
+        'root': [
+            include('_comments'),
+            (r"@'.*'", String),
+            (r'@".*"', String),
+            (r"'", String, 'singlestring'),
+            (r'"', String, 'doublestring'),
+            (r'\|\|\|(.|\n)*\|\|\|', String),
+            # Jsonnet has no integers, only an IEEE754 64-bit float
+            (r'[+-]?[0-9]+(.[0-9])?', Number.Float),
+            # Omit : despite spec because it appears to be used as a field
+            # separator
+            (r'[!$~+\-&|^=<>*/%]', Operator),
+            (r'\{', Punctuation, 'object'),
+            (r'\[', Punctuation, 'array'),
+            (r'local\b', Keyword, ('local_name')),
+            (r'assert\b', Keyword, 'assert'),
+            (words([
+                'assert', 'else', 'error', 'false', 'for', 'if', 'import',
+                'importstr', 'in', 'null', 'tailstrict', 'then', 'self',
+                'super', 'true',
+             ], suffix=r'\b'), Keyword),
+            (r'\s+', Whitespace),
+            (r'function(?=\()', Keyword, 'function_params'),
+            (r'std\.' + jsonnet_function_token, Name.Builtin, 'function_args'),
+            (jsonnet_function_token, Name.Function, 'function_args'),
+            (jsonnet_token, Name.Variable),
+            (r'[\.()]', Punctuation),
+        ],
+        'singlestring': string_rules("'"),
+        'doublestring': string_rules('"'),
+        'array': [
+            (r',', Punctuation),
+            (r'\]', Punctuation, '#pop'),
+            include('root'),
+        ],
+        'local_name': [
+            (jsonnet_function_token, Name.Function, 'function_params'),
+            (jsonnet_token, Name.Variable),
+            (r'\s+', Whitespace),
+            ('(?==)', Whitespace, ('#pop', 'local_value')),
+        ],
+        'local_value': [
+            (r'=', Operator),
+            (r';', Punctuation, '#pop'),
+            include('root'),
+        ],
+        'assert': [
+            (r':', Punctuation),
+            (r';', Punctuation, '#pop'),
+            include('root'),
+        ],
+        'function_params': [
+            (jsonnet_token, Name.Variable),
+            (r'\(', Punctuation),
+            (r'\)', Punctuation, '#pop'),
+            (r',', Punctuation),
+            (r'\s+', Whitespace),
+            (r'=', Operator, 'function_param_default'),
+        ],
+        'function_args': [
+            (r'\(', Punctuation),
+            (r'\)', Punctuation, '#pop'),
+            (r',', Punctuation),
+            (r'\s+', Whitespace),
+            include('root'),
+        ],
+        'object': [
+            (r'\s+', Whitespace),
+            (r'local\b', Keyword, 'object_local_name'),
+            (r'assert\b', Keyword, 'object_assert'),
+            (r'\[', Operator, 'field_name_expr'),
+            (fr'(?={jsonnet_token})', Text, 'field_name'),
+            (r'\}', Punctuation, '#pop'),
+            (r'"', Name.Variable, 'double_field_name'),
+            (r"'", Name.Variable, 'single_field_name'),
+            include('_comments'),
+        ],
+        'field_name': [
+            (jsonnet_function_token, Name.Function,
+                ('field_separator', 'function_params')
+             ),
+            (jsonnet_token, Name.Variable, 'field_separator'),
+        ],
+        'double_field_name': quoted_field_name('"'),
+        'single_field_name': quoted_field_name("'"),
+        'field_name_expr': [
+            (r'\]', Operator, 'field_separator'),
+            include('root'),
+        ],
+        'function_param_default': [
+            (r'(?=[,\)])', Whitespace, '#pop'),
+            include('root'),
+        ],
+        'field_separator': [
+            (r'\s+', Whitespace),
+            (r'\+?::?:?', Punctuation, ('#pop', '#pop', 'field_value')),
+            include('_comments'),
+        ],
+        'field_value': [
+            (r',', Punctuation, '#pop'),
+            (r'\}', Punctuation, '#pop:2'),
+            include('root'),
+        ],
+        'object_assert': [
+            (r':', Punctuation),
+            (r',', Punctuation, '#pop'),
+            include('root'),
+        ],
+        'object_local_name': [
+            (jsonnet_token, Name.Variable, ('#pop', 'object_local_value')),
+            (r'\s+', Whitespace),
+        ],
+        'object_local_value': [
+            (r'=', Operator),
+            (r',', Punctuation, '#pop'),
+            (r'\}', Punctuation, '#pop:2'),
+            include('root'),
+        ],
+    }
diff --git a/pygments/lexers/julia.py b/pygments/lexers/julia.py
index 97d9163af0..86e760cfae 100644
--- a/pygments/lexers/julia.py
+++ b/pygments/lexers/julia.py
@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import Lexer, RegexLexer, bygroups, do_insertions, \
     words, include
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
@@ -56,7 +54,8 @@ class JuliaLexer(RegexLexer):
             (r'(?<![\]):<>\d.])(:' + allowed_variable + ')', String.Symbol),
 
             # type assertions - excludes expressions like ::typeof(sin) and ::avec[1]
-            (r'(?<=::)(\s*)(' + allowed_variable + r')\b(?![(\[])', bygroups(Whitespace, Keyword.Type)),
+            (r'(?<=::)(\s*)(' + allowed_variable + r')\b(?![(\[])',
+             bygroups(Whitespace, Keyword.Type)),
             # type comparisons
             # - MyType <: A or MyType >: A
             ('(' + allowed_variable + r')(\s*)([<>]:)(\s*)(' + allowed_variable + r')\b(?![(\[])',
@@ -71,8 +70,10 @@ class JuliaLexer(RegexLexer):
             # operators
             # Suffixes aren't actually allowed on all operators, but we'll ignore that
             # since those cases are invalid Julia code.
-            (words([*OPERATORS_LIST, *DOTTED_OPERATORS_LIST], suffix=operator_suffixes), Operator),
-            (words(['.' + o for o in DOTTED_OPERATORS_LIST], suffix=operator_suffixes), Operator),
+            (words([*OPERATORS_LIST, *DOTTED_OPERATORS_LIST],
+                   suffix=operator_suffixes), Operator),
+            (words(['.' + o for o in DOTTED_OPERATORS_LIST],
+                   suffix=operator_suffixes), Operator),
             (words(['...', '..']), Operator),
 
             # NOTE
@@ -96,12 +97,16 @@ class JuliaLexer(RegexLexer):
             (r'(r)(""")', bygroups(String.Affix, String.Regex), 'tqregex'),
             (r'(r)(")', bygroups(String.Affix, String.Regex), 'regex'),
             # other strings
-            (r'(' + allowed_variable + ')?(""")', bygroups(String.Affix, String), 'tqstring'),
-            (r'(' + allowed_variable + ')?(")', bygroups(String.Affix, String), 'string'),
+            (r'(' + allowed_variable + ')?(""")',
+             bygroups(String.Affix, String), 'tqstring'),
+            (r'(' + allowed_variable + ')?(")',
+             bygroups(String.Affix, String), 'string'),
 
             # backticks
-            (r'(' + allowed_variable + ')?(```)', bygroups(String.Affix, String.Backtick), 'tqcommand'),
-            (r'(' + allowed_variable + ')?(`)', bygroups(String.Affix, String.Backtick), 'command'),
+            (r'(' + allowed_variable + ')?(```)',
+             bygroups(String.Affix, String.Backtick), 'tqcommand'),
+            (r'(' + allowed_variable + ')?(`)',
+             bygroups(String.Affix, String.Backtick), 'command'),
 
             # type names
             # - names that begin a curly expression
@@ -172,9 +177,9 @@ class JuliaLexer(RegexLexer):
             (r'([^"\\]|\\[^"])+', String),
         ],
 
-        # 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).
+        # 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).
         'interp': [
             (r'\$' + allowed_variable, String.Interpol),
             (r'(\$)(\()', bygroups(String.Interpol, Punctuation), 'in-intp'),
@@ -186,7 +191,8 @@ class JuliaLexer(RegexLexer):
         ],
 
         'string': [
-            (r'(")(' + allowed_variable + r'|\d+)?', bygroups(String, String.Affix), '#pop'),
+            (r'(")(' + allowed_variable + r'|\d+)?',
+             bygroups(String, String.Affix), '#pop'),
             # FIXME: This escape pattern is not perfect.
             (r'\\([\\"\'$nrbtfav]|(x|u|U)[a-fA-F0-9]+|\d+)', String.Escape),
             include('interp'),
@@ -197,7 +203,8 @@ class JuliaLexer(RegexLexer):
             (r'.', String),
         ],
         'tqstring': [
-            (r'(""")(' + allowed_variable + r'|\d+)?', bygroups(String, String.Affix), '#pop'),
+            (r'(""")(' + allowed_variable + r'|\d+)?',
+             bygroups(String, String.Affix), '#pop'),
             (r'\\([\\"\'$nrbtfav]|(x|u|U)[a-fA-F0-9]+|\d+)', String.Escape),
             include('interp'),
             (r'[^"$%\\]+', String),
@@ -216,14 +223,16 @@ class JuliaLexer(RegexLexer):
         ],
 
         'command': [
-            (r'(`)(' + allowed_variable + r'|\d+)?', bygroups(String.Backtick, String.Affix), '#pop'),
+            (r'(`)(' + allowed_variable + r'|\d+)?',
+             bygroups(String.Backtick, String.Affix), '#pop'),
             (r'\\[`$]', String.Escape),
             include('interp'),
             (r'[^\\`$]+', String.Backtick),
             (r'.', String.Backtick),
         ],
         'tqcommand': [
-            (r'(```)(' + allowed_variable + r'|\d+)?', bygroups(String.Backtick, String.Affix), '#pop'),
+            (r'(```)(' + allowed_variable + r'|\d+)?',
+             bygroups(String.Backtick, String.Affix), '#pop'),
             (r'\\\$', String.Escape),
             include('interp'),
             (r'[^\\`$]+', String.Backtick),
@@ -252,7 +261,7 @@ def get_tokens_unprocessed(self, text):
         output = False
         error = False
 
-        for line in text.splitlines(True):
+        for line in text.splitlines(keepends=True):
             if line.startswith('julia>'):
                 insertions.append((len(curcode), [(0, Generic.Prompt, line[:6])]))
                 curcode += line[6:]
diff --git a/pygments/lexers/kuin.py b/pygments/lexers/kuin.py
index 1d7ba67cca..8dd7e70534 100644
--- a/pygments/lexers/kuin.py
+++ b/pygments/lexers/kuin.py
@@ -14,9 +14,10 @@
 
 __all__ = ['KuinLexer']
 
+
 class KuinLexer(RegexLexer):
     """
-    For Kuin source code
+    For Kuin source code.
 
     .. versionadded:: 2.9
     """
@@ -34,17 +35,29 @@ class KuinLexer(RegexLexer):
             include('whitespace'),
 
             # Block-statement
-            (r'(\+?)([ \t]*)(\*?)([ \t]*)(\bfunc)([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*)', bygroups(Keyword,Whitespace, Keyword, Whitespace,  Keyword, using(this), Name.Function), 'func_'),
-            (r'\b(class)([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*)', bygroups(Keyword, using(this), Name.Class), 'class_'),
-            (r'\b(enum)([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*)', bygroups(Keyword, using(this), Name.Constant), 'enum_'),
-            (r'\b(block)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?', bygroups(Keyword, using(this), Name.Other), 'block_'),
-            (r'\b(ifdef)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?', bygroups(Keyword, using(this), Name.Other), 'ifdef_'),
-            (r'\b(if)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?', bygroups(Keyword, using(this), Name.Other), 'if_'),
-            (r'\b(switch)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?', bygroups(Keyword, using(this), Name.Other), 'switch_'),
-            (r'\b(while)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?', bygroups(Keyword, using(this), Name.Other), 'while_'),
-            (r'\b(for)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?', bygroups(Keyword, using(this), Name.Other), 'for_'),
-            (r'\b(foreach)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?', bygroups(Keyword, using(this), Name.Other), 'foreach_'),
-            (r'\b(try)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?', bygroups(Keyword, using(this), Name.Other), 'try_'),
+            (r'(\+?)([ \t]*)(\*?)([ \t]*)(\bfunc)([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*)',
+             bygroups(Keyword,Whitespace, Keyword, Whitespace,  Keyword,
+                      using(this), Name.Function), 'func_'),
+            (r'\b(class)([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*)',
+             bygroups(Keyword, using(this), Name.Class), 'class_'),
+            (r'\b(enum)([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*)',
+             bygroups(Keyword, using(this), Name.Constant), 'enum_'),
+            (r'\b(block)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?',
+             bygroups(Keyword, using(this), Name.Other), 'block_'),
+            (r'\b(ifdef)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?',
+             bygroups(Keyword, using(this), Name.Other), 'ifdef_'),
+            (r'\b(if)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?',
+             bygroups(Keyword, using(this), Name.Other), 'if_'),
+            (r'\b(switch)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?',
+             bygroups(Keyword, using(this), Name.Other), 'switch_'),
+            (r'\b(while)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?',
+             bygroups(Keyword, using(this), Name.Other), 'while_'),
+            (r'\b(for)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?',
+             bygroups(Keyword, using(this), Name.Other), 'for_'),
+            (r'\b(foreach)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?',
+             bygroups(Keyword, using(this), Name.Other), 'foreach_'),
+            (r'\b(try)\b(?:([ \t]+(?:\n\s*\|)*[ \t]*)([a-zA-Z_][0-9a-zA-Z_]*))?',
+             bygroups(Keyword, using(this), Name.Other), 'try_'),
 
             # Line-statement
             (r'\b(do)\b', Keyword, 'do'),
@@ -77,7 +90,8 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'func'),
         ],
         'func': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(func)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(func)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
             include('statement'),
         ],
         'class_': [
@@ -85,7 +99,8 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'class'),
         ],
         'class': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(class)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(class)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
             include('statement'),
         ],
         'enum_': [
@@ -93,7 +108,8 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'enum'),
         ],
         'enum': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(enum)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(enum)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
             include('expr'),
             (r'\n', Whitespace),
         ],
@@ -102,7 +118,8 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'block'),
         ],
         'block': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(block)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(block)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
             include('statement'),
             include('break'),
             include('skip'),
@@ -112,8 +129,10 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'ifdef'),
         ],
         'ifdef': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(ifdef)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
-            (words(('rls', 'dbg'), prefix=r'\b', suffix=r'\b'), Keyword.Constant, 'ifdef_sp'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(ifdef)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (words(('rls', 'dbg'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Constant, 'ifdef_sp'),
             include('statement'),
             include('break'),
             include('skip'),
@@ -127,7 +146,8 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'if'),
         ],
         'if': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(if)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(if)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
             (words(('elif', 'else'), prefix=r'\b', suffix=r'\b'), Keyword, 'if_sp'),
             include('statement'),
             include('break'),
@@ -142,8 +162,10 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'switch'),
         ],
         'switch': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(switch)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
-            (words(('case', 'default', 'to'), prefix=r'\b', suffix=r'\b'), Keyword, 'switch_sp'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(switch)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (words(('case', 'default', 'to'), prefix=r'\b', suffix=r'\b'),
+             Keyword, 'switch_sp'),
             include('statement'),
             include('break'),
             include('skip'),
@@ -157,7 +179,8 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'while'),
         ],
         'while': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(while)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(while)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
             include('statement'),
             include('break'),
             include('skip'),
@@ -167,7 +190,8 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'for'),
         ],
         'for': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(for)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(for)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
             include('statement'),
             include('break'),
             include('skip'),
@@ -177,7 +201,8 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'foreach'),
         ],
         'foreach': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(foreach)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(foreach)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
             include('statement'),
             include('break'),
             include('skip'),
@@ -187,8 +212,10 @@ class KuinLexer(RegexLexer):
             (r'\n', Whitespace, 'try'),
         ],
         'try': [
-            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(try)\b', bygroups(Keyword, using(this), Keyword), '#pop:2'),
-            (words(('catch', 'finally', 'to'), prefix=r'\b', suffix=r'\b'), Keyword, 'try_sp'),
+            (r'\b(end)([ \t]+(?:\n\s*\|)*[ \t]*)(try)\b',
+             bygroups(Keyword, using(this), Keyword), '#pop:2'),
+            (words(('catch', 'finally', 'to'), prefix=r'\b', suffix=r'\b'),
+             Keyword, 'try_sp'),
             include('statement'),
             include('break'),
             include('skip'),
@@ -200,10 +227,12 @@ class KuinLexer(RegexLexer):
 
         # Line-statement
         'break': [
-            (r'\b(break)\b([ \t]+)([a-zA-Z_][0-9a-zA-Z_]*)', bygroups(Keyword, using(this), Name.Other)),
+            (r'\b(break)\b([ \t]+)([a-zA-Z_][0-9a-zA-Z_]*)',
+             bygroups(Keyword, using(this), Name.Other)),
         ],
         'skip': [
-            (r'\b(skip)\b([ \t]+)([a-zA-Z_][0-9a-zA-Z_]*)', bygroups(Keyword, using(this), Name.Other)),
+            (r'\b(skip)\b([ \t]+)([a-zA-Z_][0-9a-zA-Z_]*)',
+             bygroups(Keyword, using(this), Name.Other)),
         ],
         'alias': [
             include('expr'),
@@ -287,7 +316,8 @@ class KuinLexer(RegexLexer):
 
             # Identifier
             (r"\b([a-zA-Z_][0-9a-zA-Z_]*)(?=@)\b", Name),
-            (r"(@)?\b([a-zA-Z_][0-9a-zA-Z_]*)\b", bygroups(Name.Other, Name.Variable)),
+            (r"(@)?\b([a-zA-Z_][0-9a-zA-Z_]*)\b",
+             bygroups(Name.Other, Name.Variable)),
         ],
 
         # String
diff --git a/pygments/lexers/lilypond.py b/pygments/lexers/lilypond.py
index 93947cb3c6..52a007dea2 100644
--- a/pygments/lexers/lilypond.py
+++ b/pygments/lexers/lilypond.py
@@ -23,6 +23,14 @@
 
 __all__ = ["LilyPondLexer"]
 
+# In LilyPond, (unquoted) name tokens only contain letters, hyphens,
+# and underscores, where hyphens and underscores must not start or end
+# a name token.
+#
+# Note that many of the entities listed as LilyPond built-in keywords
+# (in file `_lilypond_builtins.py`) are only valid if surrounded by
+# double quotes, for example, 'hufnagel-fa1'. This means that
+# `NAME_END_RE` doesn't apply to such entities in valid LilyPond code.
 NAME_END_RE = r"(?=\d|[^\w\-]|[\-_][\W\d])"
 
 def builtin_words(names, backslash, suffix=NAME_END_RE):
@@ -35,6 +43,7 @@ def builtin_words(names, backslash, suffix=NAME_END_RE):
         assert backslash == "disallowed"
     return words(names, prefix, suffix)
 
+
 class LilyPondLexer(SchemeLexer):
     """
     Lexer for input to LilyPond, a text-based music typesetter.
@@ -79,10 +88,10 @@ def get_tokens_unprocessed(self, text):
             # Whitespace.
             (r"\s+", Token.Text.Whitespace),
 
-            # Multi-line comment. These are non-nestable.
+            # Multi-line comments. These are non-nestable.
             (r"%\{.*?%\}", Token.Comment.Multiline),
 
-            # Simple comment.
+            # Simple comments.
             (r"%.*?$", Token.Comment.Single),
 
             # End of embedded LilyPond in Scheme.
@@ -104,22 +113,37 @@ def get_tokens_unprocessed(self, text):
             #   \override Stem.color = red,
             # - comma as alternative syntax for lists: \time 3,3,2 4/4,
             # - colon in tremolos: c:32,
-            # - double hyphen in lyrics: li -- ly -- pond,
-            (r"\\\\|--|[{}<>=.,:|]", Token.Punctuation),
-
-            # Pitch, with optional octavation marks, octave check,
+            # - double hyphen and underscore in lyrics: li -- ly -- pond __
+            #   (which must be preceded by ASCII whitespace)
+            (r"""(?x)
+               \\\\
+               | (?<= \s ) (?: -- | __ )
+               | [{}<>=.,:|]
+              """, Token.Punctuation),
+
+            # Pitches, with optional octavation marks, octave check,
             # and forced or cautionary accidental.
             (words(pitches, suffix=r"=?[',]*!?\??" + NAME_END_RE), Token.Pitch),
 
-            # String, optionally with direction specifier.
+            # Strings, optionally with direction specifier.
             (r'[\-_^]?"', Token.String, "string"),
 
             # Numbers.
             (r"-?\d+\.\d+", Token.Number.Float), # 5. and .5 are not allowed
             (r"-?\d+/\d+", Token.Number.Fraction),
-            # Integer, or duration with optional augmentation dots. We have no
-            # way to distinguish these, so we highlight them all as numbers.
-            (r"-?(\d+|\\longa|\\breve)\.*", Token.Number),
+            # Integers, or durations with optional augmentation dots.
+            # We have no way to distinguish these, so we highlight
+            # them all as numbers.
+            #
+            # Normally, there is a space before the integer (being an
+            # argument to a music function), which we check here.  The
+            # case without a space is handled below (as a fingering
+            # number).
+            (r"""(?x)
+               (?<= \s ) -\d+
+               | (?: (?: \d+ | \\breve | \\longa | \\maxima )
+                     \.* )
+              """, Token.Number),
             # Separates duration and duration multiplier highlighted as fraction.
             (r"\*", Token.Number),
 
@@ -167,7 +191,10 @@ def get_tokens_unprocessed(self, text):
 
             # Definition of a variable. Support assignments to alist keys
             # (myAlist.my-key.my-nested-key = \markup \spam \eggs).
-            (r"([^\W\d]|-)+(?=([^\W\d]|[\-.])*\s*=)", Token.Name.Lvalue),
+            (r"""(?x)
+               (?: [^\W\d] | - )+
+               (?= (?: [^\W\d] | [\-.] )* \s* = )
+              """, Token.Name.Lvalue),
 
             # Virtually everything can appear in markup mode, so we highlight
             # as text.  Try to get a complete word, or we might wrongly lex
diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py
index 6dab1fdaea..2b91b99d68 100644
--- a/pygments/lexers/lisp.py
+++ b/pygments/lexers/lisp.py
@@ -22,6 +22,7 @@
            'NewLispLexer', 'EmacsLispLexer', 'ShenLexer', 'CPSALexer',
            'XtlangLexer', 'FennelLexer']
 
+
 class SchemeLexer(RegexLexer):
     """
     A Scheme lexer.
diff --git a/pygments/lexers/macaulay2.py b/pygments/lexers/macaulay2.py
index db5d9902e0..aaf750b40e 100644
--- a/pygments/lexers/macaulay2.py
+++ b/pygments/lexers/macaulay2.py
@@ -1,6 +1,7 @@
 """
     pygments.lexers.macaulay2
     ~~~~~~~~~~~~~~~~~~~~~~~~~
+
     Lexer for Macaulay2.
 
     :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
@@ -12,7 +13,7 @@
 
 __all__ = ['Macaulay2Lexer']
 
-# Auto-generated for Macaulay2-1.20. Do not modify this file manually.
+# Auto-generated for Macaulay2-1.21. Do not modify this file manually.
 
 M2KEYWORDS = (
     "and",
@@ -142,6 +143,7 @@
     "InfiniteNumber",
     "IntermediateMarkUpType",
     "ITALIC",
+    "Iterator",
     "Keyword",
     "LABEL",
     "LATER",
@@ -328,6 +330,7 @@
     "ceiling",
     "centerString",
     "chainComplex",
+    "changeBase",
     "char",
     "characters",
     "charAnalyzer",
@@ -399,6 +402,7 @@
     "deepSplice",
     "default",
     "degree",
+    "degreeGroup",
     "degreeLength",
     "degrees",
     "degreesMonoid",
@@ -647,6 +651,7 @@
     "isUnit",
     "isWellDefined",
     "isWeylAlgebra",
+    "iterator",
     "jacobian",
     "jacobianDual",
     "join",
@@ -748,6 +753,7 @@
     "newNetFile",
     "newPackage",
     "newRing",
+    "next",
     "nextkey",
     "nextPrime",
     "NNParser",
@@ -1037,6 +1043,7 @@
     "userSymbols",
     "utf8",
     "utf8check",
+    "utf8substring",
     "validate",
     "value",
     "values",
@@ -1097,7 +1104,7 @@
     "BinomialEdgeIdeals",
     "Binomials",
     "BKZ",
-    "BlockMatrix",
+    "blockMatrixForm",
     "Body",
     "BoijSoederberg",
     "Book3264Examples",
@@ -1136,7 +1143,6 @@
     "CohomCalg",
     "CoincidentRootLoci",
     "commandLine",
-    "CompactMatrix",
     "compactMatrixForm",
     "Complement",
     "CompleteIntersection",
@@ -1170,6 +1176,7 @@
     "Default",
     "defaultPrecision",
     "Degree",
+    "DegreeGroup",
     "DegreeLift",
     "DegreeLimit",
     "DegreeMap",
@@ -1193,6 +1200,7 @@
     "docExample",
     "docTemplate",
     "Down",
+    "Dynamic",
     "EagonResolution",
     "EdgeIdeals",
     "edit",
@@ -1236,6 +1244,7 @@
     "Flexible",
     "flush",
     "FollowLinks",
+    "ForeignFunctions",
     "FormalGroupLaws",
     "Format",
     "FourierMotzkin",
@@ -1248,6 +1257,7 @@
     "GenerateAssertions",
     "Generic",
     "GenericInitialIdeal",
+    "GeometricDecomposability",
     "gfanInterface",
     "Givens",
     "GKMVarieties",
@@ -1321,6 +1331,7 @@
     "Jacobian",
     "Jets",
     "Join",
+    "JSON",
     "Jupyter",
     "K3Carpets",
     "K3Surfaces",
@@ -1487,6 +1498,7 @@
     "Prune",
     "PruneComplex",
     "pruningMap",
+    "PseudomonomialPrimaryDecomposition",
     "Pullback",
     "PushForward",
     "Python",
@@ -1593,6 +1605,7 @@
     "stdio",
     "StopBeforeComputation",
     "stopIfError",
+    "StopIteration",
     "StopWithMinimalGenerators",
     "Strategy",
     "Strict",
@@ -1634,9 +1647,11 @@
     "ToricInvariants",
     "ToricTopology",
     "ToricVectorBundles",
+    "Torsion",
     "TotalPairs",
     "Tree",
     "TriangularSets",
+    "Triangulations",
     "Tries",
     "Trim",
     "Triplets",
@@ -1679,6 +1694,7 @@
     "Weights",
     "WeylAlgebra",
     "WeylGroups",
+    "WhitneyStratifications",
     "Wrap",
     "XML"
     )
diff --git a/pygments/lexers/make.py b/pygments/lexers/make.py
index d9027f3c28..f2ec1010d5 100644
--- a/pygments/lexers/make.py
+++ b/pygments/lexers/make.py
@@ -44,7 +44,7 @@ class MakefileLexer(Lexer):
 
     def get_tokens_unprocessed(self, text):
         ins = []
-        lines = text.splitlines(True)
+        lines = text.splitlines(keepends=True)
         done = ''
         lex = BaseMakefileLexer(**self.options)
         backslashflag = False
@@ -85,16 +85,19 @@ class BaseMakefileLexer(RegexLexer):
             (r'\s+', Whitespace),
             (r'#.*?\n', Comment),
             (r'((?:un)?export)(\s+)(?=[\w${}\t -]+\n)',
-             bygroups(Keyword, Text), 'export'),
+             bygroups(Keyword, Whitespace), 'export'),
             (r'(?:un)?export\s+', Keyword),
             # assignment
             (r'([\w${}().-]+)(\s*)([!?:+]?=)([ \t]*)((?:.*\\\n)+|.*\n)',
-             bygroups(Name.Variable, Text, Operator, Text, using(BashLexer))),
+             bygroups(
+                Name.Variable, Whitespace, Operator, Whitespace,
+                using(BashLexer))),
             # strings
             (r'"(\\\\|\\[^\\]|[^"\\])*"', String.Double),
             (r"'(\\\\|\\[^\\]|[^'\\])*'", String.Single),
             # targets
-            (r'([^\n:]+)(:+)([ \t]*)', bygroups(Name.Function, Operator, Text),
+            (r'([^\n:]+)(:+)([ \t]*)', bygroups(
+                Name.Function, Operator, Whitespace),
              'block-header'),
             # expansions
             (r'\$\(', Keyword, 'expansion'),
@@ -117,7 +120,7 @@ class BaseMakefileLexer(RegexLexer):
             (r'\\\n', Text),  # line continuation
             (r'\$\(', Keyword, 'expansion'),
             (r'[a-zA-Z_]+', Name),
-            (r'\n', Text, '#pop'),
+            (r'\n', Whitespace, '#pop'),
             (r'.', Text),
         ],
     }
@@ -163,7 +166,7 @@ class CMakeLexer(RegexLexer):
             # r'VTK_MAKE_INSTANTIATOR|VTK_WRAP_JAVA|VTK_WRAP_PYTHON|'
             # r'VTK_WRAP_TCL|WHILE|WRITE_FILE|'
             # r'COUNTARGS)\b', Name.Builtin, 'args'),
-            (r'\b(\w+)([ \t]*)(\()', bygroups(Name.Builtin, Text,
+            (r'\b(\w+)([ \t]*)(\()', bygroups(Name.Builtin, Whitespace,
                                               Punctuation), 'args'),
             include('keywords'),
             include('ws')
@@ -177,7 +180,7 @@ class CMakeLexer(RegexLexer):
             (r'(?s)".*?"', String.Double),
             (r'\\\S+', String),
             (r'[^)$"# \t\n]+', String),
-            (r'\n', Text),  # explicitly legal
+            (r'\n', Whitespace),  # explicitly legal
             include('keywords'),
             include('ws')
         ],
@@ -200,7 +203,7 @@ def analyse_text(text):
             r'\([ \t]*VERSION[ \t]*\d+(\.\d+)*[ \t]*'
             r'([ \t]FATAL_ERROR)?[ \t]*\)[ \t]*'
             r'(#[^\n]*)?$'
-       )
+        )
         if re.search(exp, text, flags=re.MULTILINE | re.IGNORECASE):
             return 0.8
         return 0.0
diff --git a/pygments/lexers/markup.py b/pygments/lexers/markup.py
index 47feaeb684..4fdfc1a120 100644
--- a/pygments/lexers/markup.py
+++ b/pygments/lexers/markup.py
@@ -17,7 +17,7 @@
 from pygments.lexer import RegexLexer, DelegatingLexer, include, bygroups, \
     using, this, do_insertions, default, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Generic, Other
+    Number, Punctuation, Generic, Other, Whitespace
 from pygments.util import get_bool_opt, ClassNotFound
 
 __all__ = ['BBCodeLexer', 'MoinWikiLexer', 'RstLexer', 'TexLexer', 'GroffLexer',
@@ -549,13 +549,13 @@ def _handle_codeblock(self, match):
             (r'^(.+)(\n)(-+)(\n)', bygroups(Generic.Subheading, Text, Generic.Subheading, Text)),
             # task list
             (r'^(\s*)([*-] )(\[[ xX]\])( .+\n)',
-            bygroups(Text, Keyword, Keyword, using(this, state='inline'))),
+            bygroups(Whitespace, Keyword, Keyword, using(this, state='inline'))),
             # bulleted list
             (r'^(\s*)([*-])(\s)(.+\n)',
-            bygroups(Text, Keyword, Text, using(this, state='inline'))),
+            bygroups(Whitespace, Keyword, Whitespace, using(this, state='inline'))),
             # numbered list
             (r'^(\s*)([0-9]+\.)( .+\n)',
-            bygroups(Text, Keyword, using(this, state='inline'))),
+            bygroups(Whitespace, Keyword, using(this, state='inline'))),
             # quote
             (r'^(\s*>\s)(.+\n)', bygroups(Keyword, Generic.Emph)),
             # code block fenced by 3 backticks
diff --git a/pygments/lexers/matlab.py b/pygments/lexers/matlab.py
index b70058c524..058661ee06 100644
--- a/pygments/lexers/matlab.py
+++ b/pygments/lexers/matlab.py
@@ -3294,3 +3294,15 @@ class ScilabLexer(RegexLexer):
             (r'(\s*)([a-zA-Z_]\w*)', bygroups(Text, Name.Function), '#pop'),
         ],
     }
+
+    # the following is needed to distinguish Scilab and GAP .tst files
+    def analyse_text(text):
+        score = 0.0
+
+        # Scilab comments (don't appear in e.g. GAP code)
+        if re.search(r"^\s*//", text):
+            score += 0.1
+        if re.search(r"^\s*/\*", text):
+            score += 0.1
+
+        return min(score, 1.0)
diff --git a/pygments/lexers/meson.py b/pygments/lexers/meson.py
index 4d366588b0..e8d1f08cfc 100644
--- a/pygments/lexers/meson.py
+++ b/pygments/lexers/meson.py
@@ -8,30 +8,16 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
-from pygments.lexer import (
-    RegexLexer,
-    words,
-    include,
-)
-from pygments.token import (
-    Comment,
-    Name,
-    Number,
-    Punctuation,
-    Operator,
-    Keyword,
-    String,
-    Whitespace,
-)
+from pygments.lexer import RegexLexer, words, include
+from pygments.token import Comment, Name, Number, Punctuation, Operator, \
+    Keyword, String, Whitespace
 
 __all__ = ['MesonLexer']
 
 
 class MesonLexer(RegexLexer):
     """Meson language lexer.
-    
+
     The grammar definition use to transcribe the syntax was retrieved from
     https://mesonbuild.com/Syntax.html#grammar for version 0.58.
     Some of those definitions are improperly transcribed, so the Meson++
diff --git a/pygments/lexers/mcfunction.py b/pygments/lexers/minecraft.py
similarity index 67%
rename from pygments/lexers/mcfunction.py
rename to pygments/lexers/minecraft.py
index b05e21d403..0506fdbb4c 100644
--- a/pygments/lexers/mcfunction.py
+++ b/pygments/lexers/minecraft.py
@@ -1,20 +1,29 @@
 """
-    pygments.lexers.mcfunction
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Lexers for MCFunction and related languages.
+    pygments.lexers.minecraft
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Minecraft related languages.
+    
+    SNBT. A data communication format used in Minecraft.
+    wiki: https://minecraft.fandom.com/wiki/NBT_format
+    
+    MCFunction. The Function file for Minecraft Data packs and Add-ons.
+    official: https://learn.microsoft.com/en-us/minecraft/creator/documents/functionsintroduction
+    wiki: https://minecraft.fandom.com/wiki/Function
+    
+    MCSchema. A kind of data Schema for Minecraft Add-on Development.
+    official: https://learn.microsoft.com/en-us/minecraft/creator/reference/content/schemasreference/
+    community example: https://www.mcbe-dev.net/addons/data-driven/manifest.html
 
     :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 from pygments.lexer import RegexLexer, default, include, bygroups
-from pygments.token import (Comment, Keyword, Literal, Name, Number,
-                            Operator, Punctuation, String, Text, Token,
-                            Whitespace)
-
+from pygments.token import Comment, Keyword, Literal, Name, Number, Operator, \
+    Punctuation, String, Text, Whitespace
 
-__all__ = ['SNBTLexer', 'MCFunctionLexer']
+__all__ = ['SNBTLexer', 'MCFunctionLexer', 'MCSchemaLexer']
 
 
 class SNBTLexer(RegexLexer):
@@ -125,29 +134,20 @@ class MCFunctionLexer(RegexLexer):
             (r"(?<=run)\s+[a-z_]+", Name.Builtin),
 
             # UUID
-            (
-                r"\b[0-9a-fA-F]+(?:-[0-9a-fA-F]+){4}\b",
-                Name.Variable,
-            ),
+            (r"\b[0-9a-fA-F]+(?:-[0-9a-fA-F]+){4}\b", Name.Variable),
             include("resource-name"),
             # normal command names and scoreboards
             #  there's no way to know the differences unfortuntely
-            (r"[A-Za-z_][A-Za-z0-9_.#%$]+", Keyword.Constant),
-            (r"[#%$][A-Za-z0-9_.#%$]+", Name.Variable.Magic),
+            (r"[A-Za-z_][\w.#%$]+", Keyword.Constant),
+            (r"[#%$][\w.#%$]+", Name.Variable.Magic),
         ],
 
         "resource-name": [
-            (
-                # resource names have to be lowercase
-                r"#?[a-z_][a-z_.-]*:[a-z0-9_./-]+",
-                Name.Function,
-            ),
-            (
-                # similar to above except optional `:``
-                #  a `/` must be present "somewhere"
-                r"#?[a-z0-9_\.\-]+\/[a-z0-9_\.\-\/]+",
-                Name.Function,
-            )
+            # resource names have to be lowercase
+            (r"#?[a-z_][a-z_.-]*:[a-z0-9_./-]+", Name.Function),
+            # similar to above except optional `:``
+            #  a `/` must be present "somewhere"
+            (r"#?[a-z0-9_\.\-]+\/[a-z0-9_\.\-\/]+", Name.Function),
         ],
 
         "whitespace": [
@@ -155,18 +155,13 @@ class MCFunctionLexer(RegexLexer):
         ],
 
         "comments": [
-            (
-                rf"^\s*(#{_block_comment_prefix})",
-                Comment.Multiline,
-                (
-                    "comments.block",
-                    "comments.block.emphasized",
-                ),
-            ),
+            (rf"^\s*(#{_block_comment_prefix})", Comment.Multiline,
+             ("comments.block", "comments.block.emphasized")),
             (r"#.*$", Comment.Single),
         ],
         "comments.block": [
-            (rf"^\s*#{_block_comment_prefix}", Comment.Multiline, "comments.block.emphasized"),
+            (rf"^\s*#{_block_comment_prefix}", Comment.Multiline,
+             "comments.block.emphasized"),
             (r"^\s*#", Comment.Multiline, "comments.block.normal"),
             default("#pop"),
         ],
@@ -189,7 +184,7 @@ class MCFunctionLexer(RegexLexer):
             include("resource-name"),
 
             # Scoreboard player names
-            (r"[#%$][A-Za-z0-9_.#%$]+", Name.Variable.Magic),
+            (r"[#%$][\w.#%$]+", Name.Variable.Magic),
         ],
 
         "operators": [
@@ -322,3 +317,78 @@ class MCFunctionLexer(RegexLexer):
             default("#pop"),
         ],
     }
+
+
+class MCSchemaLexer(RegexLexer):
+    """Lexer for Minecraft Add-ons data Schemas, an interface structure standard used in Minecraft
+
+    .. versionadded:: 2.14.0
+    """
+    
+    name = 'MCSchema'
+    url = 'https://learn.microsoft.com/en-us/minecraft/creator/reference/content/schemasreference/'
+    aliases = ['mcschema']
+    filenames = ['*.mcschema']
+    mimetypes = ['text/mcschema']
+
+    tokens = {
+        'commentsandwhitespace': [
+            (r'\s+', Whitespace),
+            (r'//.*?$', Comment.Single),
+            (r'/\*.*?\*/', Comment.Multiline)
+        ],
+        'slashstartsregex': [
+            include('commentsandwhitespace'),
+            (r'/(\\.|[^[/\\\n]|\[(\\.|[^\]\\\n])*])+/'
+             r'([gimuysd]+\b|\B)', String.Regex, '#pop'),
+            (r'(?=/)', Text, ('#pop', 'badregex')),
+            default('#pop')
+        ],
+        'badregex': [
+            (r'\n', Whitespace, '#pop')
+        ],
+        'singlestring': [
+            (r'\\.', String.Escape),
+            (r"'", String.Single, '#pop'),
+            (r"[^\\']+", String.Single),
+        ],
+        'doublestring': [
+            (r'\\.', String.Escape),
+            (r'"', String.Double, '#pop'),
+            (r'[^\\"]+', String.Double),
+        ],
+        'root': [
+            (r'^(?=\s|/|<!--)', Text, 'slashstartsregex'),
+            include('commentsandwhitespace'),
+            
+            # keywords for optional word and field types
+            (r'(?<=: )opt', Operator.Word),
+            (r'(?<=\s)[\w-]*(?=(\s+"|\n))', Keyword.Declaration),
+            
+            # numeric literals
+            (r'0[bB][01]+', Number.Bin),
+            (r'0[oO]?[0-7]+', Number.Oct),
+            (r'0[xX][0-9a-fA-F]+', Number.Hex),
+            (r'\d+', Number.Integer),
+            (r'(\.\d+|\d+\.\d*|\d+)([eE][-+]?\d+)?', Number.Float),
+            
+            # possible punctuations
+            (r'\.\.\.|=>', Punctuation),
+            (r'\+\+|--|~|\?\?=?|\?|:|\\(?=\n)|'
+             r'(<<|>>>?|==?|!=?|(?:\*\*|\|\||&&|[-<>+*%&|^/]))=?', Operator, 'slashstartsregex'),
+            (r'[{(\[;,]', Punctuation, 'slashstartsregex'),
+            (r'[})\].]', Punctuation),
+            
+            # strings
+            (r"'", String.Single, 'singlestring'),
+            (r'"', String.Double, 'doublestring'),
+            
+            # title line
+            (r'[\w-]*?(?=:\{?\n)', String.Symbol),
+            # title line with a version code, formatted
+            # `major.minor.patch-prerelease+buildmeta`
+            (r'([\w-]*?)(:)(\d+)(?:(\.)(\d+)(?:(\.)(\d+)(?:(\-)((?:[^\W_]|-)*(?:\.(?:[^\W_]|-)*)*))?(?:(\+)((?:[^\W_]|-)+(?:\.(?:[^\W_]|-)+)*))?)?)?(?=:\{?\n)', bygroups(String.Symbol, Operator, Number.Integer, Operator, Number.Integer, Operator, Number.Integer, Operator, String, Operator, String)),
+            
+            (r'.*\n', Text),
+        ]
+    }
diff --git a/pygments/lexers/mips.py b/pygments/lexers/mips.py
new file mode 100644
index 0000000000..e20038b260
--- /dev/null
+++ b/pygments/lexers/mips.py
@@ -0,0 +1,128 @@
+"""
+    pygments.lexers.mips
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for MIPS assembly.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import Whitespace, Comment, String, Keyword, Name, Text
+
+__all__ = ["MIPSLexer"]
+
+
+class MIPSLexer(RegexLexer):
+    """
+    A MIPS Assembly Lexer.
+
+    Based on the Emacs major mode by hlissner:
+    https://github.com/hlissner/emacs-mips-mode
+    """
+
+    name = 'MIPS'
+    aliases = ['mips']
+    # TODO: add '*.s' and '*.asm', which will require designing an analyse_text
+    # method for this lexer and refactoring those from Gas and Nasm in order to
+    # have relatively reliable detection
+    filenames = ['*.mips', '*.MIPS']
+
+    keywords = [
+        # Arithmetic insturctions
+        "add", "sub", "subu", "addi", "subi", "addu", "addiu",
+        # Multiplication/division
+        "mul", "mult", "multu", "mulu", "madd", "maddu", "msub", "msubu", "div", "divu",
+        # Bitwise operations
+        "and", "or", "nor", "xor", "andi", "ori", "xori", "clo", "clz",
+        # Shifts
+        "sll", "srl", "sllv", "srlv", "sra", "srav",
+        # Comparisons
+        "slt", "sltu", "slti", "sltiu",
+        # Move data
+        "mfhi", "mthi", "mflo", "mtlo", "movn", "movz", "movf", "movt",
+        # Jump
+        "j", "jal", "jalr", "jr",
+        # branch
+        "bc1f", "bc1t", "beq", "bgez", "bgezal", "bgtz", "blez", "bltzal", "bltz", "bne",
+        # Load
+        "lui", "lb", "lbu", "lh", "lhu", "lw", "lwcl", "lwl", "lwr",
+        # Store
+        "sb", "sh", "sw", "swl", "swr", # coproc: swc1 sdc1
+        # Concurrent load/store
+        "ll", "sc",
+        # Trap handling
+        "teq", "teqi", "tne", "tneqi", "tge", "tgeu", "tgei", "tgeiu", "tlt", "tltu", "tlti",
+        "tltiu",
+        # Exception / Interrupt
+        "eret", "break", "bop", "syscall",
+        # --- Floats -----------------------------------------------------
+        # Arithmetic
+        "add.s", "add.d", "sub.s", "sub.d", "mul.s", "mul.d", "div.s", "div.d", "neg.d",
+        "neg.s",
+        # Comparison
+        "c.e.d", "c.e.s", "c.le.d", "c.le.s", "c.lt.s", "c.lt.d", # "c.gt.s", "c.gt.d",
+        "madd.s", "madd.d", "msub.s", "msub.d",
+        # Move Floats
+        "mov.d", "move.s", "movf.d", "movf.s", "movt.d", "movt.s", "movn.d", "movn.s",
+        "movnzd", "movz.s", "movz.d",
+        # Conversion
+        "cvt.d.s", "cvt.d.w", "cvt.s.d", "cvt.s.w", "cvt.w.d", "cvt.w.s", "trunc.w.d",
+        "trunc.w.s",
+        # Math
+        "abs.s", "abs.d", "sqrt.s", "sqrt.d", "ceil.w.d", "ceil.w.s", "floor.w.d",
+        "floor.w.s", "round.w.d", "round.w.s",
+    ]
+
+    pseudoinstructions = [
+        # Arithmetic & logical
+        "rem", "remu", "mulo", "mulou", "abs", "neg", "negu", "not", "rol", "ror",
+        # branches
+        "b", "beqz", "bge", "bgeu", "bgt", "bgtu", "ble", "bleu", "blt", "bltu", "bnez",
+        # loads
+        "la", "li", "ld", "ulh", "ulhu", "ulw",
+        # Store
+        "sd", "ush", "usw",
+        # move
+        "move", # coproc: "mfc1.d",
+        # comparisons
+        "sgt", "sgtu", "sge", "sgeu", "sle", "sleu", "sne", "seq",
+        # --- Floats -----------------------------------------------------
+        # load-store
+        "l.d", "l.s", "s.d", "s.s",
+    ]
+
+    directives = [
+        ".align", ".ascii", ".asciiz", ".byte", ".data", ".double", ".extern", ".float",
+        ".globl", ".half", ".kdata", ".ktext", ".space", ".text", ".word",
+    ]
+
+    deprecated = [
+        "beql", "bnel", "bgtzl", "bgezl", "bltzl", "blezl", "bltzall", "bgezall",
+    ]
+
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+            (r'#.*', Comment),
+            (r'"', String, 'string'),
+            (r'-?[0-9]+?', Keyword.Constant),
+            (r'\w*:', Name.Function),
+            (words(deprecated, suffix=r'\b'), Keyword.Pseudo), # need warning face
+            (words(pseudoinstructions, suffix=r'\b'), Name.Variable),
+            (words(keywords, suffix=r'\b'), Keyword),
+            (r'[slm][ftwd]c[0-9]([.]d)?', Keyword),
+            (r'\$(f?[0-2][0-9]|f?3[01]|[ft]?[0-9]|[vk][01]|a[0-3]|s[0-7]|[gsf]p|ra|at|zero)',
+             Keyword.Type),
+            (words(directives, suffix=r'\b'), Name.Entity), # Preprocessor?
+            (r':|,|;|\{|\}|=>|@|\$|=', Name.Builtin),
+            (r'\w+', Text),
+            (r'.', Text),
+        ],
+        'string': [
+            (r'\\.', String.Escape),
+            (r'"', String, '#pop'),
+            (r'[^\\"]+', String),
+        ],
+    }
diff --git a/pygments/lexers/nimrod.py b/pygments/lexers/nimrod.py
index 7a05ed6401..bf5c948c4d 100644
--- a/pygments/lexers/nimrod.py
+++ b/pygments/lexers/nimrod.py
@@ -10,7 +10,7 @@
 
 import re
 
-from pygments.lexer import RegexLexer, include, default
+from pygments.lexer import RegexLexer, include, default, bygroups
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Error
 
@@ -47,10 +47,10 @@ def underscorize(words):
         'addr', 'and', 'as', 'asm', 'bind', 'block', 'break', 'case',
         'cast', 'concept', 'const', 'continue', 'converter', 'defer', 'discard',
         'distinct', 'div', 'do', 'elif', 'else', 'end', 'enum', 'except',
-        'export', 'finally', 'for', 'func', 'if', 'in', 'yield', 'interface',
-        'is', 'isnot', 'iterator', 'let', 'macro', 'method', 'mixin', 'mod',
-        'not', 'notin', 'object', 'of', 'or', 'out', 'proc', 'ptr', 'raise',
-        'ref', 'return', 'shl', 'shr', 'static', 'template', 'try',
+        'export', 'finally', 'for', 'if', 'in', 'yield', 'interface',
+        'is', 'isnot', 'iterator', 'let', 'mixin', 'mod',
+        'not', 'notin', 'object', 'of', 'or', 'out', 'ptr', 'raise',
+        'ref', 'return', 'shl', 'shr', 'static', 'try',
         'tuple', 'type', 'using', 'when', 'while', 'xor'
     ]
 
@@ -70,15 +70,27 @@ def underscorize(words):
 
     tokens = {
         'root': [
+            # Comments
+            (r'##\[', String.Doc, 'doccomment'),
             (r'##.*$', String.Doc),
+            (r'#\[', Comment.Multiline, 'comment'),
             (r'#.*$', Comment),
+
+            # Pragmas
+            (r'\{\.', String.Other, 'pragma'),
+
+            # Operators
             (r'[*=><+\-/@$~&%!?|\\\[\]]', Operator),
             (r'\.\.|\.|,|\[\.|\.\]|\{\.|\.\}|\(\.|\.\)|\{|\}|\(|\)|:|\^|`|;',
              Punctuation),
 
+            # Case statement branch
+            (r'(\n\s*)(of)(\s)', bygroups(Text.Whitespace, Keyword,
+                                          Text.Whitespace), 'casebranch'),
+
             # Strings
             (r'(?:[\w]+)"', String, 'rdqs'),
-            (r'"""', String, 'tdqs'),
+            (r'"""', String.Double, 'tdqs'),
             ('"', String, 'dqs'),
 
             # Char
@@ -86,15 +98,18 @@ def underscorize(words):
 
             # Keywords
             (r'(%s)\b' % underscorize(opWords), Operator.Word),
-            (r'(p_?r_?o_?c_?\s)(?![(\[\]])', Keyword, 'funcname'),
+            (r'(proc|func|method|macro|template)(\s)(?![(\[\]])',
+             bygroups(Keyword, Text.Whitespace), 'funcname'),
             (r'(%s)\b' % underscorize(keywords), Keyword),
             (r'(%s)\b' % underscorize(['from', 'import', 'include', 'export']),
              Keyword.Namespace),
             (r'(v_?a_?r)\b', Keyword.Declaration),
             (r'(%s)\b' % underscorize(types), Name.Builtin),
             (r'(%s)\b' % underscorize(keywordsPseudo), Keyword.Pseudo),
+
             # Identifiers
             (r'\b((?![_\d])\w)(((?!_)\w)|(_(?!_)\w))*', Name),
+
             # Numbers
             (r'[0-9][0-9_]*(?=([e.]|\'f(32|64)))',
              Number.Float, ('float-suffix', 'float-number')),
@@ -102,8 +117,9 @@ def underscorize(words):
             (r'0b[01][01_]*', Number.Bin, 'int-suffix'),
             (r'0o[0-7][0-7_]*', Number.Oct, 'int-suffix'),
             (r'[0-9][0-9_]*', Number.Integer, 'int-suffix'),
+
             # Whitespace
-            (r'\s+', Text),
+            (r'\s+', Text.Whitespace),
             (r'.+$', Error),
         ],
         'chars': [
@@ -120,6 +136,18 @@ def underscorize(words):
             (r'\$', String)
             # newlines are an error (use "nl" state)
         ],
+        'doccomment': [
+            (r'[^\]#]+', String.Doc),
+            (r'##\[', String.Doc, '#push'),
+            (r'\]##', String.Doc, '#pop'),
+            (r'[\]#]', String.Doc),
+        ],
+        'comment': [
+            (r'[^\]#]+', Comment.Multiline),
+            (r'#\[', Comment.Multiline, '#push'),
+            (r'\]#', Comment.Multiline, '#pop'),
+            (r'[\]#]', Comment.Multiline),
+        ],
         'dqs': [
             (r'\\([\\abcefnrtvl"\']|\n|x[a-f0-9]{2}|[0-9]{1,3})',
              String.Escape),
@@ -132,9 +160,9 @@ def underscorize(words):
             include('strings')
         ],
         'tdqs': [
-            (r'"""(?!")', String, '#pop'),
+            (r'"""', String.Double, '#pop'),
             include('strings'),
-            include('nl')
+            (r'\n', String.Double)
         ],
         'funcname': [
             (r'((?![\d_])\w)(((?!_)\w)|(_(?!_)\w))*', Name.Function, '#pop'),
@@ -144,7 +172,7 @@ def underscorize(words):
             (r'\n', String)
         ],
         'float-number': [
-            (r'\.(?!\.)[0-9_]*', Number.Float),
+            (r'\.(?!\.)[0-9_]*[f]*', Number.Float),
             (r'e[+-]?[0-9][0-9_]*', Number.Float),
             default('#pop')
         ],
@@ -157,4 +185,16 @@ def underscorize(words):
             (r'\'i(8|16)', Number.Integer),
             default('#pop')
         ],
+        'casebranch': [
+            (r',', Punctuation),
+            (r'[\n ]+', Text.Whitespace),
+            (r':', Operator, '#pop'),
+            (r'\w+|[^:]', Name.Label),
+        ],
+        'pragma': [
+            (r'[:,]', Text),
+            (r'[\n ]+', Text.Whitespace),
+            (r'\.\}', String.Other, '#pop'),
+            (r'\w+|\W+|[^.}]', String.Other),
+        ],
     }
diff --git a/pygments/lexers/nix.py b/pygments/lexers/nix.py
index 83731c7b1a..55e2617847 100644
--- a/pygments/lexers/nix.py
+++ b/pygments/lexers/nix.py
@@ -102,7 +102,8 @@ class NixLexer(RegexLexer):
             (r"''\t", String.Escape),
             (r"''", String.Single, '#pop'),
             (r'\$\{', String.Interpol, 'antiquote'),
-            (r"[^']", String.Single),
+            (r"['$]", String.Single),
+            (r"[^'$]+", String.Single),
         ],
         'doublequote': [
             (r'\\', String.Escape),
diff --git a/pygments/lexers/pascal.py b/pygments/lexers/pascal.py
index 2253a22e7c..cab170db60 100644
--- a/pygments/lexers/pascal.py
+++ b/pygments/lexers/pascal.py
@@ -10,17 +10,32 @@
 
 import re
 
-from pygments.lexer import Lexer, RegexLexer, include, bygroups, words, \
-    using, this, default
+from pygments.lexer import Lexer
 from pygments.util import get_bool_opt, get_list_opt
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Error
+    Number, Punctuation, Error, Whitespace
 from pygments.scanner import Scanner
 
 # compatibility import
 from pygments.lexers.modula2 import Modula2Lexer
 
-__all__ = ['DelphiLexer']
+__all__ = ['DelphiLexer', 'PortugolLexer']
+
+
+class PortugolLexer(Lexer):
+    """For Portugol, a Pascal dialect with keywords in Portuguese."""
+    name = 'Portugol'
+    aliases = ['portugol']
+    filenames = ['*.alg', '*.portugol']
+    mimetypes = []
+    url = "https://www.apoioinformatica.inf.br/produtos/visualg/linguagem"
+
+    def __init__(self, **options):
+        Lexer.__init__(self, **options)
+        self.lexer = DelphiLexer(**options, portugol=True)
+
+    def get_tokens_unprocessed(self, text):
+        return self.lexer.get_tokens_unprocessed(text)
 
 
 class DelphiLexer(Lexer):
@@ -297,18 +312,109 @@ class DelphiLexer(Lexer):
         'xlatb', 'xor'
     }
 
+    PORTUGOL_KEYWORDS = (
+        'aleatorio',
+        'algoritmo',
+        'arquivo',
+        'ate',
+        'caso',
+        'cronometro',
+        'debug',
+        'e',
+        'eco',
+        'enquanto',
+        'entao',
+        'escolha',
+        'escreva',
+        'escreval',
+        'faca',
+        'falso',
+        'fimalgoritmo',
+        'fimenquanto',
+        'fimescolha',
+        'fimfuncao',
+        'fimpara',
+        'fimprocedimento',
+        'fimrepita',
+        'fimse',
+        'funcao',
+        'inicio',
+        'int',
+        'interrompa',
+        'leia',
+        'limpatela',
+        'mod',
+        'nao',
+        'ou',
+        'outrocaso',
+        'para',
+        'passo',
+        'pausa',
+        'procedimento',
+        'repita',
+        'retorne',
+        'se',
+        'senao',
+        'timer',
+        'var',
+        'vetor',
+        'verdadeiro',
+        'xou',
+        'div',
+        'mod',
+        'abs',
+        'arccos',
+        'arcsen',
+        'arctan',
+        'cos',
+        'cotan',
+        'Exp',
+        'grauprad',
+        'int',
+        'log',
+        'logn',
+        'pi',
+        'quad',
+        'radpgrau',
+        'raizq',
+        'rand',
+        'randi',
+        'sen',
+        'Tan',
+        'asc',
+        'carac',
+        'caracpnum',
+        'compr',
+        'copia',
+        'maiusc',
+        'minusc',
+        'numpcarac',
+        'pos',
+    )
+
+    PORTUGOL_BUILTIN_TYPES = {
+        'inteiro', 'real', 'caractere', 'logico'
+    }
+
     def __init__(self, **options):
         Lexer.__init__(self, **options)
         self.keywords = set()
-        if get_bool_opt(options, 'turbopascal', True):
-            self.keywords.update(self.TURBO_PASCAL_KEYWORDS)
-        if get_bool_opt(options, 'delphi', True):
-            self.keywords.update(self.DELPHI_KEYWORDS)
-        if get_bool_opt(options, 'freepascal', True):
-            self.keywords.update(self.FREE_PASCAL_KEYWORDS)
         self.builtins = set()
-        for unit in get_list_opt(options, 'units', list(self.BUILTIN_UNITS)):
-            self.builtins.update(self.BUILTIN_UNITS[unit])
+        if get_bool_opt(options, 'portugol', False):
+            self.keywords.update(self.PORTUGOL_KEYWORDS)
+            self.builtins.update(self.PORTUGOL_BUILTIN_TYPES)
+            self.is_portugol = True
+        else:
+            self.is_portugol = False
+
+            if get_bool_opt(options, 'turbopascal', True):
+                self.keywords.update(self.TURBO_PASCAL_KEYWORDS)
+            if get_bool_opt(options, 'delphi', True):
+                self.keywords.update(self.DELPHI_KEYWORDS)
+            if get_bool_opt(options, 'freepascal', True):
+                self.keywords.update(self.FREE_PASCAL_KEYWORDS)
+            for unit in get_list_opt(options, 'units', list(self.BUILTIN_UNITS)):
+                self.builtins.update(self.BUILTIN_UNITS[unit])
 
     def get_tokens_unprocessed(self, text):
         scanner = Scanner(text, re.DOTALL | re.MULTILINE | re.IGNORECASE)
@@ -327,15 +433,17 @@ def get_tokens_unprocessed(self, text):
 
             if stack[-1] == 'initial':
                 if scanner.scan(r'\s+'):
-                    token = Text
-                elif scanner.scan(r'\{.*?\}|\(\*.*?\*\)'):
+                    token = Whitespace
+                elif not self.is_portugol and scanner.scan(r'\{.*?\}|\(\*.*?\*\)'):
                     if scanner.match.startswith('$'):
                         token = Comment.Preproc
                     else:
                         token = Comment.Multiline
                 elif scanner.scan(r'//.*?$'):
                     token = Comment.Single
-                elif scanner.scan(r'[-+*\/=<>:;,.@\^]'):
+                elif self.is_portugol and scanner.scan(r'(<\-)|(>=)|(<=)|%|<|>|-|\+|\*|\=|(<>)|\/|\.|:|,'):
+                    token = Operator
+                elif not self.is_portugol and scanner.scan(r'[-+*\/=<>:;,.@\^]'):
                     token = Operator
                     # stop label highlighting on next ";"
                     if collect_labels and scanner.match == ';':
@@ -365,35 +473,40 @@ def get_tokens_unprocessed(self, text):
                         # if we are in a special block and a
                         # block ending keyword occurs (and the parenthesis
                         # is balanced) we end the current block context
-                        if (in_function_block or in_property_block) and \
-                           lowercase_name in self.BLOCK_KEYWORDS and \
-                           brace_balance[0] <= 0 and \
-                           brace_balance[1] <= 0:
-                            in_function_block = False
-                            in_property_block = False
-                            brace_balance = [0, 0]
-                            block_labels = set()
-                        if lowercase_name in ('label', 'goto'):
-                            collect_labels = True
-                        elif lowercase_name == 'asm':
-                            stack.append('asm')
-                        elif lowercase_name == 'property':
-                            in_property_block = True
-                            next_token_is_property = True
-                        elif lowercase_name in ('procedure', 'operator',
-                                                'function', 'constructor',
-                                                'destructor'):
-                            in_function_block = True
-                            next_token_is_function = True
+                        if self.is_portugol:
+                            if lowercase_name in ('funcao', 'procedimento'):
+                                in_function_block = True
+                                next_token_is_function = True
+                        else:
+                            if (in_function_block or in_property_block) and \
+                                    lowercase_name in self.BLOCK_KEYWORDS and \
+                                    brace_balance[0] <= 0 and \
+                                    brace_balance[1] <= 0:
+                                in_function_block = False
+                                in_property_block = False
+                                brace_balance = [0, 0]
+                                block_labels = set()
+                            if lowercase_name in ('label', 'goto'):
+                                collect_labels = True
+                            elif lowercase_name == 'asm':
+                                stack.append('asm')
+                            elif lowercase_name == 'property':
+                                in_property_block = True
+                                next_token_is_property = True
+                            elif lowercase_name in ('procedure', 'operator',
+                                                    'function', 'constructor',
+                                                    'destructor'):
+                                in_function_block = True
+                                next_token_is_function = True
                     # we are in a function block and the current name
                     # is in the set of registered modifiers. highlight
                     # it as pseudo keyword
-                    elif in_function_block and \
+                    elif not self.is_portugol and in_function_block and \
                             lowercase_name in self.FUNCTION_MODIFIERS:
                         token = Keyword.Pseudo
                     # if we are in a property highlight some more
                     # modifiers
-                    elif in_property_block and \
+                    elif not self.is_portugol and in_property_block and \
                             lowercase_name in ('read', 'write'):
                         token = Keyword.Pseudo
                         next_token_is_function = True
@@ -404,40 +517,49 @@ def get_tokens_unprocessed(self, text):
                         # Look if the next token is a dot. If yes it's
                         # not a function, but a class name and the
                         # part after the dot a function name
-                        if scanner.test(r'\s*\.\s*'):
+                        if not self.is_portugol and scanner.test(r'\s*\.\s*'):
                             token = Name.Class
                         # it's not a dot, our job is done
                         else:
                             token = Name.Function
                             next_token_is_function = False
+
+                            if self.is_portugol:
+                                block_labels.add(scanner.match.lower())
+
                     # same for properties
-                    elif next_token_is_property:
+                    elif not self.is_portugol and next_token_is_property:
                         token = Name.Property
                         next_token_is_property = False
                     # Highlight this token as label and add it
                     # to the list of known labels
-                    elif collect_labels:
+                    elif not self.is_portugol and collect_labels:
                         token = Name.Label
                         block_labels.add(scanner.match.lower())
                     # name is in list of known labels
                     elif lowercase_name in block_labels:
                         token = Name.Label
-                    elif lowercase_name in self.BUILTIN_TYPES:
+                    elif self.is_portugol and lowercase_name in self.PORTUGOL_BUILTIN_TYPES:
+                        token = Keyword.Type
+                    elif not self.is_portugol and lowercase_name in self.BUILTIN_TYPES:
                         token = Keyword.Type
-                    elif lowercase_name in self.DIRECTIVES:
+                    elif not self.is_portugol and lowercase_name in self.DIRECTIVES:
                         token = Keyword.Pseudo
                     # builtins are just builtins if the token
                     # before isn't a dot
-                    elif not was_dot and lowercase_name in self.builtins:
+                    elif not self.is_portugol and not was_dot and lowercase_name in self.builtins:
                         token = Name.Builtin
                     else:
                         token = Name
-                elif scanner.scan(r"'"):
+                elif self.is_portugol and scanner.scan(r"\""):
+                    token = String
+                    stack.append('string')
+                elif not self.is_portugol and scanner.scan(r"'"):
                     token = String
                     stack.append('string')
-                elif scanner.scan(r'\#(\d+|\$[0-9A-Fa-f]+)'):
+                elif not self.is_portugol and scanner.scan(r'\#(\d+|\$[0-9A-Fa-f]+)'):
                     token = String.Char
-                elif scanner.scan(r'\$[0-9A-Fa-f]+'):
+                elif not self.is_portugol and scanner.scan(r'\$[0-9A-Fa-f]+'):
                     token = Number.Hex
                 elif scanner.scan(r'\d+(?![eE]|\.[^.])'):
                     token = Number.Integer
@@ -450,20 +572,31 @@ def get_tokens_unprocessed(self, text):
                     scanner.get_char()
 
             elif stack[-1] == 'string':
-                if scanner.scan(r"''"):
-                    token = String.Escape
-                elif scanner.scan(r"'"):
-                    token = String
-                    stack.pop()
-                elif scanner.scan(r"[^']*"):
-                    token = String
+                if self.is_portugol:
+                    if scanner.scan(r"''"):
+                        token = String.Escape
+                    elif scanner.scan(r"\""):
+                        token = String
+                        stack.pop()
+                    elif scanner.scan(r"[^\"]*"):
+                        token = String
+                    else:
+                        scanner.get_char()
+                        stack.pop()
                 else:
-                    scanner.get_char()
-                    stack.pop()
-
-            elif stack[-1] == 'asm':
+                    if scanner.scan(r"''"):
+                        token = String.Escape
+                    elif scanner.scan(r"'"):
+                        token = String
+                        stack.pop()
+                    elif scanner.scan(r"[^']*"):
+                        token = String
+                    else:
+                        scanner.get_char()
+                        stack.pop()
+            elif not self.is_portugol and stack[-1] == 'asm':
                 if scanner.scan(r'\s+'):
-                    token = Text
+                    token = Whitespace
                 elif scanner.scan(r'end'):
                     token = Keyword
                     stack.pop()
@@ -502,6 +635,7 @@ def get_tokens_unprocessed(self, text):
                     stack.pop()
 
             # save the dot!!!11
-            if scanner.match.strip():
+            if not self.is_portugol and scanner.match.strip():
                 was_dot = scanner.match == '.'
+
             yield scanner.start_pos, token, scanner.match or ''
diff --git a/pygments/lexers/perl.py b/pygments/lexers/perl.py
index 3689fc7aad..d73379423f 100644
--- a/pygments/lexers/perl.py
+++ b/pygments/lexers/perl.py
@@ -13,7 +13,7 @@
 from pygments.lexer import RegexLexer, ExtendedRegexLexer, include, bygroups, \
     using, this, default, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation
+    Number, Punctuation, Whitespace
 from pygments.util import shebang_matches
 
 __all__ = ['PerlLexer', 'Perl6Lexer']
@@ -56,7 +56,7 @@ class PerlLexer(RegexLexer):
                 'CHECK', 'INIT', 'END', 'return'), suffix=r'\b'),
              Keyword),
             (r'(format)(\s+)(\w+)(\s*)(=)(\s*\n)',
-             bygroups(Keyword, Text, Name, Text, Punctuation, Text), 'format'),
+             bygroups(Keyword, Whitespace, Name, Whitespace, Punctuation, Whitespace), 'format'),
             (r'(eq|lt|gt|le|ge|ne|not|and|or|cmp)\b', Operator.Word),
             # common delimiters
             (r's/(\\\\|\\[^\\]|[^\\/])*/(\\\\|\\[^\\]|[^\\/])*/[egimosx]*',
@@ -79,7 +79,7 @@ class PerlLexer(RegexLexer):
             (r'm(?=[/!\\{<\[(@%$])', String.Regex, 'balanced-regex'),
             (r'((?<==~)|(?<=\())\s*/(\\\\|\\[^\\]|[^\\/])*/[gcimosx]*',
                 String.Regex),
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (words((
                 'abs', 'accept', 'alarm', 'atan2', 'bind', 'binmode', 'bless', 'caller', 'chdir',
                 'chmod', 'chomp', 'chop', 'chown', 'chr', 'chroot', 'close', 'closedir', 'connect',
@@ -110,7 +110,7 @@ class PerlLexer(RegexLexer):
              Name.Builtin),
             (r'((__(DATA|DIE|WARN)__)|(STD(IN|OUT|ERR)))\b', Name.Builtin.Pseudo),
             (r'(<<)([\'"]?)([a-zA-Z_]\w*)(\2;?\n.*?\n)(\3)(\n)',
-             bygroups(String, String, String.Delimiter, String, String.Delimiter, Text)),
+             bygroups(String, String, String.Delimiter, String, String.Delimiter, Whitespace)),
             (r'__END__', Comment.Preproc, 'end-part'),
             (r'\$\^[ADEFHILMOPSTWX]', Name.Variable.Global),
             (r"\$[\\\"\[\]'&`+*.,;=%~?@$!<>(^|/-](?!\w)", Name.Variable.Global),
@@ -132,10 +132,10 @@ class PerlLexer(RegexLexer):
             (r'(q|qq|qw|qr|qx)\<', String.Other, 'lt-string'),
             (r'(q|qq|qw|qr|qx)([\W_])(.|\n)*?\2', String.Other),
             (r'(package)(\s+)([a-zA-Z_]\w*(?:::[a-zA-Z_]\w*)*)',
-             bygroups(Keyword, Text, Name.Namespace)),
+             bygroups(Keyword, Whitespace, Name.Namespace)),
             (r'(use|require|no)(\s+)([a-zA-Z_]\w*(?:::[a-zA-Z_]\w*)*)',
-             bygroups(Keyword, Text, Name.Namespace)),
-            (r'(sub)(\s+)', bygroups(Keyword, Text), 'funcname'),
+             bygroups(Keyword, Whitespace, Name.Namespace)),
+            (r'(sub)(\s+)', bygroups(Keyword, Whitespace), 'funcname'),
             (words((
                 'no', 'package', 'require', 'use'), suffix=r'\b'),
              Keyword),
@@ -151,7 +151,7 @@ class PerlLexer(RegexLexer):
             (r'[^\n]*\n', String.Interpol),
         ],
         'varname': [
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'\{', Punctuation, '#pop'),    # hash syntax?
             (r'\)|,', Punctuation, '#pop'),  # argument specifier
             (r'\w+::', Name.Namespace),
@@ -166,9 +166,9 @@ class PerlLexer(RegexLexer):
         ],
         'funcname': [
             (r'[a-zA-Z_]\w*[!?]?', Name.Function),
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             # argument declaration
-            (r'(\([$@%]*\))(\s*)', bygroups(Punctuation, Text)),
+            (r'(\([$@%]*\))(\s*)', bygroups(Punctuation, Whitespace)),
             (r';', Punctuation, '#pop'),
             (r'.*?\{', Punctuation, '#pop'),
         ],
@@ -607,7 +607,7 @@ def embedded_perl6_callback(lexer, match, context):
             (r'(regex|token|rule)(?!' + PERL6_IDENTIFIER_RANGE + r')(\s*' + PERL6_IDENTIFIER_RANGE + '+)?',
              bygroups(Keyword, Name), 'pre-token'),
             # deal with a special case in the Perl 6 grammar (role q { ... })
-            (r'(role)(\s+)(q)(\s*)', bygroups(Keyword, Text, Name, Text)),
+            (r'(role)(\s+)(q)(\s*)', bygroups(Keyword, Whitespace, Name, Whitespace)),
             (_build_word_match(PERL6_KEYWORDS, PERL6_IDENTIFIER_RANGE), Keyword),
             (_build_word_match(PERL6_BUILTIN_CLASSES, PERL6_IDENTIFIER_RANGE, suffix='(?::[UD])?'),
              Name.Builtin),
diff --git a/pygments/lexers/phix.py b/pygments/lexers/phix.py
new file mode 100644
index 0000000000..b292aa5394
--- /dev/null
+++ b/pygments/lexers/phix.py
@@ -0,0 +1,364 @@
+"""
+    pygments.lexers.phix
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Phix.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Whitespace
+
+__all__ = ['PhixLexer']
+
+
+class PhixLexer(RegexLexer):
+    """
+    Pygments Lexer for Phix files (.exw).
+    See http://phix.x10.mx
+
+    .. versionadded:: 2.14.0
+    """
+
+    name = 'Phix'
+    url = 'http://phix.x10.mx'
+    aliases = ['phix']
+    filenames = ['*.exw']
+    mimetypes = ['text/x-phix']
+
+    flags = re.MULTILINE    # nb: **NOT** re.DOTALL! (totally spanners comment handling)
+
+    preproc = (
+        'ifdef', 'elsifdef', 'elsedef'
+    )
+    # Note these lists are auto-generated by pwa/p2js.exw, when pwa\src\p2js_keywords.e (etc)
+    #     change, though of course subsequent copy/commit/pull requests are all manual steps.
+    types = (
+        'string', 'nullable_string', 'atom_string', 'atom', 'bool', 'boolean',
+        'cdCanvan', 'cdCanvas', 'complex', 'CURLcode', 'dictionary', 'int',
+        'integer', 'Ihandle', 'Ihandles', 'Ihandln', 'mpfr', 'mpq', 'mpz',
+        'mpz_or_string', 'number', 'rid_string', 'seq', 'sequence', 'timedate',
+        'object'
+    )
+    keywords = (
+        'abstract', 'class', 'continue', 'export', 'extends', 'nullable',
+        'private', 'public', 'static', 'struct', 'trace',
+        'and', 'break', 'by', 'case', 'catch', 'const', 'constant', 'debug',
+        'default', 'do', 'else', 'elsif', 'end', 'enum', 'exit', 'fallthru',
+        'fallthrough', 'for', 'forward', 'function', 'global', 'if', 'in',
+        'include', 'js', 'javascript', 'javascript_semantics', 'let', 'not',
+        'or', 'procedure', 'profile', 'profile_time', 'return', 'safe_mode',
+        'switch', 'then', 'to', 'try', 'type', 'type_check', 'until', 'warning',
+        'while', 'with', 'without', 'xor'
+    )
+    routines = (
+        'abort', 'abs', 'adjust_timedate', 'and_bits', 'and_bitsu', 'apply',
+        'append', 'arccos', 'arcsin', 'arctan', 'assert', 'atan2',
+        'atom_to_float32', 'atom_to_float64', 'bankers_rounding', 'beep',
+        'begins', 'binary_search', 'bits_to_int', 'bk_color', 'bytes_to_int',
+        'call_func', 'call_proc', 'cdCanvasActivate', 'cdCanvasArc',
+        'cdCanvasBegin', 'cdCanvasBox', 'cdCanvasChord', 'cdCanvasCircle',
+        'cdCanvasClear', 'cdCanvasEnd', 'cdCanvasFlush', 'cdCanvasFont',
+        'cdCanvasGetImageRGB', 'cdCanvasGetSize', 'cdCanvasGetTextAlignment',
+        'cdCanvasGetTextSize', 'cdCanvasLine', 'cdCanvasMark',
+        'cdCanvasMarkSize', 'cdCanvasMultiLineVectorText', 'cdCanvasPixel',
+        'cdCanvasRect', 'cdCanvasRoundedBox', 'cdCanvasRoundedRect',
+        'cdCanvasSector', 'cdCanvasSetAttribute', 'cdCanvasSetBackground',
+        'cdCanvasSetFillMode', 'cdCanvasSetForeground',
+        'cdCanvasSetInteriorStyle', 'cdCanvasSetLineStyle',
+        'cdCanvasSetLineWidth', 'cdCanvasSetTextAlignment', 'cdCanvasText',
+        'cdCanvasSetTextOrientation', 'cdCanvasGetTextOrientation',
+        'cdCanvasVectorText', 'cdCanvasVectorTextDirection',
+        'cdCanvasVectorTextSize', 'cdCanvasVertex', 'cdCreateCanvas',
+        'cdDecodeAlpha', 'cdDecodeColor', 'cdDecodeColorAlpha', 'cdEncodeAlpha',
+        'cdEncodeColor', 'cdEncodeColorAlpha', 'cdKillCanvas', 'cdVersion',
+        'cdVersionDate', 'ceil', 'change_timezone', 'choose', 'clear_screen',
+        'columnize', 'command_line', 'compare', 'complex_abs', 'complex_add',
+        'complex_arg', 'complex_conjugate', 'complex_cos', 'complex_cosh',
+        'complex_div', 'complex_exp', 'complex_imag', 'complex_inv',
+        'complex_log', 'complex_mul', 'complex_neg', 'complex_new',
+        'complex_norm', 'complex_power', 'complex_rho', 'complex_real',
+        'complex_round', 'complex_sin', 'complex_sinh', 'complex_sprint',
+        'complex_sqrt', 'complex_sub', 'complex_theta', 'concat', 'cos',
+        'crash', 'custom_sort', 'date', 'day_of_week', 'day_of_year',
+        'days_in_month', 'decode_base64', 'decode_flags', 'deep_copy', 'deld',
+        'deserialize', 'destroy_dict', 'destroy_queue', 'destroy_stack',
+        'dict_name', 'dict_size', 'elapsed', 'elapsed_short', 'encode_base64',
+        'equal', 'even', 'exp', 'extract', 'factorial', 'factors',
+        'file_size_k', 'find', 'find_all', 'find_any', 'find_replace', 'filter',
+        'flatten', 'float32_to_atom', 'float64_to_atom', 'floor',
+        'format_timedate', 'free_console', 'from_polar', 'gcd', 'get_file_base',
+        'get_file_extension', 'get_file_name', 'get_file_name_and_path',
+        'get_file_path', 'get_file_path_and_name', 'get_maxprime', 'get_prime',
+        'get_primes', 'get_primes_le', 'get_proper_dir', 'get_proper_path',
+        'get_rand', 'get_routine_info', 'get_test_abort', 'get_test_logfile',
+        'get_test_pause', 'get_test_verbosity', 'get_tzid', 'getd', 'getdd',
+        'getd_all_keys', 'getd_by_index', 'getd_index', 'getd_partial_key',
+        'glAttachShader', 'glBindBuffer', 'glBindTexture', 'glBufferData',
+        'glCanvasSpecialText', 'glClear', 'glClearColor', 'glColor',
+        'glCompileShader', 'glCreateBuffer', 'glCreateProgram',
+        'glCreateShader', 'glCreateTexture', 'glDeleteProgram',
+        'glDeleteShader', 'glDrawArrays', 'glEnable',
+        'glEnableVertexAttribArray', 'glFloat32Array', 'glInt32Array',
+        'glFlush', 'glGetAttribLocation', 'glGetError', 'glGetProgramInfoLog',
+        'glGetProgramParameter', 'glGetShaderInfoLog', 'glGetShaderParameter',
+        'glGetUniformLocation', 'glLinkProgram', 'glLoadIdentity',
+        'glMatrixMode', 'glOrtho', 'glRotatef', 'glShadeModel',
+        'glShaderSource', 'glSimpleA7texcoords', 'glTexImage2Dc',
+        'glTexParameteri', 'glTranslate', 'glUniform1f', 'glUniform1i',
+        'glUniformMatrix4fv', 'glUseProgram', 'glVertex',
+        'glVertexAttribPointer', 'glViewport', 'head', 'hsv_to_rgb', 'iff',
+        'iif', 'include_file', 'incl0de_file', 'insert', 'instance',
+        'int_to_bits', 'int_to_bytes', 'is_dict', 'is_integer', 's_leap_year',
+        'is_prime', 'is_prime2', 'islower', 'isupper', 'Icallback',
+        'iup_isdouble', 'iup_isprint', 'iup_XkeyBase', 'IupAppend', 'IupAlarm',
+        'IupBackgroundBox', 'IupButton', 'IupCalendar', 'IupCanvas',
+        'IupClipboard', 'IupClose', 'IupCloseOnEscape', 'IupControlsOpen',
+        'IupDatePick', 'IupDestroy', 'IupDialog', 'IupDrawArc', 'IupDrawBegin',
+        'IupDrawEnd', 'IupDrawGetSize', 'IupDrawGetTextSize', 'IupDrawLine',
+        'IupDrawRectangle', 'IupDrawText', 'IupExpander', 'IupFill',
+        'IupFlatLabel', 'IupFlatList', 'IupFlatTree', 'IupFlush', 'IupFrame',
+        'IupGetAttribute', 'IupGetAttributeId', 'IupGetAttributePtr',
+        'IupGetBrother', 'IupGetChild', 'IupGetChildCount', 'IupGetClassName',
+        'IupGetDialog', 'IupGetDialogChild', 'IupGetDouble', 'IupGetFocus',
+        'IupGetGlobal', 'IupGetGlobalInt', 'IupGetGlobalIntInt', 'IupGetInt',
+        'IupGetInt2', 'IupGetIntId', 'IupGetIntInt', 'IupGetParent',
+        'IupGLCanvas', 'IupGLCanvasOpen', 'IupGLMakeCurrent', 'IupGraph',
+        'IupHbox', 'IupHide', 'IupImage', 'IupImageRGBA', 'IupItem',
+        'iupKeyCodeToName', 'IupLabel', 'IupLink', 'IupList', 'IupMap',
+        'IupMenu', 'IupMenuItem', 'IupMessage', 'IupMessageDlg', 'IupMultiBox',
+        'IupMultiLine', 'IupNextField', 'IupNormaliser', 'IupOpen',
+        'IupPlayInput', 'IupPopup', 'IupPreviousField', 'IupProgressBar',
+        'IupRadio', 'IupRecordInput', 'IupRedraw', 'IupRefresh',
+        'IupRefreshChildren', 'IupSeparator', 'IupSetAttribute',
+        'IupSetAttributes', 'IupSetAttributeHandle', 'IupSetAttributeId',
+        'IupSetAttributePtr', 'IupSetCallback', 'IupSetCallbacks',
+        'IupSetDouble', 'IupSetFocus', 'IupSetGlobal', 'IupSetGlobalInt',
+        'IupSetGlobalFunction', 'IupSetHandle', 'IupSetInt',
+        'IupSetStrAttribute', 'IupSetStrGlobal', 'IupShow', 'IupShowXY',
+        'IupSplit', 'IupStoreAttribute', 'IupSubmenu', 'IupTable',
+        'IupTableClearSelected', 'IupTableClick_cb', 'IupTableGetSelected',
+        'IupTableResize_cb', 'IupTableSetData', 'IupTabs', 'IupText',
+        'IupTimer', 'IupToggle', 'IupTreeAddNodes', 'IupTreeView', 'IupUpdate',
+        'IupValuator', 'IupVbox', 'join', 'join_by', 'join_path', 'k_perm',
+        'largest', 'lcm', 'length', 'log', 'log10', 'log2', 'lower',
+        'm4_crossProduct', 'm4_inverse', 'm4_lookAt', 'm4_multiply',
+        'm4_normalize', 'm4_perspective', 'm4_subtractVectors', 'm4_xRotate',
+        'm4_yRotate', 'machine_bits', 'machine_word', 'match', 'match_all',
+        'match_replace', 'max', 'maxsq', 'min', 'minsq', 'mod', 'mpfr_add',
+        'mpfr_ceil', 'mpfr_cmp', 'mpfr_cmp_si', 'mpfr_const_pi', 'mpfr_div',
+        'mpfr_div_si', 'mpfr_div_z', 'mpfr_floor', 'mpfr_free', 'mpfr_get_d',
+        'mpfr_get_default_precision', 'mpfr_get_default_rounding_mode',
+        'mpfr_get_fixed', 'mpfr_get_precision', 'mpfr_get_si', 'mpfr_init',
+        'mpfr_inits', 'mpfr_init_set', 'mpfr_init_set_q', 'mpfr_init_set_z',
+        'mpfr_mul', 'mpfr_mul_si', 'mpfr_pow_si', 'mpfr_set', 'mpfr_set_d',
+        'mpfr_set_default_precision', 'mpfr_set_default_rounding_mode',
+        'mpfr_set_precision', 'mpfr_set_q', 'mpfr_set_si', 'mpfr_set_str',
+        'mpfr_set_z', 'mpfr_si_div', 'mpfr_si_sub', 'mpfr_sqrt', 'mpfr_sub',
+        'mpfr_sub_si', 'mpq_abs', 'mpq_add', 'mpq_add_si', 'mpq_canonicalize',
+        'mpq_cmp', 'mpq_cmp_si', 'mpq_div', 'mpq_div_2exp', 'mpq_free',
+        'mpq_get_den', 'mpq_get_num', 'mpq_get_str', 'mpq_init', 'mpq_init_set',
+        'mpq_init_set_si', 'mpq_init_set_str', 'mpq_init_set_z', 'mpq_inits',
+        'mpq_inv', 'mpq_mul', 'mpq_neg', 'mpq_set', 'mpq_set_si', 'mpq_set_str',
+        'mpq_set_z', 'mpq_sub', 'mpz_abs', 'mpz_add', 'mpz_addmul',
+        'mpz_addmul_ui', 'mpz_addmul_si', 'mpz_add_si', 'mpz_add_ui', 'mpz_and',
+        'mpz_bin_uiui', 'mpz_cdiv_q', 'mpz_cmp', 'mpz_cmp_si', 'mpz_divexact',
+        'mpz_divexact_ui', 'mpz_divisible_p', 'mpz_divisible_ui_p', 'mpz_even',
+        'mpz_fac_ui', 'mpz_factorstring', 'mpz_fdiv_q', 'mpz_fdiv_q_2exp',
+        'mpz_fdiv_q_ui', 'mpz_fdiv_qr', 'mpz_fdiv_r', 'mpz_fdiv_ui',
+        'mpz_fib_ui', 'mpz_fib2_ui', 'mpz_fits_atom', 'mpz_fits_integer',
+        'mpz_free', 'mpz_gcd', 'mpz_gcd_ui', 'mpz_get_atom', 'mpz_get_integer',
+        'mpz_get_short_str', 'mpz_get_str', 'mpz_init', 'mpz_init_set',
+        'mpz_inits', 'mpz_invert', 'mpz_lcm', 'mpz_lcm_ui', 'mpz_max',
+        'mpz_min', 'mpz_mod', 'mpz_mod_ui', 'mpz_mul', 'mpz_mul_2exp',
+        'mpz_mul_d', 'mpz_mul_si', 'mpz_neg', 'mpz_nthroot', 'mpz_odd',
+        'mpz_pollard_rho', 'mpz_pow_ui', 'mpz_powm', 'mpz_powm_ui', 'mpz_prime',
+        'mpz_prime_factors', 'mpz_prime_mr', 'mpz_rand', 'mpz_rand_ui',
+        'mpz_re_compose', 'mpz_remove', 'mpz_scan0', 'mpz_scan1', 'mpz_set',
+        'mpz_set_d', 'mpz_set_si', 'mpz_set_str', 'mpz_set_v', 'mpz_sign',
+        'mpz_sizeinbase', 'mpz_sqrt', 'mpz_sub', 'mpz_sub_si', 'mpz_sub_ui',
+        'mpz_si_sub', 'mpz_tdiv_q_2exp', 'mpz_tdiv_r_2exp', 'mpz_tstbit',
+        'mpz_ui_pow_ui', 'mpz_xor', 'named_dict', 'new_dict', 'new_queue',
+        'new_stack', 'not_bits', 'not_bitsu', 'odd', 'or_all', 'or_allu',
+        'or_bits', 'or_bitsu', 'ord', 'ordinal', 'ordinant',
+        'override_timezone', 'pad', 'pad_head', 'pad_tail', 'parse_date_string',
+        'papply', 'peep', 'peepn', 'peep_dict', 'permute', 'permutes',
+        'platform', 'pop', 'popn', 'pop_dict', 'power', 'pp', 'ppEx', 'ppExf',
+        'ppf', 'ppOpt', 'pq_add', 'pq_destroy', 'pq_empty', 'pq_new', 'pq_peek',
+        'pq_pop', 'pq_pop_data', 'pq_size', 'prepend', 'prime_factors',
+        'printf', 'product', 'proper', 'push', 'pushn', 'putd', 'puts',
+        'queue_empty', 'queue_size', 'rand', 'rand_range', 'reinstate',
+        'remainder', 'remove', 'remove_all', 'repeat', 'repeatch', 'replace',
+        'requires', 'reverse', 'rfind', 'rgb', 'rmatch', 'rmdr', 'rnd', 'round',
+        'routine_id', 'scanf', 'serialize', 'series', 'set_rand',
+        'set_test_abort', 'set_test_logfile', 'set_test_module',
+        'set_test_pause', 'set_test_verbosity', 'set_timedate_formats',
+        'set_timezone', 'setd', 'setd_default', 'shorten', 'sha256',
+        'shift_bits', 'shuffle', 'sign', 'sin', 'smallest', 'sort',
+        'sort_columns', 'speak', 'splice', 'split', 'split_any', 'split_by',
+        'sprint', 'sprintf', 'sq_abs', 'sq_add', 'sq_and', 'sq_and_bits',
+        'sq_arccos', 'sq_arcsin', 'sq_arctan', 'sq_atom', 'sq_ceil', 'sq_cmp',
+        'sq_cos', 'sq_div', 'sq_even', 'sq_eq', 'sq_floor', 'sq_floor_div',
+        'sq_ge', 'sq_gt', 'sq_int', 'sq_le', 'sq_log', 'sq_log10', 'sq_log2',
+        'sq_lt', 'sq_max', 'sq_min', 'sq_mod', 'sq_mul', 'sq_ne', 'sq_not',
+        'sq_not_bits', 'sq_odd', 'sq_or', 'sq_or_bits', 'sq_power', 'sq_rand',
+        'sq_remainder', 'sq_rmdr', 'sq_rnd', 'sq_round', 'sq_seq', 'sq_sign',
+        'sq_sin', 'sq_sqrt', 'sq_str', 'sq_sub', 'sq_tan', 'sq_trunc',
+        'sq_uminus', 'sq_xor', 'sq_xor_bits', 'sqrt', 'square_free',
+        'stack_empty', 'stack_size', 'substitute', 'substitute_all', 'sum',
+        'tail', 'tan', 'test_equal', 'test_fail', 'test_false',
+        'test_not_equal', 'test_pass', 'test_summary', 'test_true',
+        'text_color', 'throw', 'time', 'timedate_diff', 'timedelta',
+        'to_integer', 'to_number', 'to_rgb', 'to_string', 'traverse_dict',
+        'traverse_dict_partial_key', 'trim', 'trim_head', 'trim_tail', 'trunc',
+        'tagset', 'tagstart', 'typeof', 'unique', 'unix_dict', 'upper',
+        'utf8_to_utf32', 'utf32_to_utf8', 'version', 'vlookup', 'vslice',
+        'wglGetProcAddress', 'wildcard_file', 'wildcard_match', 'with_rho',
+        'with_theta', 'xml_new_doc', 'xml_new_element', 'xml_set_attribute',
+        'xml_sprint', 'xor_bits', 'xor_bitsu',
+        'accept', 'allocate', 'allocate_string', 'allow_break', 'ARM',
+        'atom_to_float80', 'c_func', 'c_proc', 'call_back', 'chdir',
+        'check_break', 'clearDib', 'close', 'closesocket', 'console',
+        'copy_file', 'create', 'create_directory', 'create_thread',
+        'curl_easy_cleanup', 'curl_easy_get_file', 'curl_easy_init',
+        'curl_easy_perform', 'curl_easy_perform_ex', 'curl_easy_setopt',
+        'curl_easy_strerror', 'curl_global_cleanup', 'curl_global_init',
+        'curl_slist_append', 'curl_slist_free_all', 'current_dir', 'cursor',
+        'define_c_func', 'define_c_proc', 'delete', 'delete_cs', 'delete_file',
+        'dir', 'DLL', 'drawDib', 'drawShadedPolygonToDib', 'ELF32', 'ELF64',
+        'enter_cs', 'eval', 'exit_thread', 'free', 'file_exists', 'final',
+        'float80_to_atom', 'format', 'get_bytes', 'get_file_date',
+        'get_file_size', 'get_file_type', 'get_interpreter', 'get_key',
+        'get_socket_error', 'get_text', 'get_thread_exitcode', 'get_thread_id',
+        'getc', 'getenv', 'gets', 'getsockaddr', 'glBegin', 'glCallList',
+        'glFrustum', 'glGenLists', 'glGetString', 'glLight', 'glMaterial',
+        'glNewList', 'glNormal', 'glPopMatrix', 'glPushMatrix', 'glRotate',
+        'glEnd', 'glEndList', 'glTexImage2D', 'goto', 'GUI', 'icons', 'ilASM',
+        'include_files', 'include_paths', 'init_cs', 'ip_to_string',
+        'IupConfig', 'IupConfigDialogClosed', 'IupConfigDialogShow',
+        'IupConfigGetVariableInt', 'IupConfigLoad', 'IupConfigSave',
+        'IupConfigSetVariableInt', 'IupExitLoop', 'IupFileDlg', 'IupFileList',
+        'IupGLSwapBuffers', 'IupHelp', 'IupLoopStep', 'IupMainLoop',
+        'IupNormalizer', 'IupPlot', 'IupPlotAdd', 'IupPlotBegin', 'IupPlotEnd',
+        'IupPlotInsert', 'IupSaveImage', 'IupTreeGetUserId', 'IupUser',
+        'IupVersion', 'IupVersionDate', 'IupVersionNumber', 'IupVersionShow',
+        'killDib', 'leave_cs', 'listen', 'manifest', 'mem_copy', 'mem_set',
+        'mpfr_gamma', 'mpfr_printf', 'mpfr_sprintf', 'mpz_export', 'mpz_import',
+        'namespace', 'new', 'newDib', 'open', 'open_dll', 'PE32', 'PE64',
+        'peek', 'peek_string', 'peek1s', 'peek1u', 'peek2s', 'peek2u', 'peek4s',
+        'peek4u', 'peek8s', 'peek8u', 'peekNS', 'peekns', 'peeknu', 'poke',
+        'poke2', 'poke4', 'poke8', 'pokeN', 'poke_string', 'poke_wstring',
+        'position', 'progress', 'prompt_number', 'prompt_string', 'read_file',
+        'read_lines', 'recv', 'resume_thread', 'seek', 'select', 'send',
+        'setHandler', 'shutdown', 'sleep', 'SO', 'sockaddr_in', 'socket',
+        'split_path', 'suspend_thread', 'system', 'system_exec', 'system_open',
+        'system_wait', 'task_clock_start', 'task_clock_stop', 'task_create',
+        'task_delay', 'task_list', 'task_schedule', 'task_self', 'task_status',
+        'task_suspend', 'task_yield', 'thread_safe_string', 'try_cs',
+        'utf8_to_utf16', 'utf16_to_utf8', 'utf16_to_utf32', 'utf32_to_utf16',
+        'video_config', 'WSACleanup', 'wait_thread', 'walk_dir', 'where',
+        'write_lines', 'wait_key'
+    )
+    constants = (
+        'ANY_QUEUE', 'ASCENDING', 'BLACK', 'BLOCK_CURSOR', 'BLUE',
+        'BRIGHT_CYAN', 'BRIGHT_BLUE', 'BRIGHT_GREEN', 'BRIGHT_MAGENTA',
+        'BRIGHT_RED', 'BRIGHT_WHITE', 'BROWN', 'C_DWORD', 'C_INT', 'C_POINTER',
+        'C_USHORT', 'C_WORD', 'CD_AMBER', 'CD_BLACK', 'CD_BLUE', 'CD_BOLD',
+        'CD_BOLD_ITALIC', 'CD_BOX', 'CD_CENTER', 'CD_CIRCLE', 'CD_CLOSED_LINES',
+        'CD_CONTINUOUS', 'CD_CUSTOM', 'CD_CYAN', 'CD_DARK_BLUE', 'CD_DARK_CYAN',
+        'CD_DARK_GRAY', 'CD_DARK_GREY', 'CD_DARK_GREEN', 'CD_DARK_MAGENTA',
+        'CD_DARK_RED', 'CD_DARK_YELLOW', 'CD_DASH_DOT', 'CD_DASH_DOT_DOT',
+        'CD_DASHED', 'CD_DBUFFER', 'CD_DEG2RAD', 'CD_DIAMOND', 'CD_DOTTED',
+        'CD_EAST', 'CD_EVENODD', 'CD_FILL', 'CD_GL', 'CD_GRAY', 'CD_GREY',
+        'CD_GREEN', 'CD_HATCH', 'CD_HOLLOW', 'CD_HOLLOW_BOX',
+        'CD_HOLLOW_CIRCLE', 'CD_HOLLOW_DIAMOND', 'CD_INDIGO', 'CD_ITALIC',
+        'CD_IUP', 'CD_IUPDBUFFER', 'CD_LIGHT_BLUE', 'CD_LIGHT_GRAY',
+        'CD_LIGHT_GREY', 'CD_LIGHT_GREEN', 'CD_LIGHT_PARCHMENT', 'CD_MAGENTA',
+        'CD_NAVY', 'CD_NORTH', 'CD_NORTH_EAST', 'CD_NORTH_WEST', 'CD_OLIVE',
+        'CD_OPEN_LINES', 'CD_ORANGE', 'CD_PARCHMENT', 'CD_PATTERN',
+        'CD_PRINTER', 'CD_PURPLE', 'CD_PLAIN', 'CD_PLUS', 'CD_QUERY',
+        'CD_RAD2DEG', 'CD_RED', 'CD_SILVER', 'CD_SOLID', 'CD_SOUTH_EAST',
+        'CD_SOUTH_WEST', 'CD_STAR', 'CD_STIPPLE', 'CD_STRIKEOUT',
+        'CD_UNDERLINE', 'CD_WEST', 'CD_WHITE', 'CD_WINDING', 'CD_VIOLET',
+        'CD_X', 'CD_YELLOW', 'CURLE_OK', 'CURLOPT_MAIL_FROM',
+        'CURLOPT_MAIL_RCPT', 'CURLOPT_PASSWORD', 'CURLOPT_READDATA',
+        'CURLOPT_READFUNCTION', 'CURLOPT_SSL_VERIFYPEER',
+        'CURLOPT_SSL_VERIFYHOST', 'CURLOPT_UPLOAD', 'CURLOPT_URL',
+        'CURLOPT_USE_SSL', 'CURLOPT_USERNAME', 'CURLOPT_VERBOSE',
+        'CURLOPT_WRITEFUNCTION', 'CURLUSESSL_ALL', 'CYAN', 'D_NAME',
+        'D_ATTRIBUTES', 'D_SIZE', 'D_YEAR', 'D_MONTH', 'D_DAY', 'D_HOUR',
+        'D_MINUTE', 'D_SECOND', 'D_CREATION', 'D_LASTACCESS', 'D_MODIFICATION',
+        'DT_YEAR', 'DT_MONTH', 'DT_DAY', 'DT_HOUR', 'DT_MINUTE', 'DT_SECOND',
+        'DT_DOW', 'DT_MSEC', 'DT_DOY', 'DT_GMT', 'EULER', 'E_CODE', 'E_ADDR',
+        'E_LINE', 'E_RTN', 'E_NAME', 'E_FILE', 'E_PATH', 'E_USER', 'false',
+        'False', 'FALSE', 'FIFO_QUEUE', 'FILETYPE_DIRECTORY', 'FILETYPE_FILE',
+        'GET_EOF', 'GET_FAIL', 'GET_IGNORE', 'GET_SUCCESS',
+        'GL_AMBIENT_AND_DIFFUSE', 'GL_ARRAY_BUFFER', 'GL_CLAMP',
+        'GL_CLAMP_TO_BORDER', 'GL_CLAMP_TO_EDGE', 'GL_COLOR_BUFFER_BIT',
+        'GL_COMPILE', 'GL_COMPILE_STATUS', 'GL_CULL_FACE',
+        'GL_DEPTH_BUFFER_BIT', 'GL_DEPTH_TEST', 'GL_EXTENSIONS', 'GL_FLAT',
+        'GL_FLOAT', 'GL_FRAGMENT_SHADER', 'GL_FRONT', 'GL_LIGHT0',
+        'GL_LIGHTING', 'GL_LINEAR', 'GL_LINK_STATUS', 'GL_MODELVIEW',
+        'GL_NEAREST', 'GL_NO_ERROR', 'GL_NORMALIZE', 'GL_POSITION',
+        'GL_PROJECTION', 'GL_QUAD_STRIP', 'GL_QUADS', 'GL_RENDERER',
+        'GL_REPEAT', 'GL_RGB', 'GL_RGBA', 'GL_SMOOTH', 'GL_STATIC_DRAW',
+        'GL_TEXTURE_2D', 'GL_TEXTURE_MAG_FILTER', 'GL_TEXTURE_MIN_FILTER',
+        'GL_TEXTURE_WRAP_S', 'GL_TEXTURE_WRAP_T', 'GL_TRIANGLES',
+        'GL_UNSIGNED_BYTE', 'GL_VENDOR', 'GL_VERSION', 'GL_VERTEX_SHADER',
+        'GRAY', 'GREEN', 'GT_LF_STRIPPED', 'GT_WHOLE_FILE', 'INVLN10',
+        'IUP_CLOSE', 'IUP_CONTINUE', 'IUP_DEFAULT', 'IUP_BLACK', 'IUP_BLUE',
+        'IUP_BUTTON1', 'IUP_BUTTON3', 'IUP_CENTER', 'IUP_CYAN', 'IUP_DARK_BLUE',
+        'IUP_DARK_CYAN', 'IUP_DARK_GRAY', 'IUP_DARK_GREY', 'IUP_DARK_GREEN',
+        'IUP_DARK_MAGENTA', 'IUP_DARK_RED', 'IUP_GRAY', 'IUP_GREY', 'IUP_GREEN',
+        'IUP_IGNORE', 'IUP_INDIGO', 'IUP_MAGENTA', 'IUP_MASK_INT',
+        'IUP_MASK_UINT', 'IUP_MOUSEPOS', 'IUP_NAVY', 'IUP_OLIVE', 'IUP_RECTEXT',
+        'IUP_RED', 'IUP_LIGHT_BLUE', 'IUP_LIGHT_GRAY', 'IUP_LIGHT_GREY',
+        'IUP_LIGHT_GREEN', 'IUP_ORANGE', 'IUP_PARCHMENT', 'IUP_PURPLE',
+        'IUP_SILVER', 'IUP_TEAL', 'IUP_VIOLET', 'IUP_WHITE', 'IUP_YELLOW',
+        'K_BS', 'K_cA', 'K_cC', 'K_cD', 'K_cF5', 'K_cK', 'K_cM', 'K_cN', 'K_cO',
+        'K_cP', 'K_cR', 'K_cS', 'K_cT', 'K_cW', 'K_CR', 'K_DEL', 'K_DOWN',
+        'K_END', 'K_ESC', 'K_F1', 'K_F2', 'K_F3', 'K_F4', 'K_F5', 'K_F6',
+        'K_F7', 'K_F8', 'K_F9', 'K_F10', 'K_F11', 'K_F12', 'K_HOME', 'K_INS',
+        'K_LEFT', 'K_MIDDLE', 'K_PGDN', 'K_PGUP', 'K_RIGHT', 'K_SP', 'K_TAB',
+        'K_UP', 'K_h', 'K_i', 'K_j', 'K_p', 'K_r', 'K_s', 'JS', 'LIFO_QUEUE',
+        'LINUX', 'MAX_HEAP', 'MAGENTA', 'MIN_HEAP', 'Nan', 'NO_CURSOR', 'null',
+        'NULL', 'PI', 'pp_Ascii', 'pp_Brkt', 'pp_Date', 'pp_File', 'pp_FltFmt',
+        'pp_Indent', 'pp_IntCh', 'pp_IntFmt', 'pp_Maxlen', 'pp_Nest',
+        'pp_Pause', 'pp_Q22', 'pp_StrFmt', 'RED', 'SEEK_OK', 'SLASH',
+        'TEST_ABORT', 'TEST_CRASH', 'TEST_PAUSE', 'TEST_PAUSE_FAIL',
+        'TEST_QUIET', 'TEST_SHOW_ALL', 'TEST_SHOW_FAILED', 'TEST_SUMMARY',
+        'true', 'True', 'TRUE', 'VC_SCRNLINES', 'WHITE', 'WINDOWS', 'YELLOW'
+    )
+
+    tokens = {
+        'root': [
+            (r"\s+", Whitespace),
+            (r'/\*|--/\*|#\[', Comment.Multiline, 'comment'),
+            (r'(?://|--|#!).*$', Comment.Single),
+#Alt:
+#           (r'//.*$|--.*$|#!.*$', Comment.Single),
+            (r'"([^"\\]|\\.)*"', String.Other),
+            (r'\'[^\']*\'', String.Other),
+            (r'`[^`]*`', String.Other),
+
+            (words(types, prefix=r'\b', suffix=r'\b'), Name.Function),
+            (words(routines, prefix=r'\b', suffix=r'\b'), Name.Function),
+            (words(preproc, prefix=r'\b', suffix=r'\b'), Keyword.Declaration),
+            (words(keywords, prefix=r'\b', suffix=r'\b'), Keyword.Declaration),
+            (words(constants, prefix=r'\b', suffix=r'\b'), Name.Constant),
+            # Aside: Phix only supports/uses the ascii/non-unicode tilde
+            (r'!=|==|<<|>>|:=|[-~+/*%=<>&^|\.(){},?:\[\]$\\;#]', Operator),
+            (r'[\w-]+', Text)
+        ],
+        'comment': [
+            (r'[^*/#]+', Comment.Multiline),
+            (r'/\*|#\[', Comment.Multiline, '#push'),
+            (r'\*/|#\]', Comment.Multiline, '#pop'),
+            (r'[*/#]', Comment.Multiline)
+        ]
+    }
diff --git a/pygments/lexers/php.py b/pygments/lexers/php.py
index 5a55bbe108..61d552abaf 100644
--- a/pygments/lexers/php.py
+++ b/pygments/lexers/php.py
@@ -11,15 +11,13 @@
 import re
 
 from pygments.lexer import Lexer, RegexLexer, include, bygroups, default, \
-    using, this, words, do_insertions
+    using, this, words, do_insertions, line_re
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Other, Generic
 from pygments.util import get_bool_opt, get_list_opt, shebang_matches
 
 __all__ = ['ZephirLexer', 'PsyshConsoleLexer', 'PhpLexer']
 
-line_re = re.compile('.*?\n')
-
 
 class ZephirLexer(RegexLexer):
     """
diff --git a/pygments/lexers/praat.py b/pygments/lexers/praat.py
index 834f15b7b2..b39979d8b8 100644
--- a/pygments/lexers/praat.py
+++ b/pygments/lexers/praat.py
@@ -9,8 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer, words, bygroups, include
-from pygments.token import Name, Text, Comment, Keyword, String, Punctuation, Number, \
-    Operator
+from pygments.token import Name, Text, Comment, Keyword, String, Punctuation, \
+    Number, Operator, Whitespace
 
 __all__ = ['PraatLexer']
 
@@ -118,10 +118,10 @@ class PraatLexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r'(\s+)(#.*?$)',  bygroups(Text, Comment.Single)),
+            (r'(\s+)(#.*?$)',  bygroups(Whitespace, Comment.Single)),
             (r'^#.*?$',        Comment.Single),
             (r';[^\n]*',       Comment.Single),
-            (r'\s+',           Text),
+            (r'\s+',           Whitespace),
 
             (r'\bprocedure\b', Keyword,       'procedure_definition'),
             (r'\bcall\b',      Keyword,       'procedure_call'),
@@ -132,13 +132,13 @@ class PraatLexer(RegexLexer):
             (words(keywords, suffix=r'\b'), Keyword),
 
             (r'(\bform\b)(\s+)([^\n]+)',
-             bygroups(Keyword, Text, String), 'old_form'),
+             bygroups(Keyword, Whitespace, String), 'old_form'),
 
             (r'(print(?:line|tab)?|echo|exit|asserterror|pause|send(?:praat|socket)|'
              r'include|execute|system(?:_nocheck)?)(\s+)',
-             bygroups(Keyword, Text), 'string_unquoted'),
+             bygroups(Keyword, Whitespace), 'string_unquoted'),
 
-            (r'(goto|label)(\s+)(\w+)', bygroups(Keyword, Text, Name.Label)),
+            (r'(goto|label)(\s+)(\w+)', bygroups(Keyword, Whitespace, Name.Label)),
 
             include('variable_name'),
             include('number'),
@@ -157,18 +157,19 @@ class PraatLexer(RegexLexer):
 
             (r'\.{3}', Keyword, ('#pop', 'old_arguments')),
             (r':', Keyword, ('#pop', 'comma_list')),
-            (r'\s', Text, '#pop'),
+            (r'\s', Whitespace, '#pop'),
         ],
         'procedure_call': [
-            (r'\s+', Text),
-            (r'([\w.]+)(:|\s*\()',
-             bygroups(Name.Function, Text), '#pop'),
+            (r'\s+', Whitespace),
+            (r'([\w.]+)(?:(:)|(?:(\s*)(\()))',
+             bygroups(Name.Function, Punctuation,
+                      Text.Whitespace, Punctuation), '#pop'),
             (r'([\w.]+)', Name.Function, ('#pop', 'old_arguments')),
         ],
         'procedure_definition': [
-            (r'\s', Text),
+            (r'\s', Whitespace),
             (r'([\w.]+)(\s*?[(:])',
-             bygroups(Name.Function, Text), '#pop'),
+             bygroups(Name.Function, Whitespace), '#pop'),
             (r'([\w.]+)([^\n]*)',
              bygroups(Name.Function, Text), '#pop'),
         ],
@@ -178,16 +179,17 @@ class PraatLexer(RegexLexer):
             (words(functions_numeric, suffix=r'(?=\s*[:(])'),  Name.Function, 'function'),
         ],
         'function': [
-            (r'\s+',   Text),
+            (r'\s+',   Whitespace),
             (r':',     Punctuation, ('#pop', 'comma_list')),
             (r'\s*\(', Punctuation, ('#pop', 'comma_list')),
         ],
         'comma_list': [
-            (r'(\s*\n\s*)(\.{3})', bygroups(Text, Punctuation)),
+            (r'(\s*\n\s*)(\.{3})', bygroups(Whitespace, Punctuation)),
 
-            (r'(\s*[])\n])', Text, '#pop'),
+            (r'(\s*)(?:([)\]])|(\n))', bygroups(
+                Whitespace, Punctuation, Whitespace), '#pop'),
 
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'"',   String, 'string'),
             (r'\b(if|then|else|fi|endif)\b', Keyword),
 
@@ -200,7 +202,7 @@ class PraatLexer(RegexLexer):
             (r',', Punctuation),
         ],
         'old_arguments': [
-            (r'\n', Text, '#pop'),
+            (r'\n', Whitespace, '#pop'),
 
             include('variable_name'),
             include('operator'),
@@ -210,7 +212,7 @@ class PraatLexer(RegexLexer):
             (r'[^\n]', Text),
         ],
         'number': [
-            (r'\n', Text, '#pop'),
+            (r'\n', Whitespace, '#pop'),
             (r'\b\d+(\.\d*)?([eE][-+]?\d+)?%?', Number),
         ],
         'object_reference': [
@@ -249,10 +251,10 @@ class PraatLexer(RegexLexer):
              String.Interpol),
         ],
         'string_unquoted': [
-            (r'(\n\s*)(\.{3})', bygroups(Text, Punctuation)),
+            (r'(\n\s*)(\.{3})', bygroups(Whitespace, Punctuation)),
 
-            (r'\n',       Text,            '#pop'),
-            (r'\s',       Text),
+            (r'\n',       Whitespace,            '#pop'),
+            (r'\s',       Whitespace),
 
             include('string_interpolated'),
 
@@ -260,7 +262,7 @@ class PraatLexer(RegexLexer):
             (r"[^'\n]+",  String),
         ],
         'string': [
-            (r'(\n\s*)(\.{3})', bygroups(Text, Punctuation)),
+            (r'(\n\s*)(\.{3})', bygroups(Whitespace, Punctuation)),
 
             (r'"',          String,          '#pop'),
 
@@ -270,32 +272,32 @@ class PraatLexer(RegexLexer):
             (r'[^\'"\n]+',  String),
         ],
         'old_form': [
-            (r'(\s+)(#.*?$)',  bygroups(Text, Comment.Single)),
-            (r'\s+', Text),
+            (r'(\s+)(#.*?$)',  bygroups(Whitespace, Comment.Single)),
+            (r'\s+', Whitespace),
 
-            (r'(optionmenu|choice)([ \t]+\S+:[ \t]+)',
-             bygroups(Keyword, Text), 'number'),
+            (r'(optionmenu|choice)([ \t]+)(\S+)(:)([ \t]+)',
+             bygroups(Keyword, Whitespace, Text, Punctuation, Whitespace), 'number'),
 
             (r'(option|button)([ \t]+)',
-             bygroups(Keyword, Text), 'string_unquoted'),
+             bygroups(Keyword, Whitespace), 'string_unquoted'),
 
-            (r'(sentence|text)([ \t]+\S+)',
-             bygroups(Keyword, Text), 'string_unquoted'),
+            (r'(sentence|text)([ \t]+)(\S+)',
+             bygroups(Keyword, Whitespace, String), 'string_unquoted'),
 
-            (r'(word)([ \t]+\S+[ \t]*)(\S+)?([ \t]+.*)?',
-             bygroups(Keyword, Text, String, Text)),
+            (r'(word)([ \t]+)(\S+)([ \t]*)(\S+)?(?:([ \t]+)(.*))?',
+             bygroups(Keyword, Whitespace, Text, Whitespace, Text, Whitespace, Text)),
 
             (r'(boolean)(\s+\S+\s*)(0|1|"?(?:yes|no)"?)',
-             bygroups(Keyword, Text, Name.Variable)),
+             bygroups(Keyword, Whitespace, Name.Variable)),
 
             # Ideally processing of the number would happen in the 'number'
             # but that doesn't seem to work
             (r'(real|natural|positive|integer)([ \t]+\S+[ \t]*)([+-]?)(\d+(?:\.\d*)?'
              r'(?:[eE][-+]?\d+)?%?)',
-             bygroups(Keyword, Text, Operator, Number)),
+             bygroups(Keyword, Whitespace, Operator, Number)),
 
             (r'(comment)(\s+)',
-             bygroups(Keyword, Text), 'string_unquoted'),
+             bygroups(Keyword, Whitespace), 'string_unquoted'),
 
             (r'\bendform\b', Keyword, '#pop'),
         ]
diff --git a/pygments/lexers/promql.py b/pygments/lexers/promql.py
index 1c239a26a7..dcb8b33dc1 100644
--- a/pygments/lexers/promql.py
+++ b/pygments/lexers/promql.py
@@ -9,16 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer, bygroups, default, words
-from pygments.token import (
-    Comment,
-    Keyword,
-    Name,
-    Number,
-    Operator,
-    Punctuation,
-    String,
-    Whitespace,
-)
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
+    Punctuation, String, Whitespace
 
 __all__ = ["PromQLLexer"]
 
diff --git a/pygments/lexers/python.py b/pygments/lexers/python.py
index 0a7e8f8366..0a318a9ed4 100644
--- a/pygments/lexers/python.py
+++ b/pygments/lexers/python.py
@@ -12,18 +12,16 @@
 import keyword
 
 from pygments.lexer import Lexer, RegexLexer, include, bygroups, using, \
-    default, words, combined, do_insertions, this
+    default, words, combined, do_insertions, this, line_re
 from pygments.util import get_bool_opt, shebang_matches
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Generic, Other, Error
+    Number, Punctuation, Generic, Other, Error, Whitespace
 from pygments import unistring as uni
 
 __all__ = ['PythonLexer', 'PythonConsoleLexer', 'PythonTracebackLexer',
            'Python2Lexer', 'Python2TracebackLexer',
            'CythonLexer', 'DgLexer', 'NumPyLexer']
 
-line_re = re.compile('.*?\n')
-
 
 class PythonLexer(RegexLexer):
     """
@@ -42,6 +40,8 @@ class PythonLexer(RegexLexer):
     filenames = [
         '*.py',
         '*.pyw',
+        # Type stubs
+        '*.pyi',
         # Jython
         '*.jy',
         # Sage
@@ -100,11 +100,11 @@ def fstring_rules(ttype):
 
     tokens = {
         'root': [
-            (r'\n', Text),
+            (r'\n', Whitespace),
             (r'^(\s*)([rRuUbB]{,2})("""(?:.|\n)*?""")',
-             bygroups(Text, String.Affix, String.Doc)),
+             bygroups(Whitespace, String.Affix, String.Doc)),
             (r"^(\s*)([rRuUbB]{,2})('''(?:.|\n)*?''')",
-             bygroups(Text, String.Affix, String.Doc)),
+             bygroups(Whitespace, String.Affix, String.Doc)),
             (r'\A#!.+$', Comment.Hashbang),
             (r'#.*$', Comment.Single),
             (r'\\\n', Text),
@@ -169,7 +169,7 @@ def fstring_rules(ttype):
              combined('bytesescape', 'dqs')),
             ("([bB])(')", bygroups(String.Affix, String.Single),
              combined('bytesescape', 'sqs')),
-            
+
             (r'[^\S\n]+', Text),
             include('numbers'),
             (r'!=|==|<<|>>|:=|[-~+/*%=<>&^|.]', Operator),
@@ -192,13 +192,13 @@ def fstring_rules(ttype):
             (r'(=\s*)?'         # debug (https://bugs.python.org/issue36817)
              r'(\![sraf])?'     # conversion
              r':', String.Interpol, '#pop'),
-            (r'\s+', Text),  # allow new lines
+            (r'\s+', Whitespace),  # allow new lines
             include('expr'),
         ],
         'expr-inside-fstring-inner': [
             (r'[{([]', Punctuation, 'expr-inside-fstring-inner'),
             (r'[])}]', Punctuation, '#pop'),
-            (r'\s+', Text),  # allow new lines
+            (r'\s+', Whitespace),  # allow new lines
             include('expr'),
         ],
         'expr-keywords': [
@@ -229,7 +229,7 @@ def fstring_rules(ttype):
         ],
         'soft-keywords-inner': [
             # optional `_` keyword
-            (r'(\s+)([^\n_]*)(_\b)', bygroups(Text, using(this), Keyword)),
+            (r'(\s+)([^\n_]*)(_\b)', bygroups(Whitespace, using(this), Keyword)),
             default('#pop')
         ],
         'builtins': [
@@ -445,11 +445,11 @@ def innerstring_rules(ttype):
 
     tokens = {
         'root': [
-            (r'\n', Text),
+            (r'\n', Whitespace),
             (r'^(\s*)([rRuUbB]{,2})("""(?:.|\n)*?""")',
-             bygroups(Text, String.Affix, String.Doc)),
+             bygroups(Whitespace, String.Affix, String.Doc)),
             (r"^(\s*)([rRuUbB]{,2})('''(?:.|\n)*?''')",
-             bygroups(Text, String.Affix, String.Doc)),
+             bygroups(Whitespace, String.Affix, String.Doc)),
             (r'[^\S\n]+', Text),
             (r'\A#!.+$', Comment.Hashbang),
             (r'#.*$', Comment.Single),
@@ -742,7 +742,7 @@ class PythonTracebackLexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r'\n', Text),
+            (r'\n', Whitespace),
             (r'^Traceback \(most recent call last\):\n', Generic.Traceback, 'intb'),
             (r'^During handling of the above exception, another '
              r'exception occurred:\n\n', Generic.Traceback),
@@ -753,24 +753,24 @@ class PythonTracebackLexer(RegexLexer):
         ],
         'intb': [
             (r'^(  File )("[^"]+")(, line )(\d+)(, in )(.+)(\n)',
-             bygroups(Text, Name.Builtin, Text, Number, Text, Name, Text)),
+             bygroups(Text, Name.Builtin, Text, Number, Text, Name, Whitespace)),
             (r'^(  File )("[^"]+")(, line )(\d+)(\n)',
-             bygroups(Text, Name.Builtin, Text, Number, Text)),
+             bygroups(Text, Name.Builtin, Text, Number, Whitespace)),
             (r'^(    )(.+)(\n)',
-             bygroups(Text, using(PythonLexer), Text), 'markers'),
+             bygroups(Whitespace, using(PythonLexer), Whitespace), 'markers'),
             (r'^([ \t]*)(\.\.\.)(\n)',
-             bygroups(Text, Comment, Text)),  # for doctests...
+             bygroups(Whitespace, Comment, Whitespace)),  # for doctests...
             (r'^([^:]+)(: )(.+)(\n)',
-             bygroups(Generic.Error, Text, Name, Text), '#pop'),
+             bygroups(Generic.Error, Text, Name, Whitespace), '#pop'),
             (r'^([a-zA-Z_][\w.]*)(:?\n)',
-             bygroups(Generic.Error, Text), '#pop')
+             bygroups(Generic.Error, Whitespace), '#pop')
         ],
         'markers': [
             # Either `PEP 657 <https://www.python.org/dev/peps/pep-0657/>`
             # error locations in Python 3.11+, or single-caret markers
             # for syntax errors before that.
             (r'^( {4,})([~^]+)(\n)',
-             bygroups(Text, Punctuation.Marker, Text),
+             bygroups(Whitespace, Punctuation.Marker, Whitespace),
              '#pop'),
             default('#pop'),
         ],
@@ -808,17 +808,17 @@ class Python2TracebackLexer(RegexLexer):
         ],
         'intb': [
             (r'^(  File )("[^"]+")(, line )(\d+)(, in )(.+)(\n)',
-             bygroups(Text, Name.Builtin, Text, Number, Text, Name, Text)),
+             bygroups(Text, Name.Builtin, Text, Number, Text, Name, Whitespace)),
             (r'^(  File )("[^"]+")(, line )(\d+)(\n)',
-             bygroups(Text, Name.Builtin, Text, Number, Text)),
+             bygroups(Text, Name.Builtin, Text, Number, Whitespace)),
             (r'^(    )(.+)(\n)',
-             bygroups(Text, using(Python2Lexer), Text), 'marker'),
+             bygroups(Text, using(Python2Lexer), Whitespace), 'marker'),
             (r'^([ \t]*)(\.\.\.)(\n)',
-             bygroups(Text, Comment, Text)),  # for doctests...
+             bygroups(Text, Comment, Whitespace)),  # for doctests...
             (r'^([^:]+)(: )(.+)(\n)',
-             bygroups(Generic.Error, Text, Name, Text), '#pop'),
+             bygroups(Generic.Error, Text, Name, Whitespace), '#pop'),
             (r'^([a-zA-Z_]\w*)(:?\n)',
-             bygroups(Generic.Error, Text), '#pop')
+             bygroups(Generic.Error, Whitespace), '#pop')
         ],
         'marker': [
             # For syntax errors.
@@ -843,13 +843,13 @@ class CythonLexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r'\n', Text),
-            (r'^(\s*)("""(?:.|\n)*?""")', bygroups(Text, String.Doc)),
-            (r"^(\s*)('''(?:.|\n)*?''')", bygroups(Text, String.Doc)),
+            (r'\n', Whitespace),
+            (r'^(\s*)("""(?:.|\n)*?""")', bygroups(Whitespace, String.Doc)),
+            (r"^(\s*)('''(?:.|\n)*?''')", bygroups(Whitespace, String.Doc)),
             (r'[^\S\n]+', Text),
             (r'#.*$', Comment),
             (r'[]{}:(),;[]', Punctuation),
-            (r'\\\n', Text),
+            (r'\\\n', Whitespace),
             (r'\\', Text),
             (r'(in|is|and|or|not)\b', Operator.Word),
             (r'(<)([a-zA-Z0-9.?]+)(>)',
diff --git a/pygments/lexers/q.py b/pygments/lexers/q.py
index 21a049fab4..b445ee89c0 100644
--- a/pygments/lexers/q.py
+++ b/pygments/lexers/q.py
@@ -9,19 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer, words, include, bygroups, inherit
-from pygments.token import (
-    Comment,
-    Keyword,
-    Name,
-    Number,
-    Operator,
-    Punctuation,
-    String,
-    Text,
-    Whitespace,
-    Literal,
-    Generic,
-)
+from pygments.token import Comment, Name, Number, Operator, Punctuation, \
+    String, Whitespace, Literal, Generic
 
 __all__ = ["KLexer", "QLexer"]
 
@@ -55,43 +44,32 @@ class KLexer(RegexLexer):
             include("declarations"),
         ],
         "keywords": [
-            (
-                words(
-                    ("abs", "acos", "asin", "atan", "avg", "bin",
-                     "binr", "by", "cor", "cos", "cov", "dev",
-                     "delete", "div", "do", "enlist", "exec", "exit",
-                     "exp", "from", "getenv", "hopen", "if", "in",
-                     "insert", "last", "like", "log", "max", "min",
-                     "prd", "select", "setenv", "sin", "sqrt", "ss",
-                     "sum", "tan", "update", "var", "wavg", "while",
-                     "within", "wsum", "xexp"),
-                    suffix=r"\b",
-                ),
-                Operator.Word,
-            ),
+            (words(("abs", "acos", "asin", "atan", "avg", "bin",
+                    "binr", "by", "cor", "cos", "cov", "dev",
+                    "delete", "div", "do", "enlist", "exec", "exit",
+                    "exp", "from", "getenv", "hopen", "if", "in",
+                    "insert", "last", "like", "log", "max", "min",
+                    "prd", "select", "setenv", "sin", "sqrt", "ss",
+                    "sum", "tan", "update", "var", "wavg", "while",
+                    "within", "wsum", "xexp"),
+                   suffix=r"\b"), Operator.Word),
         ],
         "declarations": [
             # Timing
             (r"^\\ts?", Comment.Preproc),
-            (
-                r"^(\\\w\s+[^/\n]*?)(/.*)",
-                bygroups(Comment.Preproc, Comment.Single),
-            ),
+            (r"^(\\\w\s+[^/\n]*?)(/.*)",
+             bygroups(Comment.Preproc, Comment.Single)),
             # Generic System Commands
             (r"^\\\w.*", Comment.Preproc),
             # Prompt
             (r"^[a-zA-Z]\)", Generic.Prompt),
             # Function Names
-            (
-                r"([.]?[a-zA-Z][\w.]*)(\s*)([-.~=!@#$%^&*_+|,<>?/\\:']?:)(\s*)(\{)",
-                bygroups(Name.Function, Whitespace, Operator, Whitespace, Punctuation),
-                "functions",
-            ),
+            (r"([.]?[a-zA-Z][\w.]*)(\s*)([-.~=!@#$%^&*_+|,<>?/\\:']?:)(\s*)(\{)",
+             bygroups(Name.Function, Whitespace, Operator, Whitespace, Punctuation),
+             "functions"),
             # Variable Names
-            (
-                r"([.]?[a-zA-Z][\w.]*)(\s*)([-.~=!@#$%^&*_+|,<>?/\\:']?:)",
-                bygroups(Name.Variable, Whitespace, Operator),
-            ),
+            (r"([.]?[a-zA-Z][\w.]*)(\s*)([-.~=!@#$%^&*_+|,<>?/\\:']?:)",
+             bygroups(Name.Variable, Whitespace, Operator)),
             # Functions
             (r"\{", Punctuation, "functions"),
             # Parentheses
@@ -131,40 +109,24 @@ class KLexer(RegexLexer):
             # Nulls/Infinities
             (r"0[nNwW][cefghijmndzuvtp]?", Number),
             # Timestamps
-            (
-                (
-                    r"(?:[0-9]{4}[.][0-9]{2}[.][0-9]{2}|[0-9]+)"
-                    "D(?:[0-9](?:[0-9](?::[0-9]{2}"
-                    "(?::[0-9]{2}(?:[.][0-9]*)?)?)?)?)?"
-                ),
-                Literal.Date,
-            ),
+            ((r"(?:[0-9]{4}[.][0-9]{2}[.][0-9]{2}|[0-9]+)"
+              "D(?:[0-9](?:[0-9](?::[0-9]{2}"
+              "(?::[0-9]{2}(?:[.][0-9]*)?)?)?)?)?"), Literal.Date),
             # Datetimes
-            (
-                (
-                    r"[0-9]{4}[.][0-9]{2}"
-                    "(?:m|[.][0-9]{2}(?:T(?:[0-9]{2}:[0-9]{2}"
-                    "(?::[0-9]{2}(?:[.][0-9]*)?)?)?)?)"
-                ),
-                Literal.Date,
-            ),
+            ((r"[0-9]{4}[.][0-9]{2}"
+              "(?:m|[.][0-9]{2}(?:T(?:[0-9]{2}:[0-9]{2}"
+              "(?::[0-9]{2}(?:[.][0-9]*)?)?)?)?)"), Literal.Date),
             # Times
-            (
-                (r"[0-9]{2}:[0-9]{2}(?::[0-9]{2}(?:[.][0-9]{1,3})?)?"),
-                Literal.Date,
-            ),
+            (r"[0-9]{2}:[0-9]{2}(?::[0-9]{2}(?:[.][0-9]{1,3})?)?",
+             Literal.Date),
             # GUIDs
-            (
-                r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
-                Number.Hex,
-            ),
+            (r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
+             Number.Hex),
             # Byte Vectors
             (r"0x[0-9a-fA-F]+", Number.Hex),
             # Floats
-            (
-                r"([0-9]*[.]?[0-9]+|[0-9]+[.]?[0-9]*)[eE][+-]?[0-9]+[ef]?",
-                Number.Float,
-            ),
+            (r"([0-9]*[.]?[0-9]+|[0-9]+[.]?[0-9]*)[eE][+-]?[0-9]+[ef]?",
+             Number.Float),
             (r"([0-9]*[.][0-9]+|[0-9]+[.][0-9]*)[ef]?", Number.Float),
             (r"[0-9]+[ef]", Number.Float),
             # Characters
@@ -200,35 +162,26 @@ class QLexer(KLexer):
 
     tokens = {
         "root": [
-            (
-                words(
-                    ("aj", "aj0", "ajf", "ajf0", "all", "and", "any",
-                     "asc", "asof", "attr", "avgs", "ceiling", "cols",
-                     "count", "cross", "csv", "cut", "deltas", "desc",
-                     "differ", "distinct", "dsave", "each", "ej",
-                     "ema", "eval", "except", "fby", "fills", "first",
-                     "fkeys", "flip", "floor", "get", "group", "gtime",
-                     "hclose", "hcount", "hdel", "hsym", "iasc",
-                     "idesc", "ij", "ijf", "inter", "inv", "key",
-                     "keys", "lj", "ljf", "load", "lower", "lsq",
-                     "ltime", "ltrim", "mavg", "maxs", "mcount", "md5",
-                     "mdev", "med", "meta", "mins", "mmax", "mmin",
-                     "mmu", "mod", "msum", "neg", "next", "not",
-                     "null", "or", "over", "parse", "peach", "pj",
-                     "prds", "prior", "prev", "rand", "rank", "ratios",
-                     "raze", "read0", "read1", "reciprocal", "reval",
-                     "reverse", "rload", "rotate", "rsave", "rtrim",
-                     "save", "scan", "scov", "sdev", "set", "show",
-                     "signum", "ssr", "string", "sublist", "sums",
-                     "sv", "svar", "system", "tables", "til", "trim",
-                     "txf", "type", "uj", "ujf", "ungroup", "union",
-                     "upper", "upsert", "value", "view", "views", "vs",
-                     "where", "wj", "wj1", "ww", "xasc", "xbar",
-                     "xcol", "xcols", "xdesc", "xgroup", "xkey",
-                     "xlog", "xprev", "xrank"),
-                    suffix=r"\b",
-                ),
-                Name.Builtin,
+            (words(("aj", "aj0", "ajf", "ajf0", "all", "and", "any", "asc",
+                    "asof", "attr", "avgs", "ceiling", "cols", "count", "cross",
+                    "csv", "cut", "deltas", "desc", "differ", "distinct", "dsave",
+                    "each", "ej", "ema", "eval", "except", "fby", "fills", "first",
+                    "fkeys", "flip", "floor", "get", "group", "gtime", "hclose",
+                    "hcount", "hdel", "hsym", "iasc", "idesc", "ij", "ijf",
+                    "inter", "inv", "key", "keys", "lj", "ljf", "load", "lower",
+                    "lsq", "ltime", "ltrim", "mavg", "maxs", "mcount", "md5",
+                    "mdev", "med", "meta", "mins", "mmax", "mmin", "mmu", "mod",
+                    "msum", "neg", "next", "not", "null", "or", "over", "parse",
+                    "peach", "pj", "prds", "prior", "prev", "rand", "rank", "ratios",
+                    "raze", "read0", "read1", "reciprocal", "reval", "reverse",
+                    "rload", "rotate", "rsave", "rtrim", "save", "scan", "scov",
+                    "sdev", "set", "show", "signum", "ssr", "string", "sublist",
+                    "sums", "sv", "svar", "system", "tables", "til", "trim", "txf",
+                    "type", "uj", "ujf", "ungroup", "union", "upper", "upsert",
+                    "value", "view", "views", "vs", "where", "wj", "wj1", "ww",
+                    "xasc", "xbar", "xcol", "xcols", "xdesc", "xgroup", "xkey",
+                    "xlog", "xprev", "xrank"),
+                    suffix=r"\b"), Name.Builtin,
             ),
             inherit,
         ],
diff --git a/pygments/lexers/qlik.py b/pygments/lexers/qlik.py
index 96ca53c0dd..bb4defd69e 100644
--- a/pygments/lexers/qlik.py
+++ b/pygments/lexers/qlik.py
@@ -11,22 +11,10 @@
 import re
 
 from pygments.lexer import RegexLexer, include, bygroups, words
-from pygments.token import (
-    Comment,
-    Keyword,
-    Name,
-    Number,
-    Operator,
-    Punctuation,
-    String,
-    Text,
-)
-from pygments.lexers._qlik_builtins import (
-    OPERATORS_LIST,
-    STATEMENT_LIST,
-    SCRIPT_FUNCTIONS,
-    CONSTANT_LIST,
-)
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
+    Punctuation, String, Text
+from pygments.lexers._qlik_builtins import OPERATORS_LIST, STATEMENT_LIST, \
+    SCRIPT_FUNCTIONS, CONSTANT_LIST
 
 __all__ = ["QlikLexer"]
 
@@ -93,33 +81,20 @@ class QlikLexer(RegexLexer):
             (r"/\*", Comment.Multiline, "comment"),
             (r"//.*\n", Comment.Single),
             # variable assignment
-            (
-                r"(let|set)(\s+)",
-                bygroups(
-                    Keyword.Declaration,
-                    Text.Whitespace,
-                ),
-                "assignment",
-            ),
+            (r"(let|set)(\s+)", bygroups(Keyword.Declaration, Text.Whitespace),
+             "assignment"),
             # Word operators
-            (
-                words(OPERATORS_LIST["words"], prefix=r"\b", suffix=r"\b"),
-                Operator.Word,
-            ),
+            (words(OPERATORS_LIST["words"], prefix=r"\b", suffix=r"\b"),
+             Operator.Word),
             # Statements
-            (
-                words(
-                    STATEMENT_LIST,
-                    suffix=r"\b",
-                ),
-                Keyword,
-            ),
+            (words(STATEMENT_LIST, suffix=r"\b"), Keyword),
             # Table names
             (r"[a-z]\w*:", Keyword.Declaration),
             # Constants
             (words(CONSTANT_LIST, suffix=r"\b"), Keyword.Constant),
             # Functions
-            (words(SCRIPT_FUNCTIONS, suffix=r"(?=\s*\()"), Name.Builtin, "function"),
+            (words(SCRIPT_FUNCTIONS, suffix=r"(?=\s*\()"), Name.Builtin,
+             "function"),
             # interpolation - e.g. $(variableName)
             include("interp"),
             # Quotes denote a field/file name
diff --git a/pygments/lexers/r.py b/pygments/lexers/r.py
index 539e3802da..02c61d2422 100644
--- a/pygments/lexers/r.py
+++ b/pygments/lexers/r.py
@@ -12,7 +12,7 @@
 
 from pygments.lexer import Lexer, RegexLexer, include, do_insertions
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Generic
+    Number, Punctuation, Generic, Whitespace
 
 __all__ = ['RConsoleLexer', 'SLexer', 'RdLexer']
 
@@ -114,7 +114,7 @@ class SLexer(RegexLexer):
         'statements': [
             include('comments'),
             # whitespaces
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'\'', String, 'string_squote'),
             (r'\"', String, 'string_dquote'),
             include('builtin_symbols'),
diff --git a/pygments/lexers/rdf.py b/pygments/lexers/rdf.py
index ed5420776c..3919a9b1e6 100644
--- a/pygments/lexers/rdf.py
+++ b/pygments/lexers/rdf.py
@@ -11,8 +11,8 @@
 import re
 
 from pygments.lexer import RegexLexer, bygroups, default
-from pygments.token import Keyword, Punctuation, String, Number, Operator, Generic, \
-    Whitespace, Name, Literal, Comment, Text
+from pygments.token import Keyword, Punctuation, String, Number, Operator, \
+    Generic, Whitespace, Name, Literal, Comment, Text
 
 __all__ = ['SparqlLexer', 'TurtleLexer', 'ShExCLexer']
 
diff --git a/pygments/lexers/ride.py b/pygments/lexers/ride.py
index 9d535d80cd..e68c3961aa 100644
--- a/pygments/lexers/ride.py
+++ b/pygments/lexers/ride.py
@@ -9,7 +9,8 @@
 """
 
 from pygments.lexer import RegexLexer, words, include
-from pygments.token import Comment, Keyword, Name, Number, Punctuation, String, Text
+from pygments.token import Comment, Keyword, Name, Number, Punctuation, \
+    String, Text
 
 __all__ = ['RideLexer']
 
diff --git a/pygments/lexers/rita.py b/pygments/lexers/rita.py
index a8e4eca995..ff742e9d64 100644
--- a/pygments/lexers/rita.py
+++ b/pygments/lexers/rita.py
@@ -8,11 +8,9 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
-from pygments.lexer import RegexLexer, include, bygroups, using, this, \
-    inherit, words
-from pygments.token import Comment, Operator, Keyword, Name, Literal, Punctuation, Text, Whitespace
+from pygments.lexer import RegexLexer
+from pygments.token import Comment, Operator, Keyword, Name, Literal, \
+    Punctuation, Whitespace
 
 __all__ = ['RitaLexer']
 
@@ -21,7 +19,7 @@ class RitaLexer(RegexLexer):
     """
     Lexer for RITA.
 
-     .. versionadded:: 2.11
+    .. versionadded:: 2.11
     """
     name = 'Rita'
     url = 'https://github.com/zaibacu/rita-dsl'
diff --git a/pygments/lexers/ruby.py b/pygments/lexers/ruby.py
index 82aac3603e..b71b5352e1 100644
--- a/pygments/lexers/ruby.py
+++ b/pygments/lexers/ruby.py
@@ -11,15 +11,13 @@
 import re
 
 from pygments.lexer import Lexer, RegexLexer, ExtendedRegexLexer, include, \
-    bygroups, default, LexerContext, do_insertions, words
+    bygroups, default, LexerContext, do_insertions, words, line_re
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Error, Generic
+    Number, Punctuation, Error, Generic, Whitespace
 from pygments.util import shebang_matches
 
 __all__ = ['RubyLexer', 'RubyConsoleLexer', 'FancyLexer']
 
-line_re = re.compile('.*?\n')
-
 
 RUBY_OPERATORS = (
     '*', '**', '-', '+', '-@', '+@', '/', '%', '&', '|', '^', '`', '~',
@@ -179,11 +177,11 @@ def intp_string_callback(self, match, ctx):
             # special forms of fancy strings after operators or
             # in method calls with braces
             (r'(?<=[-+/*%=<>&!^|~,(])(\s*)(%([\t ])(?:(?:\\\3|(?!\3).)*)\3)',
-             bygroups(Text, String.Other, None)),
+             bygroups(Whitespace, String.Other, None)),
             # and because of fixed width lookbehinds the whole thing a
             # second time for line startings...
             (r'^(\s*)(%([\t ])(?:(?:\\\3|(?!\3).)*)\3)',
-             bygroups(Text, String.Other, None)),
+             bygroups(Whitespace, String.Other, None)),
             # all regular fancy strings without qsw
             (r'(%([^a-zA-Z0-9\s]))((?:\\\2|(?!\2).)*)(\2)',
              intp_string_callback),
@@ -206,10 +204,10 @@ def intp_string_callback(self, match, ctx):
             # start of function, class and module names
             (r'(module)(\s+)([a-zA-Z_]\w*'
              r'(?:::[a-zA-Z_]\w*)*)',
-             bygroups(Keyword, Text, Name.Namespace)),
-            (r'(def)(\s+)', bygroups(Keyword, Text), 'funcname'),
+             bygroups(Keyword, Whitespace, Name.Namespace)),
+            (r'(def)(\s+)', bygroups(Keyword, Whitespace), 'funcname'),
             (r'def(?=[*%&^`~+-/\[<>=])', Keyword, 'funcname'),
-            (r'(class)(\s+)', bygroups(Keyword, Text), 'classname'),
+            (r'(class)(\s+)', bygroups(Keyword, Whitespace), 'classname'),
             # special methods
             (words((
                 'initialize', 'new', 'loop', 'include', 'extend', 'raise', 'attr_reader',
@@ -283,7 +281,7 @@ def intp_string_callback(self, match, ctx):
             # multiline regex (in method calls or subscripts)
             (r'(?<=\(|,|\[)/', String.Regex, 'multiline-regex'),
             # multiline regex (this time the funny no whitespace rule)
-            (r'(\s+)(/)(?![\s=])', bygroups(Text, String.Regex),
+            (r'(\s+)(/)(?![\s=])', bygroups(Whitespace, String.Regex),
              'multiline-regex'),
             # lex numbers and ignore following regular expressions which
             # are division operators in fact (grrrr. i hate that. any
@@ -294,13 +292,13 @@ def intp_string_callback(self, match, ctx):
             # stupid example:
             #   x>=0?n[x]:""
             (r'(0_?[0-7]+(?:_[0-7]+)*)(\s*)([/?])?',
-             bygroups(Number.Oct, Text, Operator)),
+             bygroups(Number.Oct, Whitespace, Operator)),
             (r'(0x[0-9A-Fa-f]+(?:_[0-9A-Fa-f]+)*)(\s*)([/?])?',
-             bygroups(Number.Hex, Text, Operator)),
+             bygroups(Number.Hex, Whitespace, Operator)),
             (r'(0b[01]+(?:_[01]+)*)(\s*)([/?])?',
-             bygroups(Number.Bin, Text, Operator)),
+             bygroups(Number.Bin, Whitespace, Operator)),
             (r'([\d]+(?:_\d+)*)(\s*)([/?])?',
-             bygroups(Number.Integer, Text, Operator)),
+             bygroups(Number.Integer, Whitespace, Operator)),
             # Names
             (r'@@[a-zA-Z_]\w*', Name.Variable.Class),
             (r'@[a-zA-Z_]\w*', Name.Variable.Instance),
@@ -326,7 +324,7 @@ def intp_string_callback(self, match, ctx):
              r'!~|&&?|\|\||\.{1,3})', Operator),
             (r'[-+/*%=<>&!^|~]=?', Operator),
             (r'[(){};,/?:\\]', Punctuation),
-            (r'\s+', Text)
+            (r'\s+', Whitespace)
         ],
         'funcname': [
             (r'\(', Punctuation, 'defexpr'),
@@ -469,7 +467,7 @@ class FancyLexer(RegexLexer):
             (r'\$(\\\\|\\[^\\]|[^$\\])*\$[egimosx]*', String.Regex, '#pop'),
         ],
         'root': [
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
 
             # balanced delimiters (copied from PerlLexer):
             (r's\{(\\\\|\\[^\\]|[^}\\])*\}\s*', String.Regex, 'balanced-regex'),
@@ -512,13 +510,13 @@ class FancyLexer(RegexLexer):
             # numbers - / checks are necessary to avoid mismarking regexes,
             # see comment in RubyLexer
             (r'(0[oO]?[0-7]+(?:_[0-7]+)*)(\s*)([/?])?',
-             bygroups(Number.Oct, Text, Operator)),
+             bygroups(Number.Oct, Whitespace, Operator)),
             (r'(0[xX][0-9A-Fa-f]+(?:_[0-9A-Fa-f]+)*)(\s*)([/?])?',
-             bygroups(Number.Hex, Text, Operator)),
+             bygroups(Number.Hex, Whitespace, Operator)),
             (r'(0[bB][01]+(?:_[01]+)*)(\s*)([/?])?',
-             bygroups(Number.Bin, Text, Operator)),
+             bygroups(Number.Bin, Whitespace, Operator)),
             (r'([\d]+(?:_\d+)*)(\s*)([/?])?',
-             bygroups(Number.Integer, Text, Operator)),
+             bygroups(Number.Integer, Whitespace, Operator)),
             (r'\d+([eE][+-]?[0-9]+)|\d+\.\d+([eE][+-]?[0-9]+)?', Number.Float),
             (r'\d+', Number.Integer)
         ]
diff --git a/pygments/lexers/savi.py b/pygments/lexers/savi.py
index 280a3e4781..2397fabe20 100644
--- a/pygments/lexers/savi.py
+++ b/pygments/lexers/savi.py
@@ -9,12 +9,12 @@
 """
 
 from pygments.lexer import RegexLexer, bygroups, include
-from pygments.token import \
-  Whitespace, Keyword, Name, String, Number, \
+from pygments.token import Whitespace, Keyword, Name, String, Number, \
   Operator, Punctuation, Comment, Generic, Error
 
 __all__ = ['SaviLexer']
 
+
 # The canonical version of this file can be found in the following repository,
 # where it is kept in sync with any language changes, as well as the other
 # pygments-like lexers that are maintained for use with other tools:
diff --git a/pygments/lexers/scdoc.py b/pygments/lexers/scdoc.py
index cb602db97d..f670d3342e 100644
--- a/pygments/lexers/scdoc.py
+++ b/pygments/lexers/scdoc.py
@@ -10,11 +10,8 @@
 
 import re
 
-from pygments.lexer import RegexLexer, include, bygroups, \
-    using, this
-from pygments.token import Text, Comment, Keyword, String, \
-    Generic
-
+from pygments.lexer import RegexLexer, include, bygroups, using, this
+from pygments.token import Text, Comment, Keyword, String, Generic
 
 __all__ = ['ScdocLexer']
 
@@ -22,7 +19,7 @@
 class ScdocLexer(RegexLexer):
     """
     `scdoc` is a simple man page generator for POSIX systems written in C99.
-    
+
     .. versionadded:: 2.5
     """
     name = 'scdoc'
diff --git a/pygments/lexers/sgf.py b/pygments/lexers/sgf.py
index 1b066b1c03..865d55c2fc 100644
--- a/pygments/lexers/sgf.py
+++ b/pygments/lexers/sgf.py
@@ -9,7 +9,7 @@
 """
 
 from pygments.lexer import RegexLexer, bygroups
-from pygments.token import Name, Literal, String, Text, Punctuation, Whitespace
+from pygments.token import Name, Literal, String, Punctuation, Whitespace
 
 __all__ = ["SmartGameFormatLexer"]
 
diff --git a/pygments/lexers/shell.py b/pygments/lexers/shell.py
index 474fbf66a8..d3fb8a11a6 100644
--- a/pygments/lexers/shell.py
+++ b/pygments/lexers/shell.py
@@ -11,19 +11,16 @@
 import re
 
 from pygments.lexer import Lexer, RegexLexer, do_insertions, bygroups, \
-    include, default, this, using, words
-from pygments.token import Punctuation, \
+    include, default, this, using, words, line_re
+from pygments.token import Punctuation, Whitespace, \
     Text, Comment, Operator, Keyword, Name, String, Number, Generic
 from pygments.util import shebang_matches
 
-
 __all__ = ['BashLexer', 'BashSessionLexer', 'TcshLexer', 'BatchLexer',
            'SlurmBashLexer', 'MSDOSSessionLexer', 'PowerShellLexer',
            'PowerShellSessionLexer', 'TcshSessionLexer', 'FishShellLexer',
            'ExeclineLexer']
 
-line_re = re.compile('.*?\n')
-
 
 class BashLexer(RegexLexer):
     """
@@ -59,7 +56,7 @@ class BashLexer(RegexLexer):
         'basic': [
             (r'\b(if|fi|else|while|in|do|done|for|then|return|function|case|'
              r'select|continue|until|esac|elif)(\s*)\b',
-             bygroups(Keyword, Text)),
+             bygroups(Keyword, Whitespace)),
             (r'\b(alias|bg|bind|break|builtin|caller|cd|command|compgen|'
              r'complete|declare|dirs|disown|echo|enable|eval|exec|exit|'
              r'export|false|fc|fg|getopts|hash|help|history|jobs|kill|let|'
@@ -70,7 +67,7 @@ class BashLexer(RegexLexer):
             (r'\A#!.+\n', Comment.Hashbang),
             (r'#.*\n', Comment.Single),
             (r'\\[\w\W]', String.Escape),
-            (r'(\b\w+)(\s*)(\+?=)', bygroups(Name.Variable, Text, Operator)),
+            (r'(\b\w+)(\s*)(\+?=)', bygroups(Name.Variable, Whitespace, Operator)),
             (r'[\[\]{}()=]', Operator),
             (r'<<<', Operator),  # here-string
             (r'<<-?\s*(\'?)\\?(\w+)[\w\W]+?\2', String),
@@ -84,7 +81,7 @@ class BashLexer(RegexLexer):
             (r';', Punctuation),
             (r'&', Punctuation),
             (r'\|', Punctuation),
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'\d+\b', Number),
             (r'[^=\s\[\]{}()$"\'`\\<&|;]+', Text),
             (r'<', Text),
@@ -157,6 +154,7 @@ class ShellSessionBaseLexer(Lexer):
     .. versionadded:: 2.1
     """
 
+    _bare_continuation = False
     _venv = re.compile(r'^(\([^)]*\))(\s*)')
 
     def get_tokens_unprocessed(self, text):
@@ -175,10 +173,10 @@ def get_tokens_unprocessed(self, text):
                 venv = venv_match.group(1)
                 venv_whitespace = venv_match.group(2)
                 insertions.append((len(curcode),
-                    [(0, Generic.Prompt.VirtualEnv, venv)]))
+                                   [(0, Generic.Prompt.VirtualEnv, venv)]))
                 if venv_whitespace:
                     insertions.append((len(curcode),
-                        [(0, Text, venv_whitespace)]))
+                                       [(0, Text, venv_whitespace)]))
                 line = line[venv_match.end():]
 
             m = self._ps1rgx.match(line)
@@ -196,11 +194,17 @@ def get_tokens_unprocessed(self, text):
             elif backslash_continuation:
                 if line.startswith(self._ps2):
                     insertions.append((len(curcode),
-                                    [(0, Generic.Prompt, line[:len(self._ps2)])]))
+                                       [(0, Generic.Prompt,
+                                         line[:len(self._ps2)])]))
                     curcode += line[len(self._ps2):]
                 else:
                     curcode += line
                 backslash_continuation = curcode.endswith('\\\n')
+            elif self._bare_continuation and line.startswith(self._ps2):
+                insertions.append((len(curcode),
+                                   [(0, Generic.Prompt,
+                                     line[:len(self._ps2)])]))
+                curcode += line[len(self._ps2):]
             else:
                 if insertions:
                     toks = innerlexer.get_tokens_unprocessed(curcode)
@@ -665,7 +669,7 @@ class PowerShellLexer(RegexLexer):
     keywords = (
         'while validateset validaterange validatepattern validatelength '
         'validatecount until trap switch return ref process param parameter in '
-        'if global: function foreach for finally filter end elseif else '
+        'if global: local: function foreach for finally filter end elseif else '
         'dynamicparam do default continue cmdletbinding break begin alias \\? '
         '% #script #private #local #global mandatory parametersetname position '
         'valuefrompipeline valuefrompipelinebypropertyname '
@@ -777,8 +781,9 @@ class PowerShellSessionLexer(ShellSessionBaseLexer):
     mimetypes = []
 
     _innerLexerCls = PowerShellLexer
+    _bare_continuation = True
     _ps1rgx = re.compile(r'^((?:\[[^]]+\]: )?PS[^>]*> ?)(.*\n?)')
-    _ps2 = '>> '
+    _ps2 = '> '
 
 
 class FishShellLexer(RegexLexer):
@@ -819,7 +824,7 @@ class FishShellLexer(RegexLexer):
              Name.Builtin),
             (r'#.*\n', Comment),
             (r'\\[\w\W]', String.Escape),
-            (r'(\b\w+)(\s*)(=)', bygroups(Name.Variable, Text, Operator)),
+            (r'(\b\w+)(\s*)(=)', bygroups(Name.Variable, Whitespace, Operator)),
             (r'[\[\]()=]', Operator),
             (r'<<-?\s*(\'?)\\?(\w+)[\w\W]+?\2', String),
         ],
diff --git a/pygments/lexers/sieve.py b/pygments/lexers/sieve.py
index 7f59651d21..ab43db8ba3 100644
--- a/pygments/lexers/sieve.py
+++ b/pygments/lexers/sieve.py
@@ -18,7 +18,8 @@
 """
 
 from pygments.lexer import RegexLexer, bygroups
-from pygments.token import Comment, Name, Literal, String, Text, Punctuation, Keyword
+from pygments.token import Comment, Name, Literal, String, Text, Punctuation, \
+    Keyword
 
 __all__ = ["SieveLexer"]
 
@@ -26,6 +27,8 @@
 class SieveLexer(RegexLexer):
     """
     Lexer for sieve format.
+
+    .. versionadded:: 2.6
     """
     name = 'Sieve'
     filenames = ['*.siv', '*.sieve']
@@ -39,10 +42,17 @@ class SieveLexer(RegexLexer):
             (r'(?i)require',
              Keyword.Namespace),
             # tags:
-            (r'(?i)(:)(addresses|all|contains|content|create|copy|comparator|count|days|detail|domain|fcc|flags|from|handle|importance|is|localpart|length|lowerfirst|lower|matches|message|mime|options|over|percent|quotewildcard|raw|regex|specialuse|subject|text|under|upperfirst|upper|value)',
+            (r'(?i)(:)(addresses|all|contains|content|create|copy|comparator|'
+             r'count|days|detail|domain|fcc|flags|from|handle|importance|is|'
+             r'localpart|length|lowerfirst|lower|matches|message|mime|options|'
+             r'over|percent|quotewildcard|raw|regex|specialuse|subject|text|'
+             r'under|upperfirst|upper|value)',
              bygroups(Name.Tag, Name.Tag)),
             # tokens:
-            (r'(?i)(address|addflag|allof|anyof|body|discard|elsif|else|envelope|ereject|exists|false|fileinto|if|hasflag|header|keep|notify_method_capability|notify|not|redirect|reject|removeflag|setflag|size|spamtest|stop|string|true|vacation|virustest)',
+            (r'(?i)(address|addflag|allof|anyof|body|discard|elsif|else|envelope|'
+             r'ereject|exists|false|fileinto|if|hasflag|header|keep|'
+             r'notify_method_capability|notify|not|redirect|reject|removeflag|'
+             r'setflag|size|spamtest|stop|string|true|vacation|virustest)',
              Name.Builtin),
             (r'(?i)set',
              Keyword.Declaration),
diff --git a/pygments/lexers/smithy.py b/pygments/lexers/smithy.py
index 08301d5e1a..69b576e49f 100644
--- a/pygments/lexers/smithy.py
+++ b/pygments/lexers/smithy.py
@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, bygroups, words
 from pygments.token import Text, Comment, Keyword, Name, String, \
     Number, Whitespace, Punctuation
@@ -58,8 +56,9 @@ class SmithyLexer(RegexLexer):
             (words(aggregate_shapes,
                    prefix=r'^', suffix=r'(\s+' + identifier + r')'),
                 bygroups(Keyword.Declaration, Name.Class)),
-            (r'^(metadata)(\s+.+)(\s*)(=)',
-                bygroups(Keyword.Declaration, Name.Class, Whitespace, Name.Decorator)),
+            (r'^(metadata)(\s+)((?:\S+)|(?:\"[^"]+\"))(\s*)(=)',
+                bygroups(Keyword.Declaration, Whitespace, Name.Class,
+                         Whitespace, Name.Decorator)),
             (r"(true|false|null)", Keyword.Constant),
             (r"(-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?)", Number),
             (identifier + ":", Name.Label),
diff --git a/pygments/lexers/solidity.py b/pygments/lexers/solidity.py
index 2b406173b6..46a3b9ea74 100644
--- a/pygments/lexers/solidity.py
+++ b/pygments/lexers/solidity.py
@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, bygroups, include, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Whitespace
@@ -61,8 +59,8 @@ class SolidityLexer(RegexLexer):
             (datatype, Keyword.Type),
             include('constants'),
             (r'[a-zA-Z_]\w*', Text),
-            (r'[!<=>+*/-]', Operator),
-            (r'[.;:{}(),\[\]]', Punctuation)
+            (r'[~!%^&*+=|?:<>/-]', Operator),
+            (r'[.;{}(),\[\]]', Punctuation)
         ],
         'comments': [
             (r'//(\n|[\w\W]*?[^\\]\n)', Comment.Single),
diff --git a/pygments/lexers/special.py b/pygments/lexers/special.py
index 216dad4a14..6db68a57bd 100644
--- a/pygments/lexers/special.py
+++ b/pygments/lexers/special.py
@@ -9,9 +9,8 @@
 """
 
 import ast
-import re
 
-from pygments.lexer import Lexer
+from pygments.lexer import Lexer, line_re
 from pygments.token import Token, Error, Text, Generic
 from pygments.util import get_choice_opt
 
@@ -51,8 +50,6 @@ def get_tokens_unprocessed(self, text):
 
 _ttype_cache = {}
 
-line_re = re.compile('.*?\n')
-
 
 class RawTokenLexer(Lexer):
     """
diff --git a/pygments/lexers/spice.py b/pygments/lexers/spice.py
index c8269f318b..53f111b059 100644
--- a/pygments/lexers/spice.py
+++ b/pygments/lexers/spice.py
@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, bygroups, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Whitespace
@@ -40,25 +38,32 @@ class SpiceLexer(RegexLexer):
             (r'/(\\\n)?[*](.|\n)*?[*](\\\n)?/', Comment.Multiline),
             # keywords
             (r'(import|as)\b', Keyword.Namespace),
-            (r'(f|p|type|struct)\b', Keyword.Declaration),
-            (words(('if', 'else', 'for', 'foreach', 'while', 'break', 'continue', 'return', 'assert', 'thread', 'unsafe', 'ext', 'dll'), suffix=r'\b'), Keyword),
-            (words(('const', 'signed', 'unsigned', 'inline', 'public'), suffix=r'\b'), Keyword.Pseudo),
-            (words(('new', 'switch', 'case', 'yield', 'stash', 'pick', 'sync'), suffix=r'\b'), Keyword.Reserved),
+            (r'(f|p|type|struct|enum)\b', Keyword.Declaration),
+            (words(('if', 'else', 'for', 'foreach', 'while', 'break',
+                    'continue', 'return', 'assert', 'thread', 'unsafe', 'ext',
+                    'dll'), suffix=r'\b'), Keyword),
+            (words(('const', 'signed', 'unsigned', 'inline', 'public'),
+                   suffix=r'\b'), Keyword.Pseudo),
+            (words(('new', 'switch', 'case', 'yield', 'stash', 'pick', 'sync',
+                    'class'), suffix=r'\b'), Keyword.Reserved),
             (r'(true|false|nil)\b', Keyword.Constant),
-            (words(('double', 'int', 'short', 'long', 'byte', 'char', 'string', 'bool', 'dyn'), suffix=r'\b'), Keyword.Type),
-            (words(('printf', 'sizeof', 'len', 'tid', 'join'), suffix=r'\b(\()'), bygroups(Name.Builtin, Punctuation)),
+            (words(('double', 'int', 'short', 'long', 'byte', 'char', 'string',
+                    'bool', 'dyn'), suffix=r'\b'), Keyword.Type),
+            (words(('printf', 'sizeof', 'len', 'tid', 'join'), suffix=r'\b(\()'),
+             bygroups(Name.Builtin, Punctuation)),
             # numeric literals
-            (r'([0-9]*[.][0-9]+)', Number.Double),
-            (r'((0[dD])?[0-9]+[sl]?)', Number.Integer),
-            (r'(0[bB][01]+[sl]?)', Number.Bin),
-            (r'(0[oO][0-7]+[sl]?)', Number.Oct),
-            (r'(0[xXhH][0-9a-fA-F]+[sl]?)', Number.Hex),
+            (r'[0-9]*[.][0-9]+', Number.Double),
+            (r'0[bB][01]+[sl]?', Number.Bin),
+            (r'0[oO][0-7]+[sl]?', Number.Oct),
+            (r'0[xXhH][0-9a-fA-F]+[sl]?', Number.Hex),
+            (r'(0[dD])?[0-9]+[sl]?', Number.Integer),
             # string literal
             (r'"(\\\\|\\[^\\]|[^"\\])*"', String),
             # char literal
             (r'\'(\\\\|\\[^\\]|[^\'\\])\'', String.Char),
             # tokens
-            (r'(<<=|>>=|<<|>>|<=|>=|\+=|-=|\*=|/=|\%=|\|=|&=|\^=|&&|\|\||&|\||\+\+|--|\%|\^|\~|==|!=|[.]{3}|[+\-*/&])', Operator),
+            (r'<<=|>>=|<<|>>|<=|>=|\+=|-=|\*=|/=|\%=|\|=|&=|\^=|&&|\|\||&|\||'
+             r'\+\+|--|\%|\^|\~|==|!=|::|[.]{3}|[+\-*/&]', Operator),
             (r'[|<>=!()\[\]{}.,;:\?]', Punctuation),
             # identifiers
             (r'[^\W\d]\w*', Name.Other),
diff --git a/pygments/lexers/srcinfo.py b/pygments/lexers/srcinfo.py
index 644d9b882b..870527a72e 100644
--- a/pygments/lexers/srcinfo.py
+++ b/pygments/lexers/srcinfo.py
@@ -4,7 +4,8 @@
 
     Lexers for .SRCINFO files used by Arch Linux Packages.
 
-    The description of the format can be found in the wiki: https://wiki.archlinux.org/title/.SRCINFO
+    The description of the format can be found in the wiki:
+    https://wiki.archlinux.org/title/.SRCINFO
 
     :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
@@ -19,15 +20,18 @@
     'pkgbase', 'pkgname',
     'pkgver', 'pkgrel', 'epoch',
     'pkgdesc', 'url', 'install', 'changelog',
-    'arch', 'groups', 'license', 'noextract', 'options', 'backup', 'validpgpkeys',
+    'arch', 'groups', 'license', 'noextract', 'options', 'backup',
+    'validpgpkeys',
 )
 
 architecture_dependent_keywords = (
     'source', 'depends', 'checkdepends', 'makedepends', 'optdepends',
     'provides', 'conflicts', 'replaces',
-    'md5sums', 'sha1sums', 'sha224sums', 'sha256sums', 'sha384sums', 'sha512sums'
+    'md5sums', 'sha1sums', 'sha224sums', 'sha256sums', 'sha384sums',
+    'sha512sums',
 )
 
+
 class SrcinfoLexer(RegexLexer):
     """Lexer for .SRCINFO files used by Arch Linux Packages.
 
@@ -43,7 +47,8 @@ class SrcinfoLexer(RegexLexer):
             (r'\s+', Whitespace),
             (r'#.*', Comment.Single),
             (words(keywords), Keyword, 'assignment'),
-            (words(architecture_dependent_keywords, suffix=r'_\w+'), Keyword, 'assignment'),
+            (words(architecture_dependent_keywords, suffix=r'_\w+'),
+             Keyword, 'assignment'),
             (r'\w+', Name.Variable, 'assignment'),
         ],
         'assignment': [
diff --git a/pygments/lexers/supercollider.py b/pygments/lexers/supercollider.py
index efa44b7326..7cf405f58d 100644
--- a/pygments/lexers/supercollider.py
+++ b/pygments/lexers/supercollider.py
@@ -28,7 +28,7 @@ class SuperColliderLexer(RegexLexer):
     url = 'http://supercollider.github.io/'
     aliases = ['supercollider', 'sc']
     filenames = ['*.sc', '*.scd']
-    mimetypes = ['application/supercollider', 'text/supercollider', ]
+    mimetypes = ['application/supercollider', 'text/supercollider']
 
     flags = re.DOTALL | re.MULTILINE
     tokens = {
diff --git a/pygments/lexers/tal.py b/pygments/lexers/tal.py
index 7bc3fcb1f7..391d1da5bb 100644
--- a/pygments/lexers/tal.py
+++ b/pygments/lexers/tal.py
@@ -10,13 +10,13 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, words
-from pygments.token import Comment, Keyword, Name, String, Number, Punctuation, Whitespace, Literal
+from pygments.token import Comment, Keyword, Name, String, Number, \
+    Punctuation, Whitespace, Literal
 
 __all__ = ['TalLexer']
 
+
 class TalLexer(RegexLexer):
     """
     For `Uxntal <https://wiki.xxiivv.com/site/uxntal.html>`_ source code.
@@ -49,7 +49,8 @@ class TalLexer(RegexLexer):
         'root': [
             (r'\s+', Whitespace), # spaces
             (r'(?<!\S)\((?!\S)', Comment.Multiline, 'comment'), # comments
-            (words(instructions, prefix=r'(?<!\S)', suffix=r'2?k?r?(?!\S)'), Keyword.Reserved), # instructions
+            (words(instructions, prefix=r'(?<!\S)', suffix=r'2?k?r?(?!\S)'),
+             Keyword.Reserved), # instructions
             (r'[][{}](?!\S)', Punctuation), # delimiters
             (r'#([0-9a-f]{2}){1,2}(?!\S)', Number.Hex), # integer
             (r'"\S+', String), # raw string
diff --git a/pygments/lexers/tcl.py b/pygments/lexers/tcl.py
index bf9ab7cf94..f29cc2cc16 100644
--- a/pygments/lexers/tcl.py
+++ b/pygments/lexers/tcl.py
@@ -24,21 +24,24 @@ class TclLexer(RegexLexer):
     """
 
     keyword_cmds_re = words((
-        'after', 'apply', 'array', 'break', 'catch', 'continue', 'elseif', 'else', 'error',
-        'eval', 'expr', 'for', 'foreach', 'global', 'if', 'namespace', 'proc', 'rename', 'return',
-        'set', 'switch', 'then', 'trace', 'unset', 'update', 'uplevel', 'upvar', 'variable',
-        'vwait', 'while'), prefix=r'\b', suffix=r'\b')
+        'after', 'apply', 'array', 'break', 'catch', 'continue', 'elseif',
+        'else', 'error', 'eval', 'expr', 'for', 'foreach', 'global', 'if',
+        'namespace', 'proc', 'rename', 'return', 'set', 'switch', 'then',
+        'trace', 'unset', 'update', 'uplevel', 'upvar', 'variable', 'vwait',
+        'while'), prefix=r'\b', suffix=r'\b')
 
     builtin_cmds_re = words((
-        'append', 'bgerror', 'binary', 'cd', 'chan', 'clock', 'close', 'concat', 'dde', 'dict',
-        'encoding', 'eof', 'exec', 'exit', 'fblocked', 'fconfigure', 'fcopy', 'file',
-        'fileevent', 'flush', 'format', 'gets', 'glob', 'history', 'http', 'incr', 'info', 'interp',
-        'join', 'lappend', 'lassign', 'lindex', 'linsert', 'list', 'llength', 'load', 'loadTk',
-        'lrange', 'lrepeat', 'lreplace', 'lreverse', 'lsearch', 'lset', 'lsort', 'mathfunc',
-        'mathop', 'memory', 'msgcat', 'open', 'package', 'pid', 'pkg::create', 'pkg_mkIndex',
-        'platform', 'platform::shell', 'puts', 'pwd', 're_syntax', 'read', 'refchan',
-        'regexp', 'registry', 'regsub', 'scan', 'seek', 'socket', 'source', 'split', 'string',
-        'subst', 'tell', 'time', 'tm', 'unknown', 'unload'), prefix=r'\b', suffix=r'\b')
+        'append', 'bgerror', 'binary', 'cd', 'chan', 'clock', 'close',
+        'concat', 'dde', 'dict', 'encoding', 'eof', 'exec', 'exit', 'fblocked',
+        'fconfigure', 'fcopy', 'file', 'fileevent', 'flush', 'format', 'gets',
+        'glob', 'history', 'http', 'incr', 'info', 'interp', 'join', 'lappend',
+        'lassign', 'lindex', 'linsert', 'list', 'llength', 'load', 'loadTk',
+        'lrange', 'lrepeat', 'lreplace', 'lreverse', 'lsearch', 'lset', 'lsort',
+        'mathfunc', 'mathop', 'memory', 'msgcat', 'open', 'package', 'pid',
+        'pkg::create', 'pkg_mkIndex', 'platform', 'platform::shell', 'puts',
+        'pwd', 're_syntax', 'read', 'refchan', 'regexp', 'registry', 'regsub',
+        'scan', 'seek', 'socket', 'source', 'split', 'string', 'subst', 'tell',
+        'time', 'tm', 'unknown', 'unload'), prefix=r'\b', suffix=r'\b')
 
     name = 'Tcl'
     url = 'https://www.tcl.tk/about/language.html'
diff --git a/pygments/lexers/teal.py b/pygments/lexers/teal.py
index 5676f2f2b8..dfe6ca781c 100644
--- a/pygments/lexers/teal.py
+++ b/pygments/lexers/teal.py
@@ -9,10 +9,12 @@
 """
 
 from pygments.lexer import RegexLexer, bygroups, include, words
-from pygments.token import Comment, Name, Number, String, Text, Keyword
+from pygments.token import Comment, Name, Number, String, Text, Keyword, \
+    Whitespace
 
 __all__ = ['TealLexer']
 
+
 class TealLexer(RegexLexer):
     """
     For the Transaction Execution Approval Language (TEAL)
@@ -48,7 +50,7 @@ class TealLexer(RegexLexer):
         'AssetTotal', 'AssetDecimals', 'AssetDefaultFrozen', 'AssetUnitName',
         'AssetName', 'AssetURL', 'AssetMetadataHash', 'AssetManager',
         'AssetReserve', 'AssetFreeze', 'AssetClawback',
-    }, suffix = r'\b')
+    }, suffix=r'\b')
 
     identifier = r'[^ \t\n]+(?=\/\/)|[^ \t\n]+'
     newline = r'\r?\n'
@@ -68,7 +70,7 @@ class TealLexer(RegexLexer):
             (r'"', String, 'string'),
             (r'(b(?:ase)?(?:32|64) ?)(\(?[a-zA-Z0-9+/=]+\)?)',
                 bygroups(String.Affix, String.Other)),
-            (r'[A-Z2-7]{58}', Number), # address
+            (r'[A-Z2-7]{58}', Number),  # address
             (r'0x[\da-fA-F]+', Number.Hex),
             (r'\d+', Number.Integer),
             (keywords, Keyword),
@@ -81,7 +83,7 @@ class TealLexer(RegexLexer):
             (r'"', String, '#pop'),
         ],
         'whitespace': [
-            (r'[ \t]+', Text),
+            (r'[ \t]+', Whitespace),
             (r'//[^\n]+', Comment.Single),
         ],
     }
diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py
index ecdd6dbdb7..1fcf70856d 100644
--- a/pygments/lexers/templates.py
+++ b/pygments/lexers/templates.py
@@ -532,11 +532,11 @@ class MasonLexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'(?s)(<%doc>)(.*?)(</%doc>)',
              bygroups(Name.Tag, Comment.Multiline, Name.Tag)),
             (r'(?s)(<%(?:def|method))(\s*)(.*?)(>)(.*?)(</%\2\s*>)',
-             bygroups(Name.Tag, Text, Name.Function, Name.Tag,
+             bygroups(Name.Tag, Whitespace, Name.Function, Name.Tag,
                       using(this), Name.Tag)),
             (r'(?s)(<%(\w+)(.*?)(>))(.*?)(</%\2\s*>)',
              bygroups(Name.Tag, None, None, None, using(PerlLexer), Name.Tag)),
diff --git a/pygments/lexers/textedit.py b/pygments/lexers/textedit.py
index 1eb1b2f677..14884bbd34 100644
--- a/pygments/lexers/textedit.py
+++ b/pygments/lexers/textedit.py
@@ -13,7 +13,7 @@
 
 from pygments.lexer import RegexLexer, bygroups, default, include, this, using
 from pygments.lexers.python import PythonLexer
-from pygments.token import Comment, Error, Keyword, Name, Number, Operator, \
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
     Punctuation, String, Text, Whitespace
 
 __all__ = ['AwkLexer', 'SedLexer', 'VimLexer']
diff --git a/pygments/lexers/textfmts.py b/pygments/lexers/textfmts.py
index e67410ac91..b6f635c788 100644
--- a/pygments/lexers/textfmts.py
+++ b/pygments/lexers/textfmts.py
@@ -173,7 +173,7 @@ def content_callback(self, match):
 
     tokens = {
         'root': [
-            (r'(GET|POST|PUT|DELETE|HEAD|OPTIONS|TRACE|PATCH)( +)([^ ]+)( +)'
+            (r'(GET|POST|PUT|DELETE|HEAD|OPTIONS|TRACE|PATCH|CONNECT)( +)([^ ]+)( +)'
              r'(HTTP)(/)(1\.[01]|2(?:\.0)?|3)(\r?\n|\Z)',
              bygroups(Name.Function, Text, Name.Namespace, Text,
                       Keyword.Reserved, Operator, Number, Text),
@@ -195,7 +195,7 @@ def content_callback(self, match):
 
     def analyse_text(text):
         return text.startswith(('GET /', 'POST /', 'PUT /', 'DELETE /', 'HEAD /',
-                                'OPTIONS /', 'TRACE /', 'PATCH /'))
+                                'OPTIONS /', 'TRACE /', 'PATCH /', 'CONNECT '))
 
 
 class TodotxtLexer(RegexLexer):
diff --git a/pygments/lexers/theorem.py b/pygments/lexers/theorem.py
index 4dcf77cb4f..2fa6900848 100644
--- a/pygments/lexers/theorem.py
+++ b/pygments/lexers/theorem.py
@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
 from pygments.lexer import RegexLexer, default, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Whitespace
diff --git a/pygments/lexers/tlb.py b/pygments/lexers/tlb.py
new file mode 100644
index 0000000000..1990ec90d2
--- /dev/null
+++ b/pygments/lexers/tlb.py
@@ -0,0 +1,57 @@
+"""
+    pygments.lexers.tlb
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexers for TL-b.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include, words
+from pygments.token import Operator, Name, \
+    Number, Whitespace, Punctuation, Comment
+
+__all__ = ['TlbLexer']
+
+
+class TlbLexer(RegexLexer):
+    """
+    For TL-b source code.
+    """
+
+    name = 'Tl-b'
+    aliases = ['tlb']
+    filenames = ['*.tlb']
+
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+
+            include('comments'),
+
+            (r'[0-9]+', Number),
+            (words((
+                '+', '-', '*', '=', '?', '~', '.',
+                '^', '==', '<', '>', '<=', '>=', '!='
+            )), Operator),
+            (words(('##', '#<', '#<=')), Name.Tag),
+            (r'#[0-9a-f]*_?', Name.Tag),
+            (r'\$[01]*_?', Name.Tag),
+
+            (r'[a-zA-Z_][0-9a-zA-Z_]*', Name),
+
+            (r'[;():\[\]{}]', Punctuation)
+        ],
+
+        'comments': [
+            (r'//.*', Comment.Singleline),
+            (r'/\*', Comment.Multiline, 'comment'),
+        ],
+        'comment': [
+            (r'[^/*]+', Comment.Multiline),
+            (r'/\*', Comment.Multiline, '#push'),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[*/]', Comment.Multiline),
+        ],
+    }
diff --git a/pygments/lexers/tnt.py b/pygments/lexers/tnt.py
index 582b2a2fdf..e0e205da5c 100644
--- a/pygments/lexers/tnt.py
+++ b/pygments/lexers/tnt.py
@@ -21,7 +21,7 @@ class TNTLexer(Lexer):
     """
     Lexer for Typographic Number Theory, as described in the book
     Gödel, Escher, Bach, by Douglas R. Hofstadter
-    
+
     .. versionadded:: 2.7
     """
 
diff --git a/pygments/lexers/ul4.py b/pygments/lexers/ul4.py
index 2511cee6d7..1530a52a9b 100644
--- a/pygments/lexers/ul4.py
+++ b/pygments/lexers/ul4.py
@@ -18,15 +18,8 @@
 from pygments.lexers.web import HtmlLexer, XmlLexer, CssLexer, JavascriptLexer
 from pygments.lexers.python import PythonLexer
 
-
-__all__ = [
-    'UL4Lexer',
-    'HTMLUL4Lexer',
-    'XMLUL4Lexer',
-    'CSSUL4Lexer',
-    'JavascriptUL4Lexer',
-    'PythonUL4Lexer',
-]
+__all__ = ['UL4Lexer', 'HTMLUL4Lexer', 'XMLUL4Lexer', 'CSSUL4Lexer',
+           'JavascriptUL4Lexer', 'PythonUL4Lexer']
 
 
 class UL4Lexer(RegexLexer):
@@ -48,13 +41,15 @@ class UL4Lexer(RegexLexer):
                 # Template header without name:
                 # ``<?ul4?>``
                 r"(<\?)(\s*)(ul4)(\s*)(\?>)",
-                bygroups(Comment.Preproc, Text.Whitespace, Keyword, Text.Whitespace, Comment.Preproc),
+                bygroups(Comment.Preproc, Text.Whitespace, Keyword,
+                         Text.Whitespace, Comment.Preproc),
             ),
             (
                 # Template header with name (potentially followed by the signature):
                 # ``<?ul4 foo(bar=42)?>``
                 r"(<\?)(\s*)(ul4)(\s*)([a-zA-Z_][a-zA-Z_0-9]*)?",
-                bygroups(Comment.Preproc, Text.Whitespace, Keyword, Text.Whitespace, Name.Function),
+                bygroups(Comment.Preproc, Text.Whitespace, Keyword,
+                         Text.Whitespace, Name.Function),
                 "ul4", # Switch to "expression" mode
             ),
             (
@@ -80,7 +75,8 @@ class UL4Lexer(RegexLexer):
                 # ``<?def?>`` tag for defining local templates
                 # ``<?def foo(bar=42)?>...<?end def?>``
                 r"(<\?)(\s*)(def)(\s*)([a-zA-Z_][a-zA-Z_0-9]*)?",
-                bygroups(Comment.Preproc, Text.Whitespace, Keyword, Text.Whitespace, Name.Function),
+                bygroups(Comment.Preproc, Text.Whitespace, Keyword,
+                         Text.Whitespace, Name.Function),
                 "ul4", # Switch to "expression" mode
             ),
             (
diff --git a/pygments/lexers/varnish.py b/pygments/lexers/varnish.py
index c06d688616..8d577c2530 100644
--- a/pygments/lexers/varnish.py
+++ b/pygments/lexers/varnish.py
@@ -11,7 +11,7 @@
 from pygments.lexer import RegexLexer, include, bygroups, using, this, \
     inherit, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Literal
+    Number, Punctuation, Literal, Whitespace
 
 __all__ = ['VCLLexer', 'VCLSnippetLexer']
 
@@ -144,15 +144,15 @@ def analyse_text(text):
         'whitespace': [
             (r'L?"', String, 'string'),
             (r'\{"', String, 'multistring'),
-            (r'\n', Text),
-            (r'\s+', Text),
+            (r'\n', Whitespace),
+            (r'\s+', Whitespace),
             (r'\\\n', Text),  # line continuation
         ],
         'root': [
             include('whitespace'),
             include('comments'),
             include('statements'),
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
         ],
     }
 
diff --git a/pygments/lexers/webmisc.py b/pygments/lexers/webmisc.py
index 187d641e1f..a048b501ab 100644
--- a/pygments/lexers/webmisc.py
+++ b/pygments/lexers/webmisc.py
@@ -26,7 +26,7 @@
 class DuelLexer(RegexLexer):
     """
     Lexer for Duel Views Engine (formerly JBST) markup with JavaScript code blocks.
-    
+
     .. versionadded:: 1.4
     """
 
@@ -187,7 +187,7 @@ def pushstate_starttag_callback(lexer, match, ctx):
 
     def pushstate_operator_order_callback(lexer, match, ctx):
         yield match.start(), Keyword, match.group(1)
-        yield match.start(), Text, match.group(2)
+        yield match.start(), Whitespace, match.group(2)
         yield match.start(), Punctuation, match.group(3)
         ctx.stack = ['root']
         lexer.xquery_parse_state.append('operator')
@@ -195,7 +195,7 @@ def pushstate_operator_order_callback(lexer, match, ctx):
 
     def pushstate_operator_map_callback(lexer, match, ctx):
         yield match.start(), Keyword, match.group(1)
-        yield match.start(), Text, match.group(2)
+        yield match.start(), Whitespace, match.group(2)
         yield match.start(), Punctuation, match.group(3)
         ctx.stack = ['root']
         lexer.xquery_parse_state.append('operator')
@@ -203,7 +203,7 @@ def pushstate_operator_map_callback(lexer, match, ctx):
 
     def pushstate_operator_root_validate(lexer, match, ctx):
         yield match.start(), Keyword, match.group(1)
-        yield match.start(), Text, match.group(2)
+        yield match.start(), Whitespace, match.group(2)
         yield match.start(), Punctuation, match.group(3)
         ctx.stack = ['root']
         lexer.xquery_parse_state.append('operator')
@@ -211,7 +211,7 @@ def pushstate_operator_root_validate(lexer, match, ctx):
 
     def pushstate_operator_root_validate_withmode(lexer, match, ctx):
         yield match.start(), Keyword, match.group(1)
-        yield match.start(), Text, match.group(2)
+        yield match.start(), Whitespace, match.group(2)
         yield match.start(), Keyword, match.group(3)
         ctx.stack = ['root']
         lexer.xquery_parse_state.append('operator')
@@ -255,7 +255,7 @@ def pushstate_operator_xmlcomment_callback(lexer, match, ctx):
 
     def pushstate_kindtest_callback(lexer, match, ctx):
         yield match.start(), Keyword, match.group(1)
-        yield match.start(), Text, match.group(2)
+        yield match.start(), Whitespace, match.group(2)
         yield match.start(), Punctuation, match.group(3)
         lexer.xquery_parse_state.append('kindtest')
         ctx.stack.append('kindtest')
@@ -263,7 +263,7 @@ def pushstate_kindtest_callback(lexer, match, ctx):
 
     def pushstate_operator_kindtestforpi_callback(lexer, match, ctx):
         yield match.start(), Keyword, match.group(1)
-        yield match.start(), Text, match.group(2)
+        yield match.start(), Whitespace, match.group(2)
         yield match.start(), Punctuation, match.group(3)
         lexer.xquery_parse_state.append('operator')
         ctx.stack.append('kindtestforpi')
@@ -271,7 +271,7 @@ def pushstate_operator_kindtestforpi_callback(lexer, match, ctx):
 
     def pushstate_operator_kindtest_callback(lexer, match, ctx):
         yield match.start(), Keyword, match.group(1)
-        yield match.start(), Text, match.group(2)
+        yield match.start(), Whitespace, match.group(2)
         yield match.start(), Punctuation, match.group(3)
         lexer.xquery_parse_state.append('operator')
         ctx.stack.append('kindtest')
@@ -279,7 +279,7 @@ def pushstate_operator_kindtest_callback(lexer, match, ctx):
 
     def pushstate_occurrenceindicator_kindtest_callback(lexer, match, ctx):
         yield match.start(), Name.Tag, match.group(1)
-        yield match.start(), Text, match.group(2)
+        yield match.start(), Whitespace, match.group(2)
         yield match.start(), Punctuation, match.group(3)
         lexer.xquery_parse_state.append('occurrenceindicator')
         ctx.stack.append('kindtest')
@@ -299,7 +299,7 @@ def pushstate_operator_root_callback(lexer, match, ctx):
 
     def pushstate_operator_root_construct_callback(lexer, match, ctx):
         yield match.start(), Keyword, match.group(1)
-        yield match.start(), Text, match.group(2)
+        yield match.start(), Whitespace, match.group(2)
         yield match.start(), Punctuation, match.group(3)
         lexer.xquery_parse_state.append('operator')
         ctx.stack = ['root']
@@ -317,13 +317,6 @@ def pushstate_operator_attribute_callback(lexer, match, ctx):
         ctx.stack.append('operator')
         ctx.pos = match.end()
 
-    def pushstate_operator_callback(lexer, match, ctx):
-        yield match.start(), Keyword, match.group(1)
-        yield match.start(), Text, match.group(2)
-        yield match.start(), Punctuation, match.group(3)
-        lexer.xquery_parse_state.append('operator')
-        ctx.pos = match.end()
-
     tokens = {
         'comment': [
             # xquery comments
@@ -355,32 +348,36 @@ def pushstate_operator_callback(lexer, match, ctx):
             (r'(::|:|;|\[|//|/|,)',
              punctuation_root_callback),
             (r'(castable|cast)(\s+)(as)\b',
-             bygroups(Keyword, Text, Keyword), 'singletype'),
+             bygroups(Keyword, Whitespace, Keyword), 'singletype'),
             (r'(instance)(\s+)(of)\b',
-             bygroups(Keyword, Text, Keyword), 'itemtype'),
+             bygroups(Keyword, Whitespace, Keyword), 'itemtype'),
             (r'(treat)(\s+)(as)\b',
-             bygroups(Keyword, Text, Keyword), 'itemtype'),
+             bygroups(Keyword, Whitespace, Keyword), 'itemtype'),
             (r'(case)(\s+)(' + stringdouble + ')',
-             bygroups(Keyword, Text, String.Double), 'itemtype'),
+             bygroups(Keyword, Whitespace, String.Double), 'itemtype'),
             (r'(case)(\s+)(' + stringsingle + ')',
-             bygroups(Keyword, Text, String.Single), 'itemtype'),
+             bygroups(Keyword, Whitespace, String.Single), 'itemtype'),
             (r'(case|as)\b', Keyword, 'itemtype'),
             (r'(\))(\s*)(as)',
-             bygroups(Punctuation, Text, Keyword), 'itemtype'),
+             bygroups(Punctuation, Whitespace, Keyword), 'itemtype'),
             (r'\$', Name.Variable, 'varname'),
             (r'(for|let|previous|next)(\s+)(\$)',
-             bygroups(Keyword, Text, Name.Variable), 'varname'),
+             bygroups(Keyword, Whitespace, Name.Variable), 'varname'),
             (r'(for)(\s+)(tumbling|sliding)(\s+)(window)(\s+)(\$)',
-             bygroups(Keyword, Text, Keyword, Text, Keyword, Text, Name.Variable),
+             bygroups(Keyword, Whitespace, Keyword, Whitespace, Keyword,
+                      Whitespace, Name.Variable),
              'varname'),
             # (r'\)|\?|\]', Punctuation, '#push'),
             (r'\)|\?|\]', Punctuation),
-            (r'(empty)(\s+)(greatest|least)', bygroups(Keyword, Text, Keyword)),
+            (r'(empty)(\s+)(greatest|least)',
+             bygroups(Keyword, Whitespace, Keyword)),
             (r'ascending|descending|default', Keyword, '#push'),
-            (r'(allowing)(\s+)(empty)', bygroups(Keyword, Text, Keyword)),
+            (r'(allowing)(\s+)(empty)',
+             bygroups(Keyword, Whitespace, Keyword)),
             (r'external', Keyword),
             (r'(start|when|end)', Keyword, 'root'),
-            (r'(only)(\s+)(end)', bygroups(Keyword, Text, Keyword), 'root'),
+            (r'(only)(\s+)(end)', bygroups(Keyword, Whitespace, Keyword),
+             'root'),
             (r'collation', Keyword, 'uritooperator'),
 
             # eXist specific XQUF
@@ -393,7 +390,7 @@ def pushstate_operator_callback(lexer, match, ctx):
             (stringdouble, String.Double),
             (stringsingle, String.Single),
 
-            (r'(catch)(\s*)', bygroups(Keyword, Text), 'root'),
+            (r'(catch)(\s*)', bygroups(Keyword, Whitespace), 'root'),
         ],
         'uritooperator': [
             (stringdouble, String.Double, '#pop'),
@@ -402,8 +399,10 @@ def pushstate_operator_callback(lexer, match, ctx):
         'namespacedecl': [
             include('whitespace'),
             (r'\(:', Comment, 'comment'),
-            (r'(at)(\s+)('+stringdouble+')', bygroups(Keyword, Text, String.Double)),
-            (r"(at)(\s+)("+stringsingle+')', bygroups(Keyword, Text, String.Single)),
+            (r'(at)(\s+)('+stringdouble+')',
+             bygroups(Keyword, Whitespace, String.Double)),
+            (r"(at)(\s+)("+stringsingle+')',
+             bygroups(Keyword, Whitespace, String.Single)),
             (stringdouble, String.Double),
             (stringsingle, String.Single),
             (r',', Punctuation),
@@ -604,7 +603,7 @@ def pushstate_operator_callback(lexer, match, ctx):
             (r'#\)', Punctuation, 'operator'),
             (r'\t|\r|\n|[\u0020-\uD7FF]|[\uE000-\uFFFD]|[\U00010000-\U0010FFFF]',
              Literal),
-            (r'(\s+)', Text),
+            (r'(\s+)', Whitespace),
         ],
         'occurrenceindicator': [
             include('whitespace'),
@@ -655,35 +654,48 @@ def pushstate_operator_callback(lexer, match, ctx):
 
             # NAMESPACE DECL
             (r'(declare)(\s+)(default)(\s+)(collation)',
-             bygroups(Keyword.Declaration, Text, Keyword.Declaration, Text, Keyword.Declaration)),
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration,
+                      Whitespace, Keyword.Declaration)),
             (r'(module|declare)(\s+)(namespace)',
-             bygroups(Keyword.Declaration, Text, Keyword.Declaration), 'namespacedecl'),
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration),
+             'namespacedecl'),
             (r'(declare)(\s+)(base-uri)',
-             bygroups(Keyword.Declaration, Text, Keyword.Declaration), 'namespacedecl'),
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration),
+             'namespacedecl'),
 
             # NAMESPACE KEYWORD
             (r'(declare)(\s+)(default)(\s+)(element|function)',
-             bygroups(Keyword.Declaration, Text, Keyword.Declaration, Text, Keyword.Declaration),
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration,
+                      Whitespace, Keyword.Declaration),
              'namespacekeyword'),
             (r'(import)(\s+)(schema|module)',
-             bygroups(Keyword.Pseudo, Text, Keyword.Pseudo), 'namespacekeyword'),
+             bygroups(Keyword.Pseudo, Whitespace, Keyword.Pseudo),
+             'namespacekeyword'),
             (r'(declare)(\s+)(copy-namespaces)',
-             bygroups(Keyword.Declaration, Text, Keyword.Declaration), 'namespacekeyword'),
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration),
+             'namespacekeyword'),
 
             # VARNAMEs
             (r'(for|let|some|every)(\s+)(\$)',
-             bygroups(Keyword, Text, Name.Variable), 'varname'),
+             bygroups(Keyword, Whitespace, Name.Variable), 'varname'),
             (r'(for)(\s+)(tumbling|sliding)(\s+)(window)(\s+)(\$)',
-             bygroups(Keyword, Text, Keyword, Text, Keyword, Text, Name.Variable), 'varname'),
+             bygroups(Keyword, Whitespace, Keyword, Whitespace, Keyword,
+                      Whitespace, Name.Variable),
+             'varname'),
             (r'\$', Name.Variable, 'varname'),
             (r'(declare)(\s+)(variable)(\s+)(\$)',
-             bygroups(Keyword.Declaration, Text, Keyword.Declaration, Text, Name.Variable), 'varname'),
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration,
+                      Whitespace, Name.Variable),
+             'varname'),
 
             # ANNOTATED GLOBAL VARIABLES AND FUNCTIONS
-            (r'(declare)(\s+)(\%)', bygroups(Keyword.Declaration, Text, Name.Decorator), 'annotationname'),
+            (r'(declare)(\s+)(\%)', bygroups(Keyword.Declaration, Whitespace,
+                                             Name.Decorator),
+             'annotationname'),
 
             # ITEMTYPE
-            (r'(\))(\s+)(as)', bygroups(Operator, Text, Keyword), 'itemtype'),
+            (r'(\))(\s+)(as)', bygroups(Operator, Whitespace, Keyword),
+             'itemtype'),
 
             (r'(element|attribute|schema-element|schema-attribute|comment|'
              r'text|node|document-node|empty-sequence)(\s+)(\()',
@@ -707,8 +719,9 @@ def pushstate_operator_callback(lexer, match, ctx):
             (r'(validate)(\s+)(lax|strict)',
              pushstate_operator_root_validate_withmode),
             (r'(validate)(\s*)(\{)', pushstate_operator_root_validate),
-            (r'(typeswitch)(\s*)(\()', bygroups(Keyword, Text, Punctuation)),
-            (r'(switch)(\s*)(\()', bygroups(Keyword, Text, Punctuation)),
+            (r'(typeswitch)(\s*)(\()', bygroups(Keyword, Whitespace,
+                                                Punctuation)),
+            (r'(switch)(\s*)(\()', bygroups(Keyword, Whitespace, Punctuation)),
             (r'(element|attribute|namespace)(\s*)(\{)',
              pushstate_operator_root_construct_callback),
 
@@ -716,17 +729,18 @@ def pushstate_operator_callback(lexer, match, ctx):
              pushstate_operator_root_construct_callback),
             # ATTRIBUTE
             (r'(attribute)(\s+)(?=' + qname + r')',
-             bygroups(Keyword, Text), 'attribute_qname'),
+             bygroups(Keyword, Whitespace), 'attribute_qname'),
             # ELEMENT
             (r'(element)(\s+)(?=' + qname + r')',
-             bygroups(Keyword, Text), 'element_qname'),
+             bygroups(Keyword, Whitespace), 'element_qname'),
             # PROCESSING_INSTRUCTION
             (r'(processing-instruction|namespace)(\s+)(' + ncname + r')(\s*)(\{)',
-             bygroups(Keyword, Text, Name.Variable, Text, Punctuation),
+             bygroups(Keyword, Whitespace, Name.Variable, Whitespace,
+                      Punctuation),
              'operator'),
 
             (r'(declare|define)(\s+)(function)',
-             bygroups(Keyword.Declaration, Text, Keyword.Declaration)),
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration)),
 
             (r'(\{|\[)', pushstate_operator_root_callback),
 
@@ -737,17 +751,21 @@ def pushstate_operator_callback(lexer, match, ctx):
              pushstate_operator_map_callback),
 
             (r'(declare)(\s+)(ordering)',
-             bygroups(Keyword.Declaration, Text, Keyword.Declaration), 'declareordering'),
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration),
+             'declareordering'),
 
             (r'(xquery)(\s+)(version)',
-             bygroups(Keyword.Pseudo, Text, Keyword.Pseudo), 'xqueryversion'),
+             bygroups(Keyword.Pseudo, Whitespace, Keyword.Pseudo),
+             'xqueryversion'),
 
-            (r'(\(#)(\s*)', bygroups(Punctuation, Text), 'pragma'),
+            (r'(\(#)(\s*)', bygroups(Punctuation, Whitespace), 'pragma'),
 
             # sometimes return can occur in root state
             (r'return', Keyword),
 
-            (r'(declare)(\s+)(option)', bygroups(Keyword.Declaration, Text, Keyword.Declaration),
+            (r'(declare)(\s+)(option)', bygroups(Keyword.Declaration,
+                                                 Whitespace,
+                                                 Keyword.Declaration),
              'option'),
 
             # URI LITERALS - single and double quoted
@@ -759,18 +777,20 @@ def pushstate_operator_callback(lexer, match, ctx):
             (r'(descendant|following-sibling|following|parent|preceding-sibling'
              r'|preceding|self)(::)', bygroups(Keyword, Punctuation)),
 
-            (r'(if)(\s*)(\()', bygroups(Keyword, Text, Punctuation)),
+            (r'(if)(\s*)(\()', bygroups(Keyword, Whitespace, Punctuation)),
 
             (r'then|else', Keyword),
 
             # eXist specific XQUF
-            (r'(update)(\s*)(insert|delete|replace|value|rename)', bygroups(Keyword, Text, Keyword)),
+            (r'(update)(\s*)(insert|delete|replace|value|rename)',
+             bygroups(Keyword, Whitespace, Keyword)),
             (r'(into|following|preceding|with)', Keyword),
 
             # Marklogic specific
-            (r'(try)(\s*)', bygroups(Keyword, Text), 'root'),
+            (r'(try)(\s*)', bygroups(Keyword, Whitespace), 'root'),
             (r'(catch)(\s*)(\()(\$)',
-             bygroups(Keyword, Text, Punctuation, Name.Variable), 'varname'),
+             bygroups(Keyword, Whitespace, Punctuation, Name.Variable),
+             'varname'),
 
 
             (r'(@'+qname+')', Name.Attribute, 'operator'),
diff --git a/pygments/lexers/wowtoc.py b/pygments/lexers/wowtoc.py
new file mode 100644
index 0000000000..320ae011c4
--- /dev/null
+++ b/pygments/lexers/wowtoc.py
@@ -0,0 +1,120 @@
+"""
+    pygments.lexers.wowtoc
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for World of Warcraft TOC files
+
+    TOC files describe game addons.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, bygroups
+from pygments.token import Comment, Name, Text, Punctuation, String, Keyword
+
+__all__ = ["WoWTocLexer"]
+
+def _create_tag_line_pattern(inner_pattern, ignore_case=False):
+    return ((r"(?i)" if ignore_case else r"")
+        + r"^(##)( *)"  # groups 1, 2
+        + inner_pattern  # group 3
+        + r"( *)(:)( *)(.*?)( *)$")  # groups 4, 5, 6, 7, 8
+
+
+def _create_tag_line_token(inner_pattern, inner_token, ignore_case=False):
+    # this function template-izes the tag line for a specific type of tag, which will
+    # have a different pattern and different token. otherwise, everything about a tag
+    # line is the same
+    return (
+        _create_tag_line_pattern(inner_pattern, ignore_case=ignore_case),
+        bygroups(
+            Keyword.Declaration,
+            Text.Whitespace,
+            inner_token,
+            Text.Whitespace,
+            Punctuation,
+            Text.Whitespace,
+            String,
+            Text.Whitespace,
+        ),
+    )
+
+
+class WoWTocLexer(RegexLexer):
+    """
+    Lexer for World of Warcraft TOC files.
+
+    .. versionadded:: 2.14
+    """
+
+    name = "World of Warcraft TOC"
+    aliases = ["wowtoc"]
+    filenames = ["*.toc"]
+
+    tokens = {
+        "root": [
+            # official localized tags, Notes and Title
+            # (normal part is insensitive, locale part is sensitive)
+            _create_tag_line_token(
+                r"((?:[nN][oO][tT][eE][sS]|[tT][iI][tT][lL][eE])-(?:ptBR|zhCN|"
+                r"enCN|frFR|deDE|itIT|esMX|ptPT|koKR|ruRU|esES|zhTW|enTW|enGB|enUS))",
+                Name.Builtin,
+            ),
+            # other official tags
+            _create_tag_line_token(
+                r"(Interface|Title|Notes|RequiredDeps|Dep[^: ]*|OptionalDeps|"
+                r"LoadOnDemand|LoadWith|LoadManagers|SavedVariablesPerCharacter|"
+                r"SavedVariables|DefaultState|Secure|Author|Version)",
+                Name.Builtin,
+                ignore_case=True,
+            ),
+            # user-defined tags
+            _create_tag_line_token(
+                r"(X-[^: ]*)",
+                Name.Variable,
+                ignore_case=True,
+            ),
+            # non-conforming tags, but still valid
+            _create_tag_line_token(
+                r"([^: ]*)",
+                Name.Other,
+            ),
+
+            # Comments
+            (r"^#.*$", Comment),
+
+            # Addon Files
+            (r"^.+$", Name),
+        ]
+    }
+
+    def analyse_text(text):
+        # at time of writing, this file suffix conflict's with one of Tex's in
+        # markup.py. Tex's anaylse_text() appears to be definitive (binary) and does not
+        # share any likeness to WoW TOCs, which means we wont have to compete with it by
+        # abitrary increments in score.
+
+        result = 0
+
+        # while not required, an almost certain marker of WoW TOC's is the interface tag
+        # if this tag is omitted, players will need to opt-in to loading the addon with
+        # an options change ("Load out of date addons"). the value is also standardized:
+        # `<major><minor><patch>`, with minor and patch being two-digit zero-padded.
+        interface_pattern = _create_tag_line_pattern(r"(Interface)", ignore_case=True)
+        match = re.search(interface_pattern, text)
+        if match and re.match(r"(\d+)(\d{2})(\d{2})", match.group(7)):
+            result += 0.8
+
+        casefolded = text.casefold()
+        # Lua file listing is good marker too, but probably conflicts with many other
+        # lexers
+        if ".lua" in casefolded:
+            result += 0.1
+        # ditto for XML files, but they're less used in WoW TOCs
+        if ".xml" in casefolded:
+            result += 0.05
+
+        return result
diff --git a/pygments/lexers/wren.py b/pygments/lexers/wren.py
new file mode 100644
index 0000000000..f0f3793f88
--- /dev/null
+++ b/pygments/lexers/wren.py
@@ -0,0 +1,99 @@
+"""
+    pygments.lexers.wren
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for Wren.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import include, RegexLexer, words
+from pygments.token import Whitespace, Punctuation, Keyword, Name, Comment, \
+    Operator, Number, String, Error
+
+__all__ = ['WrenLexer']
+
+class WrenLexer(RegexLexer):
+    """
+    For Wren source code, version 0.4.0.
+
+    .. versionadded:: 2.14.0
+    """
+    name = 'Wren'
+    url = 'https://wren.io'
+    aliases = ['wren']
+    filenames = ['*.wren']
+
+    flags = re.MULTILINE | re.DOTALL
+
+    tokens = {
+        'root': [
+            # Whitespace.
+            (r'\s+', Whitespace),
+            (r'[,\\\[\]{}]', Punctuation),
+
+            # Really 'root', not '#push': in 'interpolation',
+            # parentheses inside the interpolation expression are
+            # Punctuation, not String.Interpol.
+            (r'\(', Punctuation, 'root'),
+            (r'\)', Punctuation, '#pop'),
+
+            # Keywords.
+            (words((
+                'as', 'break', 'class', 'construct', 'continue', 'else',
+                'for', 'foreign', 'if', 'import', 'return', 'static', 'super',
+                'this', 'var', 'while'), prefix = r'(?<!\.)',
+                suffix = r'\b'), Keyword),
+
+            (words((
+                'true', 'false', 'null'), prefix = r'(?<!\.)',
+                suffix = r'\b'), Keyword.Constant),
+
+            (words((
+                'in', 'is'), prefix = r'(?<!\.)',
+                suffix = r'\b'), Operator.Word),
+
+            # Comments.
+            (r'/\*', Comment.Multiline, 'comment'), # Multiline, can nest.
+            (r'//.*?$', Comment.Single),            # Single line.
+            (r'#.*?(\(.*?\))?$', Comment.Special),  # Attribute or shebang.
+
+            # Names and operators.
+            (r'[!%&*+\-./:<=>?\\^|~]+', Operator),
+            (r'[a-z][a-zA-Z_0-9]*', Name),
+            (r'[A-Z][a-zA-Z_0-9]*', Name.Class),
+            (r'__[a-zA-Z_0-9]*', Name.Variable.Class),
+            (r'_[a-zA-Z_0-9]*', Name.Variable.Instance),
+
+            # Numbers.
+            (r'0x[0-9a-fA-F]+', Number.Hex),
+            (r'\d+(\.\d+)?([eE][-+]?\d+)?', Number.Float),
+
+            # Strings.
+            (r'""".*?"""', String),   # Raw string
+            (r'"', String, 'string'), # Other string
+        ],
+        'comment': [
+            (r'/\*', Comment.Multiline, '#push'),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'([^*/]|\*(?!/)|/(?!\*))+', Comment.Multiline),
+        ],
+        'string': [
+            (r'"', String, '#pop'),
+            (r'\\[\\%"0abefnrtv]', String.Escape), # Escape.
+            (r'\\x[a-fA-F0-9]{2}', String.Escape), # Byte escape.
+            (r'\\u[a-fA-F0-9]{4}', String.Escape), # Unicode escape.
+            (r'\\U[a-fA-F0-9]{8}', String.Escape), # Long Unicode escape.
+
+            (r'%\(', String.Interpol, 'interpolation'),
+            (r'[^\\"%]+', String), # All remaining characters.
+        ],
+        'interpolation': [
+            # redefine closing paren to be String.Interpol
+            (r'\)', String.Interpol, '#pop'),
+            include('root'),
+        ],
+    }
diff --git a/pygments/lexers/x10.py b/pygments/lexers/x10.py
index 855b8ccb58..3e77c431ae 100644
--- a/pygments/lexers/x10.py
+++ b/pygments/lexers/x10.py
@@ -13,11 +13,12 @@
 
 __all__ = ['X10Lexer']
 
+
 class X10Lexer(RegexLexer):
     """
     For the X10 language.
 
-    .. versionadded:: 0.1
+    .. versionadded:: 2.2
     """
 
     name = 'X10'
diff --git a/pygments/lexers/xorg.py b/pygments/lexers/xorg.py
index 54f131fee5..196ebcfa5a 100644
--- a/pygments/lexers/xorg.py
+++ b/pygments/lexers/xorg.py
@@ -15,7 +15,7 @@
 
 
 class XorgLexer(RegexLexer):
-    """Lexer for xorg.conf file."""
+    """Lexer for xorg.conf files."""
     name = 'Xorg'
     url = 'https://www.x.org/wiki/'
     aliases = ['xorg.conf']
diff --git a/pygments/lexers/yang.py b/pygments/lexers/yang.py
index 0e68cb828f..1df675bc5f 100644
--- a/pygments/lexers/yang.py
+++ b/pygments/lexers/yang.py
@@ -8,12 +8,12 @@
     :license: BSD, see LICENSE for details.
 """
 
-from pygments.lexer import (RegexLexer, bygroups, words)
-from pygments.token import (Text, Token, Name, String, Comment,
-                            Number)
+from pygments.lexer import RegexLexer, bygroups, words
+from pygments.token import Text, Token, Name, String, Comment, Number
 
 __all__ = ['YangLexer']
 
+
 class YangLexer(RegexLexer):
     """
     Lexer for YANG, based on RFC7950.
diff --git a/pygments/lexers/zig.py b/pygments/lexers/zig.py
index 3101154ae5..be897a9dea 100644
--- a/pygments/lexers/zig.py
+++ b/pygments/lexers/zig.py
@@ -17,6 +17,8 @@
 
 class ZigLexer(RegexLexer):
     """
+    Lexer for the Zig language.
+
     grammar: https://ziglang.org/documentation/master/#Grammar
     """
     name = 'Zig'
diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py
index f1405eb82b..3ea2e36e1a 100644
--- a/pygments/sphinxext.py
+++ b/pygments/sphinxext.py
@@ -74,6 +74,8 @@ def run(self):
             out = self.document_formatters()
         elif self.arguments[0] == 'filters':
             out = self.document_filters()
+        elif self.arguments[0] == 'lexers_overview':
+            out = self.document_lexers_overview()
         else:
             raise Exception('invalid argument for "pygmentsdoc" directive')
         node = nodes.compound()
@@ -83,6 +85,66 @@ def run(self):
             self.state.document.settings.record_dependencies.add(fn)
         return node.children
 
+    def document_lexers_overview(self):
+        """Generate a tabular overview of all lexers.
+
+        The columns are the lexer name, the extensions handled by this lexer
+        (or "None"), the aliases and a link to the lexer class."""
+        from pygments.lexers._mapping import LEXERS
+        import pygments.lexers
+        out = []
+
+        table = []
+
+        def format_link(name, url):
+            if url:
+                return f'`{name} <{url}>`_'
+            return name
+
+        for classname, data in sorted(LEXERS.items(), key=lambda x: x[1][1].lower()):
+            lexer_cls = pygments.lexers.find_lexer_class(data[1])
+            extensions = lexer_cls.filenames + lexer_cls.alias_filenames
+
+            table.append({
+                'name': format_link(data[1], lexer_cls.url),
+                'extensions': ', '.join(extensions).replace('*', '\\*').replace('_', '\\') or 'None',
+                'aliases': ', '.join(data[2]),
+                'class': f'{data[0]}.{classname}'
+            })
+
+        column_names = ['name', 'extensions', 'aliases', 'class']
+        column_lengths = [max([len(row[column]) for row in table if row[column]])
+                          for column in column_names]
+
+        def write_row(*columns):
+            """Format a table row"""
+            out = []
+            for l, c in zip(column_lengths, columns):
+                if c:
+                    out.append(c.ljust(l))
+                else:
+                    out.append(' '*l)
+
+            return ' '.join(out)
+
+        def write_seperator():
+            """Write a table separator row"""
+            sep = ['='*c for c in column_lengths]
+            return write_row(*sep)
+
+        out.append(write_seperator())
+        out.append(write_row('Name', 'Extension(s)', 'Short name(s)', 'Lexer class'))
+        out.append(write_seperator())
+        for row in table:
+            out.append(write_row(
+                row['name'],
+                row['extensions'],
+                row['aliases'],
+                f':class:`~{row["class"]}`'))
+        out.append(write_seperator())
+
+        return '\n'.join(out)
+
     def document_lexers(self):
         from pygments.lexers._mapping import LEXERS
         out = []
diff --git a/pygments/styles/dracula.py b/pygments/styles/dracula.py
index e977bb45ad..9c2a7d1487 100644
--- a/pygments/styles/dracula.py
+++ b/pygments/styles/dracula.py
@@ -12,10 +12,8 @@
 """
 
 from pygments.style import Style
-from pygments.token import (
-    Keyword, Name, Comment, String, Error, Literal, Number, Operator, Other,
-    Punctuation, Text, Generic, Whitespace,
-)
+from pygments.token import Keyword, Name, Comment, String, Error, Literal, \
+    Number, Operator, Other, Punctuation, Text, Generic, Whitespace
 
 
 class DraculaStyle(Style):
diff --git a/pygments/styles/gh_dark.py b/pygments/styles/gh_dark.py
index 445a2ded91..4899879d74 100644
--- a/pygments/styles/gh_dark.py
+++ b/pygments/styles/gh_dark.py
@@ -10,8 +10,8 @@
 """
 
 from pygments.style import Style
-from pygments.token import (Keyword, Name, Comment, Error, Number,
-                            Operator, Generic, Text, Literal, String, Token)
+from pygments.token import Keyword, Name, Comment, Error, Number, Operator, \
+    Generic, Text, Literal, String, Token
 
 
 # vars are defined to match the defs in
diff --git a/pygments/styles/nord.py b/pygments/styles/nord.py
index 15b6d5cbb0..10a8a546d2 100644
--- a/pygments/styles/nord.py
+++ b/pygments/styles/nord.py
@@ -10,25 +10,13 @@
 """
 
 from pygments.style import Style
-from pygments.token import (
-    Keyword,
-    Name,
-    Comment,
-    String,
-    Error,
-    Number,
-    Operator,
-    Generic,
-    Whitespace,
-    Punctuation,
-    Text,
-    Token,
-)
+from pygments.token import Keyword, Name, Comment, String, Error, Number, \
+    Operator, Generic, Whitespace, Punctuation, Text, Token
 
 
 class NordStyle(Style):
     """
-    Pygments version of the "nord" theme by Arctic Ice Studio
+    Pygments version of the "nord" theme by Arctic Ice Studio.
     """
 
     line_number_color = "#D8DEE9"
@@ -93,6 +81,7 @@ class NordStyle(Style):
         Text:                       '#d8dee9',
     }
 
+
 class NordDarkerStyle(Style):
     """
     Pygments version of a darker "nord" theme by Arctic Ice Studio
diff --git a/pygments/styles/onedark.py b/pygments/styles/onedark.py
index 91ace5b51c..21a3ac4b5b 100644
--- a/pygments/styles/onedark.py
+++ b/pygments/styles/onedark.py
@@ -12,13 +12,13 @@
 """
 
 from pygments.style import Style
-from pygments.token import (Comment, Generic, Keyword, Name, Number, Operator,
-                            Punctuation, String, Token, Whitespace)
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
+    Punctuation, String, Token
 
 
 class OneDarkStyle(Style):
     """
-    Theme inspired by One Dark Pro for Atom
+    Theme inspired by One Dark Pro for Atom.
 
     .. versionadded:: 2.11
     """
diff --git a/pygments/styles/rainbow_dash.py b/pygments/styles/rainbow_dash.py
index fa0e0ca5a6..e97d1c5c58 100644
--- a/pygments/styles/rainbow_dash.py
+++ b/pygments/styles/rainbow_dash.py
@@ -11,8 +11,8 @@
 """
 
 from pygments.style import Style
-from pygments.token import (Comment, Error, Generic, Name, Number, Operator,
-                            String, Text, Whitespace, Keyword)
+from pygments.token import Comment, Error, Generic, Name, Number, Operator, \
+    String, Text, Whitespace, Keyword
 
 BLUE_LIGHT = '#0080ff'
 BLUE = '#2c5dcd'
diff --git a/pygments/styles/zenburn.py b/pygments/styles/zenburn.py
index 016ce0d4ff..c266564290 100644
--- a/pygments/styles/zenburn.py
+++ b/pygments/styles/zenburn.py
@@ -12,10 +12,8 @@
 """
 
 from pygments.style import Style
-from pygments.token import (
-    Token, Name, Operator, Keyword, Generic, Comment, Number, String, Literal,
-    Punctuation, Error,
-)
+from pygments.token import Token, Name, Operator, Keyword, Generic, Comment, \
+    Number, String, Literal, Punctuation, Error
 
 
 class ZenburnStyle(Style):
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000000..ddbb43c72a
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+  "setuptools >= 40.9.0",
+  "wheel",
+]
+build-backend = "setuptools.build_meta:__legacy__"
diff --git a/requirements.txt b/requirements.txt
index be5330a8b3..05a0b12b7a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,3 @@ pyflakes
 pylint
 tox
 wcag-contrast-ratio
-lxml
diff --git a/scripts/check_repeated_token.py b/scripts/check_repeated_token.py
index 7226098dc8..16362813a3 100755
--- a/scripts/check_repeated_token.py
+++ b/scripts/check_repeated_token.py
@@ -7,7 +7,7 @@
     repeatedly, i.e. for example:
 
     .. code::
-   
+
       'd'           Text
       'a'           Text
       't'           Text
@@ -16,46 +16,27 @@
       'a'           Text
       's'           Text
       'e'           Text
-   
+
     This script has two test modes: Check for tokens repeating more often than
     a given threshold, and exclude anything but single-character tokens.
     Repeated single-character tokens are quite problematic as they result in
-    bloated output and are usually an indication that someone is missing a + or *
-    in the regex. 
+    bloated output and are usually an indication that someone is missing
+    a + or * in the regex.
 
     :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import argparse
-import os
 import sys
 
-
-def unpack_file(path):
-    """Unpack a file into text, token pairs."""
-    from collections import namedtuple
-    pair = namedtuple('TextTokenPair', ['text', 'token'])
-    for line in open(path).readlines():
-        line = line.strip()
-        if line:
-            # Line can start with ' or ", so let's check which one it is
-            # and find the matching one
-            quotation_start = 0
-            quotation_end = line.rfind(line[0])
-            text = line[quotation_start+1:quotation_end]
-            token = line.split()[-1]
-            text = text.replace('\\n', '\n')
-            text = text.replace('\\t', '\t')
-            yield pair(text, token)
+from utility import unpack_output_file, process_output_files
 
 
 def check_file(path, threshold, single_only):
     current_token = ''
     current_token_repeat_count = 1
 
-    is_suspicious = False
-
-    for value, token in unpack_file(path):
+    for value, token, linenumber in unpack_output_file(path):
         if single_only and len(value) > 1:
             token = ''
             current_token_repeat_count = 1
@@ -66,29 +47,19 @@ def check_file(path, threshold, single_only):
             current_token_repeat_count = 1
         else:
             current_token_repeat_count += 1
-        
+
         if current_token_repeat_count > threshold:
-            is_suspicious = True
-            break
+            print(f'{path}:{linenumber}')
+            return False
 
-    if is_suspicious:
-        print(path)
+    return True
 
-    return not is_suspicious
-        
 
 def main(args):
-    errors = 0
-    for dir, _, files in os.walk(args.TEST_ROOT):
-        for file in files:
-            if not file.endswith('.output'):
-                continue
-            
-            path = os.path.join(dir, file)
-            if not check_file(path, args.threshold, args.single):
-                errors += 1
-
-    if errors > 0:
+    def check_file_callback(path):
+        return check_file(path, args.threshold, args.single)
+
+    if process_output_files(args.TEST_ROOT, check_file_callback) > 0:
         return 1
     return 0
 
@@ -96,10 +67,11 @@ def main(args):
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('TEST_ROOT',
-        help='Root directory containing the tests')
+                        help='Root directory containing the tests')
     parser.add_argument('-t', '--threshold', type=int, default=5,
-        help='Warn if a token repeats itself more often then this number.')
+                        help='Warn if a token repeats itself more often then '
+                             'this number.')
     parser.add_argument('-s', '--single', action='store_true', default=False,
-        help='Only look at tokens matching a single character')
+                        help='Only look at tokens matching a single character')
     args = parser.parse_args()
-    sys.exit(main(args))
\ No newline at end of file
+    sys.exit(main(args))
diff --git a/scripts/check_whitespace_token.py b/scripts/check_whitespace_token.py
new file mode 100644
index 0000000000..f5d097038b
--- /dev/null
+++ b/scripts/check_whitespace_token.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+"""
+    Checker for whitespace tokens
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Helper script to find whitespace which is not of token type `Whitespace`
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+import argparse
+import sys
+import re
+
+from utility import unpack_output_file, process_output_files
+
+
+def check_file(path):
+    whitespace_re = re.compile('\s+')
+
+    for value, token, linenumber in unpack_output_file(path):
+        if whitespace_re.fullmatch(value):
+            # We allow " " if it's inside a Literal.String for example
+            if 'Literal' in token:
+                continue
+
+            # If whitespace is part of a comment, we accept that as well,
+            # as comments may be similarly highlighted to literals
+            if 'Comment' in token:
+                continue
+
+            if 'Whitespace' in token:
+                continue
+
+            print(f'{path}:{linenumber}')
+            return False
+
+    return True
+
+
+def main(args):
+    if process_output_files(args.TEST_ROOT, check_file) > 0:
+        return 1
+    return 0
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('TEST_ROOT',
+                        help='Root directory containing the tests')
+    args = parser.parse_args()
+    sys.exit(main(args))
diff --git a/scripts/count_token_references.py b/scripts/count_token_references.py
index e235cc40a8..8e798c2de0 100755
--- a/scripts/count_token_references.py
+++ b/scripts/count_token_references.py
@@ -72,7 +72,10 @@ def fetch_lexer_sources():
     to a list of lines.
     """
     lexer_dir = (pathlib.Path(__file__).parent / "../pygments/lexers").resolve()
-    lexer_sources = {fn: fn.read_text().splitlines(keepends=False) for fn in lexer_dir.glob("*.py")}
+    lexer_sources = {
+        fn: fn.read_text(encoding='utf-8').splitlines(keepends=False)
+        for fn in lexer_dir.glob("*.py")
+    }
     return lexer_sources
 
 
diff --git a/scripts/gen_mapfiles.py b/scripts/gen_mapfiles.py
index 5fd084ad96..a5aed0ca85 100644
--- a/scripts/gen_mapfiles.py
+++ b/scripts/gen_mapfiles.py
@@ -15,7 +15,7 @@
 
 top_src_dir = Path(__file__).parent.parent
 pygments_package = top_src_dir / 'pygments'
-sys.path.insert(0, pygments_package.parent.resolve())
+sys.path.insert(0, str(pygments_package.parent.resolve()))
 
 from pygments.util import docstring_headline
 
diff --git a/scripts/utility.py b/scripts/utility.py
new file mode 100644
index 0000000000..4d59a1b29f
--- /dev/null
+++ b/scripts/utility.py
@@ -0,0 +1,69 @@
+"""
+    Utility functions for test scripts
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import os
+import os.path
+
+
+def unpack_output_file(path):
+    """
+    Unpack an output file into objects contining the line number, the text,
+    and the token name. The output file can be either a ``.output`` file
+    containing a token stream, or a ``.txt`` with input and tokens.
+    """
+    from collections import namedtuple
+    entry = namedtuple('OutputEntry', ['text', 'token', 'linenumber'])
+
+    skip_until_tokens = path.endswith('.txt')
+
+    for linenumber, line in enumerate(open(path).readlines()):
+        line = line.strip()
+        if not line:
+            continue
+
+        if skip_until_tokens:
+            if line != '---tokens---':
+                continue
+            else:
+                skip_until_tokens = False
+                continue
+
+        # Line can start with ' or ", so let's check which one it is
+        # and find the matching one
+        quotation_start = 0
+        quotation_end = line.rfind(line[0])
+        text = line[quotation_start+1:quotation_end]
+        token = line.split()[-1]
+        text = text.replace('\\n', '\n')
+        text = text.replace('\\t', '\t')
+        yield entry(text, token, linenumber + 1)
+
+
+def process_output_files(root_directory, callback):
+    """
+    Process all output (i.e. .output and .txt files for snippets) files
+    in a directory tree using the provided callback.
+    The callback should return ``True`` in case of success, ``False``
+    otherwise.
+
+    The function returns the number of files for which the callback returned
+    ``False``.
+    """
+    errors = 0
+    for dir, _, files in os.walk(root_directory):
+        for file in files:
+            _, ext = os.path.splitext(file)
+
+            if ext not in {'.txt', '.output'}:
+                continue
+
+            path = os.path.join(dir, file)
+            if not callback(path):
+                errors += 1
+
+    return errors
diff --git a/setup.cfg b/setup.cfg
index 5e18c4fd03..21304dc951 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 name = Pygments
 version = attr: pygments.__version__
 url = https://pygments.org/
-license = BSD License
+license = BSD-2-Clause
 author = Georg Brandl
 author_email = georg@python.org
 description = Pygments is a syntax highlighting package written in Python.
@@ -52,7 +52,3 @@ console_scripts =
 [options.extras_require]
 plugins =
     importlib-metadata;python_version<'3.8'
-
-[aliases]
-release = egg_info -Db ''
-upload = upload --sign --identity=36580288
diff --git a/tests/examplefiles/aheui/durexmania.aheui.output b/tests/examplefiles/aheui/durexmania.aheui.output
index 22a4b4c7e3..a85f5eb373 100644
--- a/tests/examplefiles/aheui/durexmania.aheui.output
+++ b/tests/examplefiles/aheui/durexmania.aheui.output
@@ -87,7 +87,7 @@
 '♀'           Comment
 '♡'           Comment
 '먊'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '삶'           Operator
 '은'           Comment
@@ -178,7 +178,7 @@
 '맣'           Operator
 '삶'           Operator
 '몲'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'O'           Comment
 'r'           Comment
@@ -271,7 +271,7 @@
 'm'           Comment
 '/'           Comment
 ')'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'h'           Comment
 't'           Comment
@@ -323,4 +323,4 @@
 '6'           Comment
 'f'           Comment
 '1'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/aheui/fibonacci.tokigun.aheui.output b/tests/examplefiles/aheui/fibonacci.tokigun.aheui.output
index 29bf570fe0..e408e3d949 100644
--- a/tests/examplefiles/aheui/fibonacci.tokigun.aheui.output
+++ b/tests/examplefiles/aheui/fibonacci.tokigun.aheui.output
@@ -5,7 +5,7 @@
 '나'           Operator
 '싼'           Operator
 '순'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '뿌'           Operator
 '멓'           Operator
@@ -14,7 +14,7 @@
 '번'           Operator
 '멍'           Operator
 '뻐'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '쌀'           Operator
 '삭'           Operator
@@ -23,7 +23,7 @@
 '다'           Operator
 '순'           Operator
 '옭'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '어'           Comment
 '어'           Comment
@@ -32,4 +32,4 @@
 '설'           Operator
 '썩'           Operator
 '옭'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/aheui/hello-world.puzzlet.aheui.output b/tests/examplefiles/aheui/hello-world.puzzlet.aheui.output
index b0d57e8c6e..5621279681 100644
--- a/tests/examplefiles/aheui/hello-world.puzzlet.aheui.output
+++ b/tests/examplefiles/aheui/hello-world.puzzlet.aheui.output
@@ -6,7 +6,7 @@
 '밟'           Operator
 '따'           Operator
 '뿌'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '빠'           Operator
 '맣'           Operator
@@ -16,7 +16,7 @@
 '밤'           Operator
 '뚜'           Operator
 '뭏'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '돋'           Operator
 '밬'           Operator
@@ -26,7 +26,7 @@
 '붏'           Operator
 '두'           Operator
 '붇'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '볻'           Operator
 '뫃'           Operator
@@ -36,7 +36,7 @@
 '투'           Operator
 '뭏'           Operator
 '붖'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '뫃'           Operator
 '도'           Operator
@@ -46,7 +46,7 @@
 '뭏'           Operator
 '뭏'           Operator
 '붘'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '뫃'           Operator
 '봌'           Operator
@@ -56,7 +56,7 @@
 '벌'           Operator
 '뿌'           Operator
 '뚜'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '뽑'           Operator
 '뽀'           Operator
@@ -66,7 +66,7 @@
 '벓'           Operator
 '뻐'           Operator
 '뚠'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '뽀'           Operator
 '덩'           Operator
@@ -76,9 +76,9 @@
 '덕'           Operator
 '더'           Operator
 '벅'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'h'           Comment
 't'           Comment
@@ -163,4 +163,4 @@
 'e'           Comment
 'u'           Comment
 'i'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/ahk/demo.ahk.output b/tests/examplefiles/ahk/demo.ahk.output
index 6fd1926fa2..8248d21708 100644
--- a/tests/examplefiles/ahk/demo.ahk.output
+++ b/tests/examplefiles/ahk/demo.ahk.output
@@ -1,44 +1,8 @@
 '/*'          Comment.Multiline
-'\n'          Comment.Multiline
-
-'m'           Comment.Multiline
-'u'           Comment.Multiline
-'l'           Comment.Multiline
-'t'           Comment.Multiline
-'i'           Comment.Multiline
-'l'           Comment.Multiline
-'i'           Comment.Multiline
-'n'           Comment.Multiline
-'e'           Comment.Multiline
-' '           Comment.Multiline
-'c'           Comment.Multiline
-'o'           Comment.Multiline
-'m'           Comment.Multiline
-'m'           Comment.Multiline
-'e'           Comment.Multiline
-'n'           Comment.Multiline
-'t'           Comment.Multiline
-'\n'          Comment.Multiline
-
-'m'           Comment.Multiline
-'s'           Comment.Multiline
-'g'           Comment.Multiline
-'b'           Comment.Multiline
-'o'           Comment.Multiline
-'x'           Comment.Multiline
-'('           Comment.Multiline
-'c'           Comment.Multiline
-'o'           Comment.Multiline
-'m'           Comment.Multiline
-'m'           Comment.Multiline
-'e'           Comment.Multiline
-'n'           Comment.Multiline
-'t'           Comment.Multiline
-')'           Comment.Multiline
-'\n'          Comment.Multiline
+'\nmultiline comment\nmsgbox(comment)\n' Comment.Multiline
 
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'send'        Name.Builtin
 ','           Punctuation
@@ -47,7 +11,7 @@
 '['           Punctuation
 'pgdn'        Name
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 ' '           Text
@@ -66,7 +30,7 @@
 '"'           Literal.String
 'world!'      Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 ' '           Text
@@ -79,7 +43,7 @@
 '""'          Literal.String.Escape
 '! '          Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 ' '           Text
@@ -94,11 +58,11 @@
 '!'           Operator
 ' '           Text
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '; single line comment1' Comment.Single
 '\n;;;  single line comment2' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -108,7 +72,7 @@
 ')'           Punctuation
 ' '           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -118,7 +82,7 @@
 ' '           Text
 '^'           Operator
 'a'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'mylabel:'    Name.Label
 'send'        Name
@@ -129,7 +93,7 @@
 'space'       Name
 '}'           Punctuation
 '  ;; set mark' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'e::'         Name.Label
 'send'        Name
@@ -137,10 +101,10 @@
 ' '           Text
 '^'           Operator
 'e'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'n::'         Name.Label
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'send'        Name.Builtin
@@ -148,11 +112,11 @@
 ' '           Text
 '^'           Operator
 'n'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'return'      Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '!'           Operator
 'i'           Name
@@ -163,7 +127,7 @@
 ' '           Text
 ' '           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'viper'       Name
 '('           Punctuation
@@ -172,7 +136,7 @@
 '"'           Literal.String
 ')'           Punctuation
 '   ; stdlib' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'x'           Name
 ' '           Text
@@ -184,10 +148,10 @@
 ' '           Literal.String
 '"'           Literal.String
 '  ; escaped quote' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Return'      Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#If'         Name
 ' '           Text
@@ -198,7 +162,7 @@
 '"'           Literal.String
 ' '           Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'indexdir'    Name
 ' '           Text
@@ -207,7 +171,7 @@
 '%A_ScriptDir%' Name.Variable
 '\\'          Text
 '%dir%'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'FileCreateDir' Name.Builtin
 ','           Punctuation
@@ -215,7 +179,7 @@
 '%'           Operator
 ' '           Text
 'indexdir'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fileindex'   Name
 ' '           Text
@@ -224,7 +188,7 @@
 '%indexdir%'  Name.Variable
 '\\'          Text
 '_files'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'FileSelectFile' Name.Builtin
 ','           Punctuation
@@ -295,7 +259,7 @@
 'dll'         Name
 ')'           Punctuation
 '\n\n; viper' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\n'        Text
 
@@ -304,11 +268,11 @@
 '('           Punctuation
 ')'           Punctuation
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#If'         Name
 '\n\n;; keybindings' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#If'         Name
 ' '           Text
@@ -327,25 +291,25 @@
 'ahk_class Emacs' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 'p::'         Name.Label
-'\n'          Text
+'\n'          Text.Whitespace
 
 'k::'         Name.Label
-'\n'          Text
+'\n'          Text.Whitespace
 
 'send'        Name.Builtin
 ','           Punctuation
 ' '           Text
 '^'           Operator
 'p'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'return'      Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 ','           Punctuation
 ':'           Operator
@@ -357,7 +321,7 @@
 '!'           Operator
 ','           Punctuation
 '  ;; beginning of page' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.'           Operator
 ':'           Operator
@@ -369,7 +333,7 @@
 '!'           Operator
 '.'           Operator
 '  ;; end of page' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '['           Punctuation
 ':'           Operator
@@ -379,7 +343,7 @@
 ' '           Text
 '!'           Operator
 'a'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 ']'           Punctuation
 ':'           Operator
@@ -391,14 +355,14 @@
 'e'           Name
 ' '           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'd::'         Name.Label
 ' '           Text
 '^'           Operator
 'k'           Name
 '  ;; kill line' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'x::'         Name.Label
 ' '           Text
@@ -406,7 +370,7 @@
 ' '           Text
 '^'           Operator
 'd'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\::'        Name.Label
 ' '           Text
@@ -414,29 +378,29 @@
 '!'           Operator
 'k'           Name
 '  ;; kill next word or sexp' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\n'        Text
 
 '#IfWinActive' Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#Persistent' Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  \n'        Text
 
 'F2::'        Name.Label
 '     ;; hotkey' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'start:'      Name.Label
 '   ;; label' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'start2:'     Name.Label
 '   ; label'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -458,7 +422,7 @@
 ' '           Text
 ' '           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -481,7 +445,7 @@
 ' '           Text
 ' '           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'msgbox'      Name.Builtin
@@ -502,7 +466,7 @@
 ' '           Text
 ' '           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -525,7 +489,7 @@
 ' '           Text
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'msgbox'      Name.Builtin
@@ -542,12 +506,12 @@
 ' '           Text
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'ListVars'    Name.Builtin
 '  ; command' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'msgbox'      Name.Builtin
@@ -555,19 +519,19 @@
 '%'           Operator
 ' '           Text
 'ppm'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'return'      Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -575,12 +539,12 @@
 '('           Punctuation
 'file'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'fileread'    Name.Builtin
@@ -592,37 +556,37 @@
 '%'           Operator
 ' '           Text
 'file'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 'return'      Name.Builtin
 ' '           Text
 'ppm'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 '::hotstring::' Name.Label
-'\n'          Text
+'\n'          Text.Whitespace
 
 ':'           Operator
 ':'           Operator
 'hot3'        Name
 ':'           Operator
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ppm_width'   Name
 '('           Punctuation
 'ppm'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 'regexmatch'  Name.Function
@@ -637,25 +601,25 @@
 ' '           Text
 'dim'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 'return'      Name.Builtin
 ' '           Text
 'dim1'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ppm_height'  Name
 '('           Punctuation
 'ppm'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 'regexmatch'  Name.Function
@@ -670,28 +634,28 @@
 ' '           Text
 'dim'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'return'      Name.Builtin
 ' '           Text
 'dim2'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ppm_colors'  Name
 '('           Punctuation
 'ppm'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'regexmatch'  Name.Function
 '('           Punctuation
@@ -706,26 +670,26 @@
 'colors'      Name
 ')'           Punctuation
 '  ; \\R stands for any' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'return'      Name.Builtin
 ' '           Text
 'colors1'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ppm_data'    Name
 '('           Punctuation
 'ppm'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pos'         Name
 ' '           Text
@@ -745,7 +709,7 @@
 'colors'      Name
 ')'           Punctuation
 '  ; \\R stands for any newline' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'stringtrimleft' Name.Builtin
 ','           Punctuation
@@ -764,24 +728,24 @@
 '('           Punctuation
 'colors1'     Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'return'      Name.Builtin
 ' '           Text
 'data'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ppm_header'  Name
 '('           Punctuation
 'ppm'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pos'         Name
 ' '           Text
@@ -801,7 +765,7 @@
 'colors'      Name
 ')'           Punctuation
 '  ; \\R stands for any newline' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'stringleft'  Name.Builtin
 ','           Punctuation
@@ -820,17 +784,17 @@
 '('           Punctuation
 'colors1'     Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'return'      Name.Builtin
 ' '           Text
 'header'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ppm_fill'    Name
 '('           Punctuation
@@ -847,10 +811,10 @@
 ' '           Text
 'b'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -863,7 +827,7 @@
 'ppm'         Name
 ')'           Punctuation
 '\t'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -875,7 +839,7 @@
 '('           Punctuation
 'ppm'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -887,7 +851,7 @@
 '('           Punctuation
 'ppm'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -900,7 +864,7 @@
 'header'      Name
 ')'           Punctuation
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -918,7 +882,7 @@
 ' '           Text
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'loop'        Name.Builtin
@@ -933,17 +897,17 @@
 ' '           Text
 'height'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'if '         Name.Builtin
 'r'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -973,12 +937,12 @@
 'uchar'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 'if '         Name.Builtin
 'g'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1012,12 +976,12 @@
 'uchar'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 'if '         Name.Builtin
 'b'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1051,10 +1015,10 @@
 'uchar'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'VarCopy'     Name
 '('           Punctuation
@@ -1076,14 +1040,14 @@
 ' '           Text
 'height'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ppm_new'     Name
 '('           Punctuation
@@ -1095,10 +1059,10 @@
 ' '           Text
 'colors'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1114,7 +1078,7 @@
 '`n'          Literal.String.Escape
 '%colors%'    Name.Variable
 '`n'          Literal.String.Escape
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1126,7 +1090,7 @@
 '('           Punctuation
 'header'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1148,7 +1112,7 @@
 ' '           Text
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1166,7 +1130,7 @@
 ' '           Text
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1182,7 +1146,7 @@
 ' '           Text
 'headerLength' Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1206,24 +1170,24 @@
 ' '           Text
 'height'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'return'      Name.Builtin
 ' '           Text
 'ppm'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'heredoc'     Name
 ' '           Text
 '='           Operator
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '('           Generic
 '\n'          Generic
@@ -1282,7 +1246,7 @@
 
 ')'           Generic
 '\n\n; Example: Simple image viewer:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -1291,7 +1255,7 @@
 ' '           Text
 '+'           Operator
 'Resize'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Gui'         Name.Builtin
 ','           Punctuation
@@ -1311,7 +1275,7 @@
 'New'         Name
 ' '           Text
 'Image'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Gui'         Name.Builtin
 ','           Punctuation
@@ -1341,7 +1305,7 @@
 'actual'      Name
 ' '           Text
 'size'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Gui'         Name.Builtin
 ','           Punctuation
@@ -1369,7 +1333,7 @@
 'fit'         Name
 ' '           Text
 'screen'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Gui'         Name.Builtin
 ','           Punctuation
@@ -1383,21 +1347,21 @@
 'xm'          Name
 ' '           Text
 'vPic'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Gui'         Name.Builtin
 ','           Punctuation
 ' '           Text
 'Show'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'return'      Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 'ButtonLoadNewImage:' Name.Label
-'\n'          Text
+'\n'          Text.Whitespace
 
 'FileSelectFile' Name.Builtin
 ','           Punctuation
@@ -1467,17 +1431,17 @@
 '.'           Operator
 'dll'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if '         Name.Builtin
 'file'        Name
 ' '           Text
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'return'      Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Gui'         Name.Builtin
 ','           Punctuation
@@ -1487,7 +1451,7 @@
 ' '           Text
 'NoHide'      Name
 ' ; Save the values of the radio buttons.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if '         Name.Builtin
 'Radio'       Name
@@ -1496,10 +1460,10 @@
 ' '           Text
 '1'           Literal.Number.Integer
 '  ; Display image at its actual size.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1510,7 +1474,7 @@
 '='           Operator
 ' '           Text
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1521,17 +1485,17 @@
 '='           Operator
 ' '           Text
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else'        Name.Builtin
 ' ; Second radio is selected: Resize the image to fit the screen.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1547,7 +1511,7 @@
 ' '           Text
 '28'          Literal.Number.Integer
 '  ; Minus 28 to allow room for borders and margins inside.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -1560,10 +1524,10 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 '  ; "Keep aspect ratio" seems best.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GuiControl'  Name.Builtin
 ','           Punctuation
@@ -1582,7 +1546,7 @@
 ' '           Text
 '%file%'      Name.Variable
 '  ; Load the image.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Gui'         Name.Builtin
 ','           Punctuation
@@ -1599,20 +1563,20 @@
 ' '           Text
 '%file%'      Name.Variable
 '  ; Resize the window to match the picture size.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'return'      Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 'GuiClose:'   Name.Label
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ExitApp'     Name.Builtin
 '\n; Example: Simple text editor with menu bar.' Comment.Single
 '\n\n; Create the sub-menus for the menu bar:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Menu'        Name.Builtin
 ','           Punctuation
@@ -1628,4 +1592,4 @@
 ','           Punctuation
 ' '           Text
 'FileNew'     Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/alloy/example.als b/tests/examplefiles/alloy/example.als
index 3a5ab82bf8..c1a6d27e26 100644
--- a/tests/examplefiles/alloy/example.als
+++ b/tests/examplefiles/alloy/example.als
@@ -32,8 +32,8 @@ module examples/systems/views
  *
  * As a terminological convention, when there are two
  * complementary view relationships, we will give them types
- * t and t'. For example, KeySetView propagates from map to
- * set, and KeySetView' propagates from set to map.
+ * t and t". For example, KeySetView propagates from map to
+ * set, and KeySetView" propagates from set to map.
  *
  * author: Daniel Jackson
  */
@@ -76,12 +76,12 @@ sig SetRef extends Ref {}
 fact {State.obj[SetRef] in Set}
 
 abstract sig ViewType {}
-one sig KeySetView, KeySetView', IteratorView extends ViewType {}
+one sig KeySetView, KeySetView", IteratorView extends ViewType {}
 fact ViewTypes {
   State.views[KeySetView] in MapRef -> SetRef
-  State.views[KeySetView'] in SetRef -> MapRef
+  State.views[KeySetView"] in SetRef -> MapRef
   State.views[IteratorView] in IteratorRef -> SetRef
-  all s: State | s.views[KeySetView] = ~(s.views[KeySetView'])
+  all s: State | s.views[KeySetView] = ~(s.views[KeySetView"])
   }
 
 /**
@@ -107,20 +107,20 @@ pred allocates [pre, post: State, rs: set Ref] {
   }
 
 /** 
- * models frame condition that limits change to view object from v to v' when backing object changes to b'
+ * models frame condition that limits change to view object from v to v" when backing object changes to b"
  */
-pred viewFrame [t: ViewType, v, v', b': Object] {
-  t in KeySetView => v'.elts = dom [b'.map]
-  t in KeySetView' => b'.elts = dom [v'.map]
-  t in KeySetView' => (b'.elts) <: (v.map) = (b'.elts) <: (v'.map)
-  t in IteratorView => v'.elts = b'.left + b'.done
+pred viewFrame [t: ViewType, v, v", b": Object] {
+  t in KeySetView => v".elts = dom [b".map]
+  t in KeySetView" => b".elts = dom [v".map]
+  t in KeySetView" => (b".elts) <: (v.map) = (b".elts) <: (v".map)
+  t in IteratorView => v".elts = b".left + b".done
   }
 
 pred MapRef.keySet [pre, post: State, setRefs: SetRef] {
   post.obj[setRefs].elts = dom [pre.obj[this].map]
   modifies [pre, post, none]
   allocates [pre, post, setRefs]
-  post.views = pre.views + KeySetView->this->setRefs + KeySetView'->setRefs->this
+  post.views = pre.views + KeySetView->this->setRefs + KeySetView"->setRefs->this
   }
 
 pred MapRef.put [pre, post: State, k, v: Ref] {
@@ -141,10 +141,10 @@ pred SetRef.iterator [pre, post: State, iterRef: IteratorRef] {
   }
 
 pred IteratorRef.remove [pre, post: State] {
-  let i = pre.obj[this], i' = post.obj[this] {
-    i'.left = i.left
-    i'.done = i.done - i.lastRef
-    no i'.lastRef
+  let i = pre.obj[this], i" = post.obj[this] {
+    i".left = i.left
+    i".done = i.done - i.lastRef
+    no i".lastRef
     }
   modifies [pre,post,this]
   allocates [pre, post, none]
@@ -152,11 +152,11 @@ pred IteratorRef.remove [pre, post: State] {
   }
 
 pred IteratorRef.next [pre, post: State, ref: Ref] {
-  let i = pre.obj[this], i' = post.obj[this] {
+  let i = pre.obj[this], i" = post.obj[this] {
     ref in i.left
-    i'.left = i.left - ref
-    i'.done = i.done + ref
-    i'.lastRef = ref
+    i".left = i.left - ref
+    i".done = i.done + ref
+    i".lastRef = ref
     }
   modifies [pre, post, this]
   allocates [pre, post, none]
diff --git a/tests/examplefiles/alloy/example.als.output b/tests/examplefiles/alloy/example.als.output
index fc7d42b30f..bda535e208 100644
--- a/tests/examplefiles/alloy/example.als.output
+++ b/tests/examplefiles/alloy/example.als.output
@@ -9,7 +9,7 @@
 
 '\n'          Text.Whitespace
 
-"/*\n * Model of views in object-oriented programming.\n *\n * Two object references, called the view and the backing,\n * are related by a view mechanism when changes to the\n * backing are automatically propagated to the view. Note\n * that the state of a view need not be a projection of the\n * state of the backing; the keySet method of Map, for\n * example, produces two view relationships, and for the\n * one in which the map is modified by changes to the key\n * set, the value of the new map cannot be determined from\n * the key set. Note that in the iterator view mechanism,\n * the iterator is by this definition the backing object,\n * since changes are propagated from iterator to collection\n * and not vice versa. Oddly, a reference may be a view of\n * more than one backing: there can be two iterators on the\n * same collection, eg. A reference cannot be a view under\n * more than one view type.\n *\n * A reference is made dirty when it is a backing for a view\n * with which it is no longer related by the view invariant.\n * This usually happens when a view is modified, either\n * directly or via another backing. For example, changing a\n * collection directly when it has an iterator invalidates\n * it, as does changing the collection through one iterator\n * when there are others.\n *\n * More work is needed if we want to model more closely the\n * failure of an iterator when its collection is invalidated.\n *\n * As a terminological convention, when there are two\n * complementary view relationships, we will give them types\n * t and t'. For example, KeySetView propagates from map to\n * set, and KeySetView' propagates from set to map.\n *\n * author: Daniel Jackson\n */" Comment.Multiline
+'/*\n * Model of views in object-oriented programming.\n *\n * Two object references, called the view and the backing,\n * are related by a view mechanism when changes to the\n * backing are automatically propagated to the view. Note\n * that the state of a view need not be a projection of the\n * state of the backing; the keySet method of Map, for\n * example, produces two view relationships, and for the\n * one in which the map is modified by changes to the key\n * set, the value of the new map cannot be determined from\n * the key set. Note that in the iterator view mechanism,\n * the iterator is by this definition the backing object,\n * since changes are propagated from iterator to collection\n * and not vice versa. Oddly, a reference may be a view of\n * more than one backing: there can be two iterators on the\n * same collection, eg. A reference cannot be a view under\n * more than one view type.\n *\n * A reference is made dirty when it is a backing for a view\n * with which it is no longer related by the view invariant.\n * This usually happens when a view is modified, either\n * directly or via another backing. For example, changing a\n * collection directly when it has an iterator invalidates\n * it, as does changing the collection through one iterator\n * when there are others.\n *\n * More work is needed if we want to model more closely the\n * failure of an iterator when its collection is invalidated.\n *\n * As a terminological convention, when there are two\n * complementary view relationships, we will give them types\n * t and t". For example, KeySetView propagates from map to\n * set, and KeySetView" propagates from set to map.\n *\n * author: Daniel Jackson\n */' Comment.Multiline
 '\n'          Text.Whitespace
 
 '\n'          Text.Whitespace
@@ -407,7 +407,7 @@
 'KeySetView'  Name
 ','           Punctuation
 ' '           Text.Whitespace
-"KeySetView'" Name
+'KeySetView"' Name
 ','           Punctuation
 ' '           Text.Whitespace
 'IteratorView' Name
@@ -449,7 +449,7 @@
 '.'           Operator
 'views'       Name
 '['           Operator
-"KeySetView'" Name
+'KeySetView"' Name
 ']'           Operator
 ' '           Text.Whitespace
 'in'          Operator.Word
@@ -503,7 +503,7 @@
 '.'           Operator
 'views'       Name
 '['           Operator
-"KeySetView'" Name
+'KeySetView"' Name
 ']'           Operator
 ')'           Operator
 '\n'          Text.Whitespace
@@ -837,7 +837,7 @@
 
 '\n'          Text.Whitespace
 
-"/** \n * models frame condition that limits change to view object from v to v' when backing object changes to b'\n */" Comment.Multiline
+'/** \n * models frame condition that limits change to view object from v to v" when backing object changes to b"\n */' Comment.Multiline
 '\n'          Text.Whitespace
 
 'pred'        Keyword
@@ -854,10 +854,10 @@
 'v'           Name
 ','           Punctuation
 ' '           Text.Whitespace
-"v'"          Name
+'v"'          Name
 ','           Punctuation
 ' '           Text.Whitespace
-"b'"          Name
+'b"'          Name
 ':'           Punctuation
 ' '           Text.Whitespace
 'Object'      Name
@@ -876,7 +876,7 @@
 '='           Operator
 '>'           Operator
 ' '           Text.Whitespace
-"v'"          Name
+'v"'          Name
 '.'           Operator
 'elts'        Name
 ' '           Text.Whitespace
@@ -885,7 +885,7 @@
 'dom'         Name
 ' '           Text.Whitespace
 '['           Operator
-"b'"          Name
+'b"'          Name
 '.'           Operator
 'map'         Name
 ']'           Operator
@@ -896,12 +896,12 @@
 ' '           Text.Whitespace
 'in'          Operator.Word
 ' '           Text.Whitespace
-"KeySetView'" Name
+'KeySetView"' Name
 ' '           Text.Whitespace
 '='           Operator
 '>'           Operator
 ' '           Text.Whitespace
-"b'"          Name
+'b"'          Name
 '.'           Operator
 'elts'        Name
 ' '           Text.Whitespace
@@ -910,7 +910,7 @@
 'dom'         Name
 ' '           Text.Whitespace
 '['           Operator
-"v'"          Name
+'v"'          Name
 '.'           Operator
 'map'         Name
 ']'           Operator
@@ -921,13 +921,13 @@
 ' '           Text.Whitespace
 'in'          Operator.Word
 ' '           Text.Whitespace
-"KeySetView'" Name
+'KeySetView"' Name
 ' '           Text.Whitespace
 '='           Operator
 '>'           Operator
 ' '           Text.Whitespace
 '('           Operator
-"b'"          Name
+'b"'          Name
 '.'           Operator
 'elts'        Name
 ')'           Operator
@@ -944,7 +944,7 @@
 '='           Operator
 ' '           Text.Whitespace
 '('           Operator
-"b'"          Name
+'b"'          Name
 '.'           Operator
 'elts'        Name
 ')'           Operator
@@ -953,7 +953,7 @@
 ':'           Punctuation
 ' '           Text.Whitespace
 '('           Operator
-"v'"          Name
+'v"'          Name
 '.'           Operator
 'map'         Name
 ')'           Operator
@@ -969,19 +969,19 @@
 '='           Operator
 '>'           Operator
 ' '           Text.Whitespace
-"v'"          Name
+'v"'          Name
 '.'           Operator
 'elts'        Name
 ' '           Text.Whitespace
 '='           Operator
 ' '           Text.Whitespace
-"b'"          Name
+'b"'          Name
 '.'           Operator
 'left'        Name
 ' '           Text.Whitespace
 '+'           Operator
 ' '           Text.Whitespace
-"b'"          Name
+'b"'          Name
 '.'           Operator
 'done'        Name
 '\n'          Text.Whitespace
@@ -1092,7 +1092,7 @@
 ' '           Text.Whitespace
 '+'           Operator
 ' '           Text.Whitespace
-"KeySetView'" Name
+'KeySetView"' Name
 '->'          Operator
 'setRefs'     Name
 '->'          Operator
@@ -1370,7 +1370,7 @@
 ']'           Operator
 ','           Punctuation
 ' '           Text.Whitespace
-"i'"          Name
+'i"'          Name
 ' '           Text.Whitespace
 '='           Operator
 ' '           Text.Whitespace
@@ -1385,7 +1385,7 @@
 '\n'          Text.Whitespace
 
 '    '        Text.Whitespace
-"i'"          Name
+'i"'          Name
 '.'           Operator
 'left'        Name
 ' '           Text.Whitespace
@@ -1397,7 +1397,7 @@
 '\n'          Text.Whitespace
 
 '    '        Text.Whitespace
-"i'"          Name
+'i"'          Name
 '.'           Operator
 'done'        Name
 ' '           Text.Whitespace
@@ -1417,7 +1417,7 @@
 '    '        Text.Whitespace
 'no'          Keyword
 ' '           Text.Whitespace
-"i'"          Name
+'i"'          Name
 '.'           Operator
 'lastRef'     Name
 '\n'          Text.Whitespace
@@ -1510,7 +1510,7 @@
 ']'           Operator
 ','           Punctuation
 ' '           Text.Whitespace
-"i'"          Name
+'i"'          Name
 ' '           Text.Whitespace
 '='           Operator
 ' '           Text.Whitespace
@@ -1535,7 +1535,7 @@
 '\n'          Text.Whitespace
 
 '    '        Text.Whitespace
-"i'"          Name
+'i"'          Name
 '.'           Operator
 'left'        Name
 ' '           Text.Whitespace
@@ -1551,7 +1551,7 @@
 '\n'          Text.Whitespace
 
 '    '        Text.Whitespace
-"i'"          Name
+'i"'          Name
 '.'           Operator
 'done'        Name
 ' '           Text.Whitespace
@@ -1567,7 +1567,7 @@
 '\n'          Text.Whitespace
 
 '    '        Text.Whitespace
-"i'"          Name
+'i"'          Name
 '.'           Operator
 'lastRef'     Name
 ' '           Text.Whitespace
diff --git a/tests/examplefiles/arturo/arturo_test.art b/tests/examplefiles/arturo/arturo_test.art
new file mode 100644
index 0000000000..1d2d258000
--- /dev/null
+++ b/tests/examplefiles/arturo/arturo_test.art
@@ -0,0 +1,457 @@
+#! home/.arturo/bin
+
+; this is a comment
+; this is another comment
+
+;---------------------------------
+; VARIABLES & VALUES
+;---------------------------------
+
+; numbers
+a1: 2
+a2: 3.14
+a3: to :complex [1 2.0]     ; 1.0+2.0i
+
+; strings
+c1: "this is a string"
+c2: {
+    this is a multiline string
+    that is indentation-agnostic
+}
+
+c3: {:
+    this is
+        a verbatim
+            multiline string
+                which will remain exactly
+                    as the original
+:}
+
+c4: {
+    this is a multiline string
+    with |a1| lines.
+}
+
+annotatedStrings: {!md
+    # This is a markdown example
+
+    I'm a paragraph
+
+    > I'm a blockquote
+
+    ```c
+    #include <stdio.h>
+    int main() {
+        char * name = "World";
+        printf("Hello, %s!", name);
+        printf( "I'm a highlighted C code"
+                "inside Markdown highlighted code,"
+                "inside Arturo. Awesome!"
+            );
+        return 0;
+    }
+    ```
+}
+
+smartString: »I'm a string until the end of line    ; I'm not a comment
+safeString: «««I'm a safe string. 🙂»»»             ; I'm a comment
+
+; characters
+ch: `c`
+
+; blocks/arrays
+d: [1 2 3]
+
+; dictionaries
+e: #[
+    name: "John"
+    surname: "Doe"
+    age: 34
+    likes: [pizza spaghetti]
+]
+
+; yes, functions are values too
+f: function [x][
+    2 * x
+]
+
+; colors - right, you can directly define them as well!
+g1: #red
+g2: #0077BF
+
+; dates
+h: now              ; 2021-05-03T17:10:48+02:00
+
+; logical values
+i1: true
+i2: false
+i3: maybe
+
+;---------------------------------
+; BASIC OPERATORS
+;---------------------------------
+
+; simple arithmetic
+1 + 1       ; => 2
+8 - 1       ; => 7
+4.2 - 1.1   ; => 3.1
+10 * 2      ; => 20
+35 / 4      ; => 8
+35 // 4     ; => 8.75
+2 ^ 5       ; => 32
+5 % 3       ; => 2
+
+; bitwise operators
+and 3 5     ; => 1
+or 3 5      ; => 7
+xor 3 5     ; => 6
+
+; pre-defined constants
+pi          ; => 3.141592653589793
+epsilon     ; => 2.718281828459045
+null        ; => null
+true        ; => true
+false       ; => false
+
+;---------------------------------
+; COMPARISON OPERATORS
+;---------------------------------
+
+; equality
+1 = 1       ; => true
+2 = 1       ; => false
+
+; inequality
+1 <> 1      ; => false
+2 <> 1      ; => true
+
+; more comparisons
+1 < 10      ; => true
+1 =< 10     ; => true
+10 =< 10    ; => true
+1 > 10      ; => false
+1 >= 10     ; => false
+11 >= 10    ; => true
+
+;---------------------------------
+; CONDITIONALS
+;---------------------------------
+
+; logical operators
+and? true true      ; => true
+and? true false     ; => false
+or? true false      ; => true
+or? false false     ; => false
+
+and? [1=2][2<3]     ; => false
+                    ; (the second block will not be evaluated)
+
+; simple if statements
+if 2 > 1 [ print "yes!"]    ; yes!
+if 3 <> 2 -> print "true!"  ; true!
+
+; if/else statements
+if? 2 > 3 -> print "2 is greater than 3"
+else -> print "2 is not greater than 3"         ; 2 is not greater than 3
+
+; switch statements
+switch 2 > 3 -> print "2 is greater than 3"
+             -> print "2 is not greater than 3" ; 2 is not greater than 3
+
+a: (2 > 3)["yes"]["no"]         ; a: "no"
+a: (2 > 3)? -> "yes" -> "no"    ; a: "no" (exactly the same as above)
+
+; case/when statements
+case [1]
+    when? [>2] -> print "1 is greater than 2. what?!"
+    when? [<0] -> print "1 is less than 0. nope..."
+    else -> print "here we are!"                ; here we are!
+
+;---------------------------------
+; LOOPS
+;---------------------------------
+
+; with `loop`
+arr: [1 4 5 3]
+loop arr 'x [
+    print ["x =" x]
+]
+; x = 1
+; x = 4
+; x = 5
+; x = 3
+
+; with loop and custom index
+loop.with:'i arr 'x [
+    print ["item at position" i "=>" x]
+]
+; item at position 0 => 1
+; item at position 1 => 4
+; item at position 2 => 5
+; item at position 3 => 3
+
+; using ranges
+loop 1..3 'x ->         ; since it's a single statement
+    print x             ; there's no need for [block] notation
+                        ; we can wrap it up using the `->` syntactic sugar
+
+loop `a`..`c` 'ch ->
+    print ch
+; a
+; b
+; c
+
+; picking multiple items
+loop 1..10 [x y] ->
+    print ["x =" x ", y =" y]
+; x = 1 , y = 2
+; x = 3 , y = 4
+; x = 5 , y = 6
+; x = 7 , y = 8
+; x = 9 , y = 10
+
+; looping through a dictionary
+dict: #[name: "John", surname: "Doe", age: 34]
+loop dict [key value][
+    print [key "->" value]
+]
+; name -> John
+; surname -> Doe
+; age -> 34
+
+; while loops
+i: new 0
+while [i<3][
+    print ["i =" i]
+    inc 'i
+]
+; i = 0
+; i = 1
+; i = 2
+
+;---------------------------------
+; STRINGS
+;---------------------------------
+
+; case
+a: "tHis Is a stRinG"
+print upper a               ; THIS IS A STRING
+print lower a               ; this is a string
+print capitalize a          ; THis Is a stRinG
+
+; concatenation
+a: "Hello " ++ "World!"     ; a: "Hello World!"
+
+; strings as an array
+split "hello"               ; => [h e l l o]
+split.words "hello world"   ; => [hello world]
+
+print first "hello"         ; h
+print last "hello"          ; o
+
+; conversion
+to :string 123              ; => "123"
+to :integer "123"           ; => 123
+
+; joining strings together
+join ["hello" "world"]              ; => "helloworld"
+join.with:"-" ["hello" "world"]     ; => "hello-world"
+
+; string interpolation
+x: 2
+print ~"x = |x|"            ; x = 2
+
+; interpolation with `print`
+print ["x =" x]             ; x = 2
+                            ; (`print` works by calculating the given block
+                            ;  and joining the different values as strings
+                            ;  with a single space between them)
+
+; templates
+print render.template {
+    <||= switch x=2 [ ||>
+        Yes, x = 2
+    <||][||>
+        No, x is not 2
+    <||]||>
+} ; Yes, x = 2
+
+; matching
+prefix? "hello" "he"        ; => true
+suffix? "hello" "he"        ; => false
+
+contains? "hello" "ll"      ; => true
+contains? "hello" "he"      ; => true
+contains? "hello" "x"       ; => false
+
+in? "ll" "hello"            ; => true
+in? "x" "hello"             ; => false
+
+;---------------------------------
+; BLOCKS
+;---------------------------------
+
+; calculate a block
+arr: [1 1+1 1+1+1]
+@arr                        ; => [1 2 3]
+
+; execute a block
+sth: [print "Hello world"]  ; this is perfectly valid,
+                            ; could contain *anything*
+                            ; and will not be executed...
+
+do sth                      ; Hello world
+                            ; (...until we tell it to)
+
+; array indexing
+arr: ["zero" "one" "two" "three"]
+print first arr             ; zero
+print arr\0                 ; zero
+print last arr              ; three
+print arr\3                 ; three
+
+x: 2
+print get arr x             ; two
+print arr\[x]               ; two
+
+; setting an array element
+arr\0: "nada"
+set arr 2 "dos"
+print arr                   ; nada one dos three
+
+; adding elements to an array
+arr: new []
+'arr ++ "one"
+'arr ++ "two"
+print arr                   ; one two
+
+; remove elements from an array
+arr: new ["one" "two" "three" "four"]
+'arr -- "two"               ; arr: ["one" "three" "four"]
+remove 'arr .index 0        ; arr: ["three" "four"]
+
+; getting the size of an array
+arr: ["one" 2 "three" 4]
+print size arr              ; 4
+
+; getting a slice of an array
+print slice ["one" "two" "three" "four"] 0 1        ; one two
+
+; check if array contains a specific element
+print contains? arr "one"   ; true
+print contains? arr "five"  ; false
+
+; sorting array
+arr: [1 5 3 2 4]
+sort arr                    ; => [1 2 3 4 5]
+sort.descending arr         ; => [5 4 3 2 1]
+
+; mapping values
+map 1..10 [x][2*x]          ; => [2 4 6 8 10 12 14 16 18 20]
+map 1..10 'x -> 2*x         ; same as above
+map 1..10 => [2*&]          ; same as above
+map 1..10 => [2*]           ; same as above
+
+; selecting/filtering array values
+select 1..10 [x][odd? x]    ; => [1 3 5 7 9]
+select 1..10 => odd?        ; same as above
+
+filter 1..10 => odd?        ; => [2 4 6 8 10]
+                            ; (now, we leave out all odd numbers -
+                            ;  while select keeps them)
+
+; misc operations
+arr: ["one" 2 "three" 4]
+reverse arr                 ; => [4 "three" 2 "one"]
+shuffle arr                 ; => [2 4 "three" "one"]
+unique [1 2 3 2 3 1]        ; => [1 2 3]
+permutate [1 2 3]           ; => [[1 2 3] [1 3 2] [3 1 2] [2 1 3] [2 3 1] [3 2 1]]
+take 1..10 3                ; => [1 2 3]
+repeat [1 2] 3              ; => [1 2 1 2 1 2]
+
+;---------------------------------
+; FUNCTIONS
+;---------------------------------
+
+; declaring a function
+f: function [x][ 2*x ]
+f: function [x]-> 2*x       ; same as above
+f: $[x]->2*x                ; same as above (only using the `$` alias
+                            ;  for the `function`... function)
+
+; calling a function
+f 10                        ; => 20
+
+; returning a value
+g: function [x][
+    if x < 2 -> return 0
+
+    res: 0
+    loop 0..x 'z [
+        res: res + z
+    ]
+    return res
+]
+
+;---------------------------------
+; CUSTOM TYPES
+;---------------------------------
+
+; defining a custom type
+define :person [                            ; define a new custom type "Person"
+    name                                    ; with fields: name, surname, age
+    surname
+    age
+][
+    ; with custom post-construction initializer
+    init: [
+        this\name: capitalize this\name
+    ]
+
+    ; custom print function
+    print: [
+        render "NAME: |this\name|, SURNAME: |this\surname|, AGE: |this\age|"
+    ]
+
+    ; custom comparison operator
+    compare: 'age
+]
+
+; create a method for our custom type
+sayHello: function [this][
+    ensure -> is? :person this
+
+    print ["Hello" this\name]
+]
+
+; create new objects of our custom type
+a: to :person ["John" "Doe" 34]                 ; let's create 2 "Person"s
+b: to :person ["jane" "Doe" 33]                 ; and another one
+
+; call pseudo-inner method
+sayHello a                                      ; Hello John
+sayHello b                                      ; Hello Jane
+
+; access object fields
+print ["The first person's name is:" a\name]    ; The first person's name is: John
+print ["The second person's name is:" b\name]   ; The second person's name is: Jane
+
+; changing object fields
+a\name: "Bob"
+sayHello a                                      ; Hello Bob
+
+; verifying object type
+print type a                                    ; :person
+print is? :person a                             ; true
+
+; printing objects
+print a                                         ; NAME: John, SURNAME: Doe, AGE: 34
+
+; sorting user objects (using custom comparator)
+sort @[a b]                                     ; Jane..., John...
+sort.descending @[a b]                          ; John..., Jane...
+
+eofString:
+---
+I'm an end of file
+Multiline string.
\ No newline at end of file
diff --git a/tests/examplefiles/arturo/arturo_test.art.output b/tests/examplefiles/arturo/arturo_test.art.output
new file mode 100644
index 0000000000..bc5e5bad98
--- /dev/null
+++ b/tests/examplefiles/arturo/arturo_test.art.output
@@ -0,0 +1,2564 @@
+'#! home/.arturo/bin' Comment.Hashbang
+'\n\n'        Text.Whitespace
+
+'; this is a comment' Comment.Single
+'\n'          Text.Whitespace
+
+'; this is another comment' Comment.Single
+'\n\n'        Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n'          Text.Whitespace
+
+'; VARIABLES & VALUES' Comment.Single
+'\n'          Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; numbers'   Comment.Single
+'\n'          Text.Whitespace
+
+'a1:'         Name.Label
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+'\n'          Text.Whitespace
+
+'a2:'         Name.Label
+' '           Text.Whitespace
+'3.14'        Literal.Number.Float
+'\n'          Text.Whitespace
+
+'a3:'         Name.Label
+' '           Text.Whitespace
+'to'          Name.Builtin
+' '           Text.Whitespace
+':complex'    Keyword.Type
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'2.0'         Literal.Number.Float
+']'           Punctuation
+'     '       Text.Whitespace
+'; 1.0+2.0i'  Comment.Single
+'\n\n'        Text.Whitespace
+
+'; strings'   Comment.Single
+'\n'          Text.Whitespace
+
+'c1:'         Name.Label
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'this is a string' Literal.String
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+'c2:'         Name.Label
+' '           Text.Whitespace
+'{'           Literal.String.Single
+'\n    this is a multiline string\n    that is indentation-agnostic\n' Literal.String
+
+'}'           Literal.String.Single
+'\n\n'        Text.Whitespace
+
+'c3:'         Name.Label
+' '           Text.Whitespace
+'{:'          Literal.String.Double
+'\n    this is\n        a verbatim\n            multiline string\n                which will remain exactly\n                    as the original\n' Literal.String
+
+':}'          Literal.String.Double
+'\n\n'        Text.Whitespace
+
+'c4:'         Name.Label
+' '           Text.Whitespace
+'{'           Literal.String.Single
+'\n    this is a multiline string\n    with ' Literal.String
+'|'           Literal.String.Interpol
+'a1'          Name
+'|'           Literal.String.Interpol
+' lines.\n'   Literal.String
+
+'}'           Literal.String.Single
+'\n\n'        Text.Whitespace
+
+'annotatedStrings:' Name.Label
+' '           Text.Whitespace
+'{'           Literal.String.Double
+'!'           Literal.String.Interpol
+'md'          Literal.String.Interpol
+'\n'          Text.Whitespace
+
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'#'           Text
+' '           Text
+'This'        Text
+' '           Text
+'is'          Text
+' '           Text
+'a'           Text
+' '           Text
+'markdown'    Text
+' '           Text
+'example'     Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+"I'm"         Text
+' '           Text
+'a'           Text
+' '           Text
+'paragraph'   Text
+'\n'          Text.Whitespace
+
+'\n    > '    Keyword
+"I'm a blockquote\n" Generic.Emph
+
+'\n    ```'   Literal.String.Backtick
+'c'           Literal.String.Backtick
+'\n'          Text
+
+'    '        Text.Whitespace
+'#'           Comment.Preproc
+'include'     Comment.Preproc
+' '           Text.Whitespace
+'<stdio.h>'   Comment.PreprocFile
+'\n'          Comment.Preproc
+
+'    '        Text.Whitespace
+'int'         Keyword.Type
+' '           Text.Whitespace
+'main'        Name.Function
+'('           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'char'        Keyword.Type
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'name'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'World'       Literal.String
+'"'           Literal.String
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'printf'      Name
+'('           Punctuation
+'"'           Literal.String
+'Hello, %s!'  Literal.String
+'"'           Literal.String
+','           Punctuation
+' '           Text.Whitespace
+'name'        Name
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'printf'      Name
+'('           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String
+"I'm a highlighted C code" Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'                ' Text.Whitespace
+'"'           Literal.String
+'inside Markdown highlighted code,' Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'                ' Text.Whitespace
+'"'           Literal.String
+'inside Arturo. Awesome!' Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'            ' Text.Whitespace
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'return'      Keyword
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'    ```\n'   Literal.String.Backtick
+
+'}'           Literal.String.Double
+'\n\n'        Text.Whitespace
+
+'smartString:' Name.Label
+' '           Text.Whitespace
+'»'           Literal.String.Single
+"I'm a string until the end of line    ; I'm not a comment" Literal.String
+'\n'          Literal.String.Single
+
+'safeString:' Name.Label
+' '           Text.Whitespace
+'«««'         Literal.String.Double
+"I'm a safe string. 🙂" Literal.String
+'»»»'         Literal.String.Double
+'             ' Text.Whitespace
+"; I'm a comment" Comment.Single
+'\n\n'        Text.Whitespace
+
+'; characters' Comment.Single
+'\n'          Text.Whitespace
+
+'ch:'         Name.Label
+' '           Text.Whitespace
+'`c`'         Literal.String.Char
+'\n\n'        Text.Whitespace
+
+'; blocks/arrays' Comment.Single
+'\n'          Text.Whitespace
+
+'d:'          Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+']'           Punctuation
+'\n\n'        Text.Whitespace
+
+'; dictionaries' Comment.Single
+'\n'          Text.Whitespace
+
+'e:'          Name.Label
+' '           Text.Whitespace
+'#'           Name.Decorator
+'['           Punctuation
+'\n    '      Text.Whitespace
+'name:'       Name.Label
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'John'        Literal.String
+'"'           Literal.String.Double
+'\n    '      Text.Whitespace
+'surname:'    Name.Label
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'Doe'         Literal.String
+'"'           Literal.String.Double
+'\n    '      Text.Whitespace
+'age:'        Name.Label
+' '           Text.Whitespace
+'34'          Literal.Number.Integer
+'\n    '      Text.Whitespace
+'likes:'      Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'pizza'       Name
+' '           Text.Whitespace
+'spaghetti'   Name
+']'           Punctuation
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n\n'        Text.Whitespace
+
+'; yes, functions are values too' Comment.Single
+'\n'          Text.Whitespace
+
+'f:'          Name.Label
+' '           Text.Whitespace
+'function'    Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'x'           Name
+']'           Punctuation
+'['           Punctuation
+'\n    '      Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'x'           Name
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n\n'        Text.Whitespace
+
+'; colors - right, you can directly define them as well!' Comment.Single
+'\n'          Text.Whitespace
+
+'g1:'         Name.Label
+' '           Text.Whitespace
+'#red'        Name.Constant
+'\n'          Text.Whitespace
+
+'g2:'         Name.Label
+' '           Text.Whitespace
+'#0077BF'     Name.Constant
+'\n\n'        Text.Whitespace
+
+'; dates'     Comment.Single
+'\n'          Text.Whitespace
+
+'h:'          Name.Label
+' '           Text.Whitespace
+'now'         Name.Builtin
+'              ' Text.Whitespace
+'; 2021-05-03T17:10:48+02:00' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; logical values' Comment.Single
+'\n'          Text.Whitespace
+
+'i1:'         Name.Label
+' '           Text.Whitespace
+'true'        Name.Constant
+'\n'          Text.Whitespace
+
+'i2:'         Name.Label
+' '           Text.Whitespace
+'false'       Name.Constant
+'\n'          Text.Whitespace
+
+'i3:'         Name.Label
+' '           Text.Whitespace
+'maybe'       Name.Constant
+'\n\n'        Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n'          Text.Whitespace
+
+'; BASIC OPERATORS' Comment.Single
+'\n'          Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; simple arithmetic' Comment.Single
+'\n'          Text.Whitespace
+
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'       '     Text.Whitespace
+'; => 2'      Comment.Single
+'\n'          Text.Whitespace
+
+'8'           Literal.Number.Integer
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'       '     Text.Whitespace
+'; => 7'      Comment.Single
+'\n'          Text.Whitespace
+
+'4.2'         Literal.Number.Float
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'1.1'         Literal.Number.Float
+'   '         Text.Whitespace
+'; => 3.1'    Comment.Single
+'\n'          Text.Whitespace
+
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+'      '      Text.Whitespace
+'; => 20'     Comment.Single
+'\n'          Text.Whitespace
+
+'35'          Literal.Number.Integer
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'4'           Literal.Number.Integer
+'      '      Text.Whitespace
+'; => 8'      Comment.Single
+'\n'          Text.Whitespace
+
+'35'          Literal.Number.Integer
+' '           Text.Whitespace
+'//'          Operator
+' '           Text.Whitespace
+'4'           Literal.Number.Integer
+'     '       Text.Whitespace
+'; => 8.75'   Comment.Single
+'\n'          Text.Whitespace
+
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'^'           Operator
+' '           Text.Whitespace
+'5'           Literal.Number.Integer
+'       '     Text.Whitespace
+'; => 32'     Comment.Single
+'\n'          Text.Whitespace
+
+'5'           Literal.Number.Integer
+' '           Text.Whitespace
+'%'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+'       '     Text.Whitespace
+'; => 2'      Comment.Single
+'\n\n'        Text.Whitespace
+
+'; bitwise operators' Comment.Single
+'\n'          Text.Whitespace
+
+'and'         Name.Builtin
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'5'           Literal.Number.Integer
+'     '       Text.Whitespace
+'; => 1'      Comment.Single
+'\n'          Text.Whitespace
+
+'or'          Name.Builtin
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'5'           Literal.Number.Integer
+'      '      Text.Whitespace
+'; => 7'      Comment.Single
+'\n'          Text.Whitespace
+
+'xor'         Name.Builtin
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'5'           Literal.Number.Integer
+'     '       Text.Whitespace
+'; => 6'      Comment.Single
+'\n\n'        Text.Whitespace
+
+'; pre-defined constants' Comment.Single
+'\n'          Text.Whitespace
+
+'pi'          Name.Builtin
+'          '  Text.Whitespace
+'; => 3.141592653589793' Comment.Single
+'\n'          Text.Whitespace
+
+'epsilon'     Name.Builtin
+'     '       Text.Whitespace
+'; => 2.718281828459045' Comment.Single
+'\n'          Text.Whitespace
+
+'null'        Name.Builtin
+'        '    Text.Whitespace
+'; => null'   Comment.Single
+'\n'          Text.Whitespace
+
+'true'        Name.Constant
+'        '    Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'false'       Name.Constant
+'       '     Text.Whitespace
+'; => false'  Comment.Single
+'\n\n'        Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n'          Text.Whitespace
+
+'; COMPARISON OPERATORS' Comment.Single
+'\n'          Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; equality'  Comment.Single
+'\n'          Text.Whitespace
+
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'       '     Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'       '     Text.Whitespace
+'; => false'  Comment.Single
+'\n\n'        Text.Whitespace
+
+'; inequality' Comment.Single
+'\n'          Text.Whitespace
+
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'<>'          Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'      '      Text.Whitespace
+'; => false'  Comment.Single
+'\n'          Text.Whitespace
+
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'<>'          Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'      '      Text.Whitespace
+'; => true'   Comment.Single
+'\n\n'        Text.Whitespace
+
+'; more comparisons' Comment.Single
+'\n'          Text.Whitespace
+
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'<'           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'      '      Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'='           Operator
+'<'           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'     '       Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'='           Operator
+'<'           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'    '        Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'      '      Text.Whitespace
+'; => false'  Comment.Single
+'\n'          Text.Whitespace
+
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'>'           Operator
+'='           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'     '       Text.Whitespace
+'; => false'  Comment.Single
+'\n'          Text.Whitespace
+
+'11'          Literal.Number.Integer
+' '           Text.Whitespace
+'>'           Operator
+'='           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'    '        Text.Whitespace
+'; => true'   Comment.Single
+'\n\n'        Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n'          Text.Whitespace
+
+'; CONDITIONALS' Comment.Single
+'\n'          Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; logical operators' Comment.Single
+'\n'          Text.Whitespace
+
+'and?'        Name.Builtin
+' '           Text.Whitespace
+'true'        Name.Constant
+' '           Text.Whitespace
+'true'        Name.Constant
+'      '      Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'and?'        Name.Builtin
+' '           Text.Whitespace
+'true'        Name.Constant
+' '           Text.Whitespace
+'false'       Name.Constant
+'     '       Text.Whitespace
+'; => false'  Comment.Single
+'\n'          Text.Whitespace
+
+'or?'         Name.Builtin
+' '           Text.Whitespace
+'true'        Name.Constant
+' '           Text.Whitespace
+'false'       Name.Constant
+'      '      Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'or?'         Name.Builtin
+' '           Text.Whitespace
+'false'       Name.Constant
+' '           Text.Whitespace
+'false'       Name.Constant
+'     '       Text.Whitespace
+'; => false'  Comment.Single
+'\n\n'        Text.Whitespace
+
+'and?'        Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+'='           Operator
+'2'           Literal.Number.Integer
+']'           Punctuation
+'['           Punctuation
+'2'           Literal.Number.Integer
+'<'           Operator
+'3'           Literal.Number.Integer
+']'           Punctuation
+'     '       Text.Whitespace
+'; => false'  Comment.Single
+'\n                    ' Text.Whitespace
+'; (the second block will not be evaluated)' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; simple if statements' Comment.Single
+'\n'          Text.Whitespace
+
+'if'          Name.Builtin
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'['           Punctuation
+' '           Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'yes!'        Literal.String
+'"'           Literal.String.Double
+']'           Punctuation
+'    '        Text.Whitespace
+'; yes!'      Comment.Single
+'\n'          Text.Whitespace
+
+'if'          Name.Builtin
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'<>'          Operator
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'true!'       Literal.String
+'"'           Literal.String.Double
+'  '          Text.Whitespace
+'; true!'     Comment.Single
+'\n\n'        Text.Whitespace
+
+'; if/else statements' Comment.Single
+'\n'          Text.Whitespace
+
+'if?'         Name.Builtin
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'2 is greater than 3' Literal.String
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+'else'        Name.Builtin
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'2 is not greater than 3' Literal.String
+'"'           Literal.String.Double
+'         '   Text.Whitespace
+'; 2 is not greater than 3' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; switch statements' Comment.Single
+'\n'          Text.Whitespace
+
+'switch'      Name.Builtin
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'2 is greater than 3' Literal.String
+'"'           Literal.String.Double
+'\n             ' Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'2 is not greater than 3' Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'; 2 is not greater than 3' Comment.Single
+'\n\n'        Text.Whitespace
+
+'a:'          Name.Label
+' '           Text.Whitespace
+'('           Punctuation
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+')'           Punctuation
+'['           Punctuation
+'"'           Literal.String.Double
+'yes'         Literal.String
+'"'           Literal.String.Double
+']'           Punctuation
+'['           Punctuation
+'"'           Literal.String.Double
+'no'          Literal.String
+'"'           Literal.String.Double
+']'           Punctuation
+'         '   Text.Whitespace
+'; a: "no"'   Comment.Single
+'\n'          Text.Whitespace
+
+'a:'          Name.Label
+' '           Text.Whitespace
+'('           Punctuation
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+')?'          Punctuation
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'yes'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'no'          Literal.String
+'"'           Literal.String.Double
+'    '        Text.Whitespace
+'; a: "no" (exactly the same as above)' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; case/when statements' Comment.Single
+'\n'          Text.Whitespace
+
+'case'        Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+']'           Punctuation
+'\n    '      Text.Whitespace
+'when?'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'>'           Operator
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'1 is greater than 2. what?!' Literal.String
+'"'           Literal.String.Double
+'\n    '      Text.Whitespace
+'when?'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'<'           Operator
+'0'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'1 is less than 0. nope...' Literal.String
+'"'           Literal.String.Double
+'\n    '      Text.Whitespace
+'else'        Name.Builtin
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'here we are!' Literal.String
+'"'           Literal.String.Double
+'                ' Text.Whitespace
+'; here we are!' Comment.Single
+'\n\n'        Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n'          Text.Whitespace
+
+'; LOOPS'     Comment.Single
+'\n'          Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; with `loop`' Comment.Single
+'\n'          Text.Whitespace
+
+'arr:'        Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'4'           Literal.Number.Integer
+' '           Text.Whitespace
+'5'           Literal.Number.Integer
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'loop'        Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+' '           Text.Whitespace
+"'x"          Keyword.Declaration
+' '           Text.Whitespace
+'['           Punctuation
+'\n    '      Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'x ='         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'x'           Name
+']'           Punctuation
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'; x = 1'     Comment.Single
+'\n'          Text.Whitespace
+
+'; x = 4'     Comment.Single
+'\n'          Text.Whitespace
+
+'; x = 5'     Comment.Single
+'\n'          Text.Whitespace
+
+'; x = 3'     Comment.Single
+'\n\n'        Text.Whitespace
+
+'; with loop and custom index' Comment.Single
+'\n'          Text.Whitespace
+
+'loop'        Name.Builtin
+'.with:'      Name.Attribute
+"'i"          Keyword.Declaration
+' '           Text.Whitespace
+'arr'         Name
+' '           Text.Whitespace
+"'x"          Keyword.Declaration
+' '           Text.Whitespace
+'['           Punctuation
+'\n    '      Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'item at position' Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'i'           Name
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'=>'          Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'x'           Name
+']'           Punctuation
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'; item at position 0 => 1' Comment.Single
+'\n'          Text.Whitespace
+
+'; item at position 1 => 4' Comment.Single
+'\n'          Text.Whitespace
+
+'; item at position 2 => 5' Comment.Single
+'\n'          Text.Whitespace
+
+'; item at position 3 => 3' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; using ranges' Comment.Single
+'\n'          Text.Whitespace
+
+'loop'        Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+"'x"          Keyword.Declaration
+' '           Text.Whitespace
+'->'          Name.Decorator
+'         '   Text.Whitespace
+"; since it's a single statement" Comment.Single
+'\n    '      Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'x'           Name
+'             ' Text.Whitespace
+"; there's no need for [block] notation" Comment.Single
+'\n                        ' Text.Whitespace
+'; we can wrap it up using the `->` syntactic sugar' Comment.Single
+'\n\n'        Text.Whitespace
+
+'loop'        Name.Builtin
+' '           Text.Whitespace
+'`a`'         Literal.String.Char
+'..'          Operator
+'`c`'         Literal.String.Char
+' '           Text.Whitespace
+"'ch"         Keyword.Declaration
+' '           Text.Whitespace
+'->'          Name.Decorator
+'\n    '      Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'ch'          Name
+'\n'          Text.Whitespace
+
+'; a'         Comment.Single
+'\n'          Text.Whitespace
+
+'; b'         Comment.Single
+'\n'          Text.Whitespace
+
+'; c'         Comment.Single
+'\n\n'        Text.Whitespace
+
+'; picking multiple items' Comment.Single
+'\n'          Text.Whitespace
+
+'loop'        Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'['           Punctuation
+'x'           Name
+' '           Text.Whitespace
+'y'           Name
+']'           Punctuation
+' '           Text.Whitespace
+'->'          Name.Decorator
+'\n    '      Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'x ='         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'x'           Name
+' '           Text.Whitespace
+'"'           Literal.String.Double
+', y ='       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'y'           Name
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'; x = 1 , y = 2' Comment.Single
+'\n'          Text.Whitespace
+
+'; x = 3 , y = 4' Comment.Single
+'\n'          Text.Whitespace
+
+'; x = 5 , y = 6' Comment.Single
+'\n'          Text.Whitespace
+
+'; x = 7 , y = 8' Comment.Single
+'\n'          Text.Whitespace
+
+'; x = 9 , y = 10' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; looping through a dictionary' Comment.Single
+'\n'          Text.Whitespace
+
+'dict:'       Name.Label
+' '           Text.Whitespace
+'#'           Name.Decorator
+'['           Punctuation
+'name:'       Name.Label
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'John'        Literal.String
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'surname:'    Name.Label
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'Doe'         Literal.String
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'age:'        Name.Label
+' '           Text.Whitespace
+'34'          Literal.Number.Integer
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'loop'        Name.Builtin
+' '           Text.Whitespace
+'dict'        Name
+' '           Text.Whitespace
+'['           Punctuation
+'key'         Name
+' '           Text.Whitespace
+'value'       Name
+']'           Punctuation
+'['           Punctuation
+'\n    '      Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'key'         Name
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'->'          Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'value'       Name
+']'           Punctuation
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'; name -> John' Comment.Single
+'\n'          Text.Whitespace
+
+'; surname -> Doe' Comment.Single
+'\n'          Text.Whitespace
+
+'; age -> 34' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; while loops' Comment.Single
+'\n'          Text.Whitespace
+
+'i:'          Name.Label
+' '           Text.Whitespace
+'new'         Name.Builtin
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+'\n'          Text.Whitespace
+
+'while'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'i'           Name
+'<'           Operator
+'3'           Literal.Number.Integer
+']'           Punctuation
+'['           Punctuation
+'\n    '      Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'i ='         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'i'           Name
+']'           Punctuation
+'\n    '      Text.Whitespace
+'inc'         Name.Builtin
+' '           Text.Whitespace
+"'i"          Keyword.Declaration
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'; i = 0'     Comment.Single
+'\n'          Text.Whitespace
+
+'; i = 1'     Comment.Single
+'\n'          Text.Whitespace
+
+'; i = 2'     Comment.Single
+'\n\n'        Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n'          Text.Whitespace
+
+'; STRINGS'   Comment.Single
+'\n'          Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; case'      Comment.Single
+'\n'          Text.Whitespace
+
+'a:'          Name.Label
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'tHis Is a stRinG' Literal.String
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'upper'       Name.Builtin
+' '           Text.Whitespace
+'a'           Name
+'               ' Text.Whitespace
+'; THIS IS A STRING' Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'lower'       Name.Builtin
+' '           Text.Whitespace
+'a'           Name
+'               ' Text.Whitespace
+'; this is a string' Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'capitalize'  Name.Builtin
+' '           Text.Whitespace
+'a'           Name
+'          '  Text.Whitespace
+'; THis Is a stRinG' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; concatenation' Comment.Single
+'\n'          Text.Whitespace
+
+'a:'          Name.Label
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'Hello '      Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'+'           Operator
+'+'           Operator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'World!'      Literal.String
+'"'           Literal.String.Double
+'     '       Text.Whitespace
+'; a: "Hello World!"' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; strings as an array' Comment.Single
+'\n'          Text.Whitespace
+
+'split'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+'               ' Text.Whitespace
+'; => [h e l l o]' Comment.Single
+'\n'          Text.Whitespace
+
+'split'       Name.Builtin
+'.words'      Name.Attribute
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello world' Literal.String
+'"'           Literal.String.Double
+'   '         Text.Whitespace
+'; => [hello world]' Comment.Single
+'\n\n'        Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'first'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+'         '   Text.Whitespace
+'; h'         Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'last'        Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+'          '  Text.Whitespace
+'; o'         Comment.Single
+'\n\n'        Text.Whitespace
+
+'; conversion' Comment.Single
+'\n'          Text.Whitespace
+
+'to'          Name.Builtin
+' '           Text.Whitespace
+':string'     Keyword.Type
+' '           Text.Whitespace
+'123'         Literal.Number.Integer
+'              ' Text.Whitespace
+'; => "123"'  Comment.Single
+'\n'          Text.Whitespace
+
+'to'          Name.Builtin
+' '           Text.Whitespace
+':integer'    Keyword.Type
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'123'         Literal.String
+'"'           Literal.String.Double
+'           ' Text.Whitespace
+'; => 123'    Comment.Single
+'\n\n'        Text.Whitespace
+
+'; joining strings together' Comment.Single
+'\n'          Text.Whitespace
+
+'join'        Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'world'       Literal.String
+'"'           Literal.String.Double
+']'           Punctuation
+'              ' Text.Whitespace
+'; => "helloworld"' Comment.Single
+'\n'          Text.Whitespace
+
+'join'        Name.Builtin
+'.with:'      Name.Attribute
+'"'           Literal.String.Double
+'-'           Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'world'       Literal.String
+'"'           Literal.String.Double
+']'           Punctuation
+'     '       Text.Whitespace
+'; => "hello-world"' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; string interpolation' Comment.Single
+'\n'          Text.Whitespace
+
+'x:'          Name.Label
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'~'           Operator
+'"'           Literal.String.Double
+'x = '        Literal.String
+'|'           Literal.String.Interpol
+'x'           Name
+'|'           Literal.String.Interpol
+'"'           Literal.String.Double
+'            ' Text.Whitespace
+'; x = 2'     Comment.Single
+'\n\n'        Text.Whitespace
+
+'; interpolation with `print`' Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'x ='         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'x'           Name
+']'           Punctuation
+'             ' Text.Whitespace
+'; x = 2'     Comment.Single
+'\n                            ' Text.Whitespace
+'; (`print` works by calculating the given block' Comment.Single
+'\n                            ' Text.Whitespace
+';  and joining the different values as strings' Comment.Single
+'\n                            ' Text.Whitespace
+';  with a single space between them)' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; templates' Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'render'      Name.Builtin
+'.template'   Name.Attribute
+' '           Text.Whitespace
+'{'           Literal.String.Single
+'\n    '      Literal.String
+'<||'         Literal.String.Interpol
+'='           Operator
+' '           Text.Whitespace
+'switch'      Name.Builtin
+' '           Text.Whitespace
+'x'           Name
+'='           Operator
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'['           Punctuation
+' '           Text.Whitespace
+'||>'         Literal.String.Interpol
+'\n        Yes, x = 2\n    ' Literal.String
+'<||'         Literal.String.Interpol
+']'           Punctuation
+'['           Punctuation
+'||>'         Literal.String.Interpol
+'\n        No, x is not 2\n    ' Literal.String
+'<||'         Literal.String.Interpol
+']'           Punctuation
+'||>'         Literal.String.Interpol
+'\n'          Literal.String
+
+'}'           Literal.String.Single
+' '           Text.Whitespace
+'; Yes, x = 2' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; matching'  Comment.Single
+'\n'          Text.Whitespace
+
+'prefix?'     Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'he'          Literal.String
+'"'           Literal.String.Double
+'        '    Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'suffix?'     Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'he'          Literal.String
+'"'           Literal.String.Double
+'        '    Text.Whitespace
+'; => false'  Comment.Single
+'\n\n'        Text.Whitespace
+
+'contains?'   Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'ll'          Literal.String
+'"'           Literal.String.Double
+'      '      Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'contains?'   Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'he'          Literal.String
+'"'           Literal.String.Double
+'      '      Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'contains?'   Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'x'           Literal.String
+'"'           Literal.String.Double
+'       '     Text.Whitespace
+'; => false'  Comment.Single
+'\n\n'        Text.Whitespace
+
+'in?'         Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'ll'          Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+'            ' Text.Whitespace
+'; => true'   Comment.Single
+'\n'          Text.Whitespace
+
+'in?'         Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'x'           Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'hello'       Literal.String
+'"'           Literal.String.Double
+'             ' Text.Whitespace
+'; => false'  Comment.Single
+'\n\n'        Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n'          Text.Whitespace
+
+'; BLOCKS'    Comment.Single
+'\n'          Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; calculate a block' Comment.Single
+'\n'          Text.Whitespace
+
+'arr:'        Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'+'           Operator
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'+'           Operator
+'1'           Literal.Number.Integer
+'+'           Operator
+'1'           Literal.Number.Integer
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'@'           Name.Decorator
+'arr'         Name
+'                        ' Text.Whitespace
+'; => [1 2 3]' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; execute a block' Comment.Single
+'\n'          Text.Whitespace
+
+'sth:'        Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'print'       Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'Hello world' Literal.String
+'"'           Literal.String.Double
+']'           Punctuation
+'  '          Text.Whitespace
+'; this is perfectly valid,' Comment.Single
+'\n                            ' Text.Whitespace
+'; could contain *anything*' Comment.Single
+'\n                            ' Text.Whitespace
+'; and will not be executed...' Comment.Single
+'\n\n'        Text.Whitespace
+
+'do'          Name.Builtin
+' '           Text.Whitespace
+'sth'         Name
+'                      ' Text.Whitespace
+'; Hello world' Comment.Single
+'\n                            ' Text.Whitespace
+'; (...until we tell it to)' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; array indexing' Comment.Single
+'\n'          Text.Whitespace
+
+'arr:'        Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'zero'        Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'one'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'two'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'three'       Literal.String
+'"'           Literal.String.Double
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'first'       Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'             ' Text.Whitespace
+'; zero'      Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'\\0'         Name.Property
+'                 ' Text.Whitespace
+'; zero'      Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'last'        Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'              ' Text.Whitespace
+'; three'     Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'\\3'         Name.Property
+'                 ' Text.Whitespace
+'; three'     Comment.Single
+'\n\n'        Text.Whitespace
+
+'x:'          Name.Label
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'get'         Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+' '           Text.Whitespace
+'x'           Name
+'             ' Text.Whitespace
+'; two'       Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'\\'          Operator
+'['           Punctuation
+'x'           Name
+']'           Punctuation
+'               ' Text.Whitespace
+'; two'       Comment.Single
+'\n\n'        Text.Whitespace
+
+'; setting an array element' Comment.Single
+'\n'          Text.Whitespace
+
+'arr'         Name
+'\\0:'        Name.Property
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'nada'        Literal.String
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+'set'         Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'dos'         Literal.String
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'                   ' Text.Whitespace
+'; nada one dos three' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; adding elements to an array' Comment.Single
+'\n'          Text.Whitespace
+
+'arr:'        Name.Label
+' '           Text.Whitespace
+'new'         Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+']'           Punctuation
+'\n'          Text.Whitespace
+
+"'arr"        Keyword.Declaration
+' '           Text.Whitespace
+'+'           Operator
+'+'           Operator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'one'         Literal.String
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+"'arr"        Keyword.Declaration
+' '           Text.Whitespace
+'+'           Operator
+'+'           Operator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'two'         Literal.String
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'                   ' Text.Whitespace
+'; one two'   Comment.Single
+'\n\n'        Text.Whitespace
+
+'; remove elements from an array' Comment.Single
+'\n'          Text.Whitespace
+
+'arr:'        Name.Label
+' '           Text.Whitespace
+'new'         Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'one'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'two'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'three'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'four'        Literal.String
+'"'           Literal.String.Double
+']'           Punctuation
+'\n'          Text.Whitespace
+
+"'arr"        Keyword.Declaration
+' '           Text.Whitespace
+'-'           Operator
+'-'           Operator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'two'         Literal.String
+'"'           Literal.String.Double
+'               ' Text.Whitespace
+'; arr: ["one" "three" "four"]' Comment.Single
+'\n'          Text.Whitespace
+
+'remove'      Name.Builtin
+' '           Text.Whitespace
+"'arr"        Keyword.Declaration
+' '           Text.Whitespace
+'.index'      Name.Attribute
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+'        '    Text.Whitespace
+'; arr: ["three" "four"]' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; getting the size of an array' Comment.Single
+'\n'          Text.Whitespace
+
+'arr:'        Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'one'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'three'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'4'           Literal.Number.Integer
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'size'        Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'              ' Text.Whitespace
+'; 4'         Comment.Single
+'\n\n'        Text.Whitespace
+
+'; getting a slice of an array' Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'slice'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'one'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'two'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'three'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'four'        Literal.String
+'"'           Literal.String.Double
+']'           Punctuation
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'        '    Text.Whitespace
+'; one two'   Comment.Single
+'\n\n'        Text.Whitespace
+
+'; check if array contains a specific element' Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'contains?'   Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'one'         Literal.String
+'"'           Literal.String.Double
+'   '         Text.Whitespace
+'; true'      Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'contains?'   Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'five'        Literal.String
+'"'           Literal.String.Double
+'  '          Text.Whitespace
+'; false'     Comment.Single
+'\n\n'        Text.Whitespace
+
+'; sorting array' Comment.Single
+'\n'          Text.Whitespace
+
+'arr:'        Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'5'           Literal.Number.Integer
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'4'           Literal.Number.Integer
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'sort'        Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'                    ' Text.Whitespace
+'; => [1 2 3 4 5]' Comment.Single
+'\n'          Text.Whitespace
+
+'sort'        Name.Builtin
+'.descending' Name.Attribute
+' '           Text.Whitespace
+'arr'         Name
+'         '   Text.Whitespace
+'; => [5 4 3 2 1]' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; mapping values' Comment.Single
+'\n'          Text.Whitespace
+
+'map'         Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'['           Punctuation
+'x'           Name
+']'           Punctuation
+'['           Punctuation
+'2'           Literal.Number.Integer
+'*'           Operator
+'x'           Name
+']'           Punctuation
+'          '  Text.Whitespace
+'; => [2 4 6 8 10 12 14 16 18 20]' Comment.Single
+'\n'          Text.Whitespace
+
+'map'         Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+"'x"          Keyword.Declaration
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+'*'           Operator
+'x'           Name
+'         '   Text.Whitespace
+'; same as above' Comment.Single
+'\n'          Text.Whitespace
+
+'map'         Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'='           Operator
+'>'           Operator
+' '           Text.Whitespace
+'['           Punctuation
+'2'           Literal.Number.Integer
+'*'           Operator
+'&'           Name.Decorator
+']'           Punctuation
+'          '  Text.Whitespace
+'; same as above' Comment.Single
+'\n'          Text.Whitespace
+
+'map'         Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'='           Operator
+'>'           Operator
+' '           Text.Whitespace
+'['           Punctuation
+'2'           Literal.Number.Integer
+'*'           Operator
+']'           Punctuation
+'           ' Text.Whitespace
+'; same as above' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; selecting/filtering array values' Comment.Single
+'\n'          Text.Whitespace
+
+'select'      Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'['           Punctuation
+'x'           Name
+']'           Punctuation
+'['           Punctuation
+'odd?'        Name.Builtin
+' '           Text.Whitespace
+'x'           Name
+']'           Punctuation
+'    '        Text.Whitespace
+'; => [1 3 5 7 9]' Comment.Single
+'\n'          Text.Whitespace
+
+'select'      Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'='           Operator
+'>'           Operator
+' '           Text.Whitespace
+'odd?'        Name.Builtin
+'        '    Text.Whitespace
+'; same as above' Comment.Single
+'\n\n'        Text.Whitespace
+
+'filter'      Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'='           Operator
+'>'           Operator
+' '           Text.Whitespace
+'odd?'        Name.Builtin
+'        '    Text.Whitespace
+'; => [2 4 6 8 10]' Comment.Single
+'\n                            ' Text.Whitespace
+'; (now, we leave out all odd numbers -' Comment.Single
+'\n                            ' Text.Whitespace
+';  while select keeps them)' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; misc operations' Comment.Single
+'\n'          Text.Whitespace
+
+'arr:'        Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'one'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'three'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'4'           Literal.Number.Integer
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'reverse'     Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'                 ' Text.Whitespace
+'; => [4 "three" 2 "one"]' Comment.Single
+'\n'          Text.Whitespace
+
+'shuffle'     Name.Builtin
+' '           Text.Whitespace
+'arr'         Name
+'                 ' Text.Whitespace
+'; => [2 4 "three" "one"]' Comment.Single
+'\n'          Text.Whitespace
+
+'unique'      Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+']'           Punctuation
+'        '    Text.Whitespace
+'; => [1 2 3]' Comment.Single
+'\n'          Text.Whitespace
+
+'permutate'   Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+']'           Punctuation
+'           ' Text.Whitespace
+'; => [[1 2 3] [1 3 2] [3 1 2] [2 1 3] [2 3 1] [3 2 1]]' Comment.Single
+'\n'          Text.Whitespace
+
+'take'        Name.Builtin
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'..'          Operator
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+'                ' Text.Whitespace
+'; => [1 2 3]' Comment.Single
+'\n'          Text.Whitespace
+
+'repeat'      Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+'              ' Text.Whitespace
+'; => [1 2 1 2 1 2]' Comment.Single
+'\n\n'        Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n'          Text.Whitespace
+
+'; FUNCTIONS' Comment.Single
+'\n'          Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; declaring a function' Comment.Single
+'\n'          Text.Whitespace
+
+'f:'          Name.Label
+' '           Text.Whitespace
+'function'    Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'x'           Name
+']'           Punctuation
+'['           Punctuation
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+'*'           Operator
+'x'           Name
+' '           Text.Whitespace
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'f:'          Name.Label
+' '           Text.Whitespace
+'function'    Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'x'           Name
+']'           Punctuation
+'->'          Name.Decorator
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+'*'           Operator
+'x'           Name
+'       '     Text.Whitespace
+'; same as above' Comment.Single
+'\n'          Text.Whitespace
+
+'f:'          Name.Label
+' '           Text.Whitespace
+'$'           Name.Decorator
+'['           Punctuation
+'x'           Name
+']'           Punctuation
+'->'          Name.Decorator
+'2'           Literal.Number.Integer
+'*'           Operator
+'x'           Name
+'                ' Text.Whitespace
+'; same as above (only using the `$` alias' Comment.Single
+'\n                            ' Text.Whitespace
+';  for the `function`... function)' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; calling a function' Comment.Single
+'\n'          Text.Whitespace
+
+'f'           Name
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'                        ' Text.Whitespace
+'; => 20'     Comment.Single
+'\n\n'        Text.Whitespace
+
+'; returning a value' Comment.Single
+'\n'          Text.Whitespace
+
+'g:'          Name.Label
+' '           Text.Whitespace
+'function'    Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'x'           Name
+']'           Punctuation
+'['           Punctuation
+'\n    '      Text.Whitespace
+'if'          Name.Builtin
+' '           Text.Whitespace
+'x'           Name
+' '           Text.Whitespace
+'<'           Operator
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'return'      Name.Builtin
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+'\n\n    '    Text.Whitespace
+'res:'        Name.Label
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+'\n    '      Text.Whitespace
+'loop'        Name.Builtin
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+'..'          Operator
+'x'           Name
+' '           Text.Whitespace
+"'z"          Keyword.Declaration
+' '           Text.Whitespace
+'['           Punctuation
+'\n        '  Text.Whitespace
+'res:'        Name.Label
+' '           Text.Whitespace
+'res'         Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'z'           Name
+'\n    '      Text.Whitespace
+']'           Punctuation
+'\n    '      Text.Whitespace
+'return'      Name.Builtin
+' '           Text.Whitespace
+'res'         Name
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n\n'        Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n'          Text.Whitespace
+
+'; CUSTOM TYPES' Comment.Single
+'\n'          Text.Whitespace
+
+';---------------------------------' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; defining a custom type' Comment.Single
+'\n'          Text.Whitespace
+
+'define'      Name.Builtin
+' '           Text.Whitespace
+':person'     Keyword.Type
+' '           Text.Whitespace
+'['           Punctuation
+'                            ' Text.Whitespace
+'; define a new custom type "Person"' Comment.Single
+'\n    '      Text.Whitespace
+'name'        Name
+'                                    ' Text.Whitespace
+'; with fields: name, surname, age' Comment.Single
+'\n    '      Text.Whitespace
+'surname'     Name
+'\n    '      Text.Whitespace
+'age'         Name
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'['           Punctuation
+'\n    '      Text.Whitespace
+'; with custom post-construction initializer' Comment.Single
+'\n    '      Text.Whitespace
+'init:'       Name.Builtin.Pseudo
+' '           Text.Whitespace
+'['           Punctuation
+'\n        '  Text.Whitespace
+'this'        Name.Builtin.Pseudo
+'\\name:'     Name.Property
+' '           Text.Whitespace
+'capitalize'  Name.Builtin
+' '           Text.Whitespace
+'this'        Name.Builtin.Pseudo
+'\\name'      Name.Property
+'\n    '      Text.Whitespace
+']'           Punctuation
+'\n\n    '    Text.Whitespace
+'; custom print function' Comment.Single
+'\n    '      Text.Whitespace
+'print:'      Name.Label
+' '           Text.Whitespace
+'['           Punctuation
+'\n        '  Text.Whitespace
+'render'      Name.Builtin
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'NAME: '      Literal.String
+'|'           Literal.String.Interpol
+'this'        Name.Builtin.Pseudo
+'\\name'      Name.Property
+'|'           Literal.String.Interpol
+', SURNAME: ' Literal.String
+'|'           Literal.String.Interpol
+'this'        Name.Builtin.Pseudo
+'\\surname'   Name.Property
+'|'           Literal.String.Interpol
+', AGE: '     Literal.String
+'|'           Literal.String.Interpol
+'this'        Name.Builtin.Pseudo
+'\\age'       Name.Property
+'|'           Literal.String.Interpol
+'"'           Literal.String.Double
+'\n    '      Text.Whitespace
+']'           Punctuation
+'\n\n    '    Text.Whitespace
+'; custom comparison operator' Comment.Single
+'\n    '      Text.Whitespace
+'compare:'    Name.Label
+' '           Text.Whitespace
+"'age"        Keyword.Declaration
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n\n'        Text.Whitespace
+
+'; create a method for our custom type' Comment.Single
+'\n'          Text.Whitespace
+
+'sayHello:'   Name.Label
+' '           Text.Whitespace
+'function'    Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'this'        Name.Builtin.Pseudo
+']'           Punctuation
+'['           Punctuation
+'\n    '      Text.Whitespace
+'ensure'      Name.Builtin
+' '           Text.Whitespace
+'->'          Name.Decorator
+' '           Text.Whitespace
+'is?'         Name.Builtin
+' '           Text.Whitespace
+':person'     Keyword.Type
+' '           Text.Whitespace
+'this'        Name.Builtin.Pseudo
+'\n\n    '    Text.Whitespace
+'print'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'Hello'       Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'this'        Name.Builtin.Pseudo
+'\\name'      Name.Property
+']'           Punctuation
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n\n'        Text.Whitespace
+
+'; create new objects of our custom type' Comment.Single
+'\n'          Text.Whitespace
+
+'a:'          Name.Label
+' '           Text.Whitespace
+'to'          Name.Builtin
+' '           Text.Whitespace
+':person'     Keyword.Type
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'John'        Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'Doe'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'34'          Literal.Number.Integer
+']'           Punctuation
+'                 ' Text.Whitespace
+'; let\'s create 2 "Person"s' Comment.Single
+'\n'          Text.Whitespace
+
+'b:'          Name.Label
+' '           Text.Whitespace
+'to'          Name.Builtin
+' '           Text.Whitespace
+':person'     Keyword.Type
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+'jane'        Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'Doe'         Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'33'          Literal.Number.Integer
+']'           Punctuation
+'                 ' Text.Whitespace
+'; and another one' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; call pseudo-inner method' Comment.Single
+'\n'          Text.Whitespace
+
+'sayHello'    Name
+' '           Text.Whitespace
+'a'           Name
+'                                      ' Text.Whitespace
+'; Hello John' Comment.Single
+'\n'          Text.Whitespace
+
+'sayHello'    Name
+' '           Text.Whitespace
+'b'           Name
+'                                      ' Text.Whitespace
+'; Hello Jane' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; access object fields' Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+"The first person's name is:" Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'a'           Name
+'\\name'      Name.Property
+']'           Punctuation
+'    '        Text.Whitespace
+"; The first person's name is: John" Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'['           Punctuation
+'"'           Literal.String.Double
+"The second person's name is:" Literal.String
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'b'           Name
+'\\name'      Name.Property
+']'           Punctuation
+'   '         Text.Whitespace
+"; The second person's name is: Jane" Comment.Single
+'\n\n'        Text.Whitespace
+
+'; changing object fields' Comment.Single
+'\n'          Text.Whitespace
+
+'a'           Name
+'\\name:'     Name.Property
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'Bob'         Literal.String
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+'sayHello'    Name
+' '           Text.Whitespace
+'a'           Name
+'                                      ' Text.Whitespace
+'; Hello Bob' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; verifying object type' Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'type'        Name.Builtin
+' '           Text.Whitespace
+'a'           Name
+'                                    ' Text.Whitespace
+'; :person'   Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'is?'         Name.Builtin
+' '           Text.Whitespace
+':person'     Keyword.Type
+' '           Text.Whitespace
+'a'           Name
+'                             ' Text.Whitespace
+'; true'      Comment.Single
+'\n\n'        Text.Whitespace
+
+'; printing objects' Comment.Single
+'\n'          Text.Whitespace
+
+'print'       Name.Builtin
+' '           Text.Whitespace
+'a'           Name
+'                                         ' Text.Whitespace
+'; NAME: John, SURNAME: Doe, AGE: 34' Comment.Single
+'\n\n'        Text.Whitespace
+
+'; sorting user objects (using custom comparator)' Comment.Single
+'\n'          Text.Whitespace
+
+'sort'        Name.Builtin
+' '           Text.Whitespace
+'@'           Name.Decorator
+'['           Punctuation
+'a'           Name
+' '           Text.Whitespace
+'b'           Name
+']'           Punctuation
+'                                     ' Text.Whitespace
+'; Jane..., John...' Comment.Single
+'\n'          Text.Whitespace
+
+'sort'        Name.Builtin
+'.descending' Name.Attribute
+' '           Text.Whitespace
+'@'           Name.Decorator
+'['           Punctuation
+'a'           Name
+' '           Text.Whitespace
+'b'           Name
+']'           Punctuation
+'                          ' Text.Whitespace
+'; John..., Jane...' Comment.Single
+'\n\n'        Text.Whitespace
+
+'eofString:'  Name.Label
+'\n'          Text.Whitespace
+
+'---'         Literal.String.Single
+"\nI'm an end of file\nMultiline string.\n" Literal.String
+
+''            Literal.String.Single
diff --git a/tests/examplefiles/aspx-cs/aspx-cs_example.output b/tests/examplefiles/aspx-cs/aspx-cs_example.output
index 401aec2cd4..3630b9c143 100644
--- a/tests/examplefiles/aspx-cs/aspx-cs_example.output
+++ b/tests/examplefiles/aspx-cs/aspx-cs_example.output
@@ -3,17 +3,17 @@
 'Page'        Name
 ' '           Text.Whitespace
 'Language'    Name
-'='           Punctuation
+'='           Operator
 '"C#"'        Literal.String
 ' '           Text.Whitespace
 '%>'          Name.Tag
-'\n \n'       Text
+'\n \n'       Text.Whitespace
 
 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\n"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' Comment.Preproc
-'\n \n'       Text
+'\n \n'       Text.Whitespace
 
 '<script'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'runat='      Name.Attribute
 '"server"'    Literal.String
 '>'           Name.Tag
@@ -49,7 +49,7 @@
 '.'           Punctuation
 'Text'        Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'DateTime'    Name
 '.'           Punctuation
@@ -69,62 +69,72 @@
 '\n'          Text.Whitespace
 
 '</script>'   Name.Tag
-'\n \n'       Text
+'\n \n'       Text.Whitespace
 
 '<html'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'xmlns='      Name.Attribute
 '"http://www.w3.org/1999/xhtml"' Literal.String
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<head'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'runat='      Name.Attribute
 '"server"'    Literal.String
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<title'      Name.Tag
 '>'           Name.Tag
-'Sample page' Text
+'Sample'      Text
+' '           Text.Whitespace
+'page'        Text
 '</title>'    Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</head>'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<body'       Name.Tag
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<form'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'id='         Name.Attribute
 '"form1"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'runat='      Name.Attribute
 '"server"'    Literal.String
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<div'        Name.Tag
 '>'           Name.Tag
-'\n        The current time is: ' Text
+'\n        '  Text.Whitespace
+'The'         Text
+' '           Text.Whitespace
+'current'     Text
+' '           Text.Whitespace
+'time'        Text
+' '           Text.Whitespace
+'is:'         Text
+' '           Text.Whitespace
 '<asp:Label'  Name.Tag
-' '           Text
+' '           Text.Whitespace
 'runat='      Name.Attribute
 '"server"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'id='         Name.Attribute
 '"Label1"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</div>'      Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</form>'     Name.Tag
-'\n \n'       Text
+'\n \n'       Text.Whitespace
 
 '</body>'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</html>'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/aspx-vb/example2.aspx.output b/tests/examplefiles/aspx-vb/example2.aspx.output
index 95b5bbfbfc..19e5affca0 100644
--- a/tests/examplefiles/aspx-vb/example2.aspx.output
+++ b/tests/examplefiles/aspx-vb/example2.aspx.output
@@ -21,16 +21,16 @@
 '"'           Literal.String
 ' '           Text.Whitespace
 '%>'          Name.Tag
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '<html'       Name.Tag
 '>'           Name.Tag
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '<script'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'language='   Name.Attribute
 '"VB"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'runat='      Name.Attribute
 '"server"'    Literal.String
 '>'           Name.Tag
@@ -78,60 +78,70 @@
 'Sub'         Keyword
 '\n\n  '      Text.Whitespace
 '</script>'   Name.Tag
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '<body'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'style='      Name.Attribute
 '"font: 10pt verdana"' Literal.String
 '>'           Name.Tag
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '<h3'         Name.Tag
 '>'           Name.Tag
-'A Simple User Control w/ Properties' Text
+'A'           Text
+' '           Text.Whitespace
+'Simple'      Text
+' '           Text.Whitespace
+'User'        Text
+' '           Text.Whitespace
+'Control'     Text
+' '           Text.Whitespace
+'w/'          Text
+' '           Text.Whitespace
+'Properties'  Text
 '</h3>'       Name.Tag
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '<form'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'runat='      Name.Attribute
 '"server"'    Literal.String
 '>'           Name.Tag
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '<Acme:Message' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'id='         Name.Attribute
 '"MyMessage"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'MessageText=' Name.Attribute
 '"This is a custom message!"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'Color='      Name.Attribute
 '"blue"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'runat='      Name.Attribute
 '"server"'    Literal.String
 '/>'          Name.Tag
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '<p'          Name.Tag
 '>'           Name.Tag
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '<asp:button' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'text='       Name.Attribute
 '"Change Properties"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'OnClick='    Name.Attribute
 '"SubmitBtn_Click"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'runat='      Name.Attribute
 'server/'     Literal.String
 '>'           Name.Tag
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '</form>'     Name.Tag
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '</body>'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</html>'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/autoit/autoit_submit.au3.output b/tests/examplefiles/autoit/autoit_submit.au3.output
index 9ffa044386..06c82ccfed 100644
--- a/tests/examplefiles/autoit/autoit_submit.au3.output
+++ b/tests/examplefiles/autoit/autoit_submit.au3.output
@@ -5,7 +5,7 @@
 '.'           Operator
 'au3'         Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ';http://msdn.microsoft.com/en-us/library/Aa752084.aspx\n' Comment.Single
 
@@ -14,9 +14,9 @@
 '"'           Literal.String
 'http://localhost:5000/' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$oIE'        Name.Variable
 ' '           Text
@@ -42,7 +42,7 @@
 '$_IEStatus_NoMatch' Name.Variable
 ' '           Text
 'Then'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '$oIE'        Name.Variable
@@ -63,9 +63,9 @@
 '\n'          Text
 
 'endIf'       Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$oForm'      Name.Variable
 ' '           Text
@@ -81,7 +81,7 @@
 'form1'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ';username, call DOM directly\n' Comment.Single
 
@@ -101,7 +101,7 @@
 '"'           Literal.String
 'helloAutoIT' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 ';state select\n' Comment.Single
 
@@ -119,7 +119,7 @@
 'state'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '_IEFormElementOptionSelect' Name
 ' '           Text
@@ -139,7 +139,7 @@
 'byText'      Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ';options raido\n' Comment.Single
 
@@ -165,9 +165,9 @@
 'byValue'     Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$myvar'      Name.Variable
 ' '           Text
@@ -176,12 +176,12 @@
 "'"           Literal.String
 'boo; bar; "baz"' Literal.String
 "'"           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#cs\nConsoleWrite(@Error)\nSleep(10000)\n#ce' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '_IEFormSubmit' Name
 '('           Punctuation
@@ -190,22 +190,22 @@
 ' '           Text
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '_IELoadWait' Name
 '('           Punctuation
 '$oIE'        Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Sleep'       Name.Function
 '('           Punctuation
 '60000'       Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '_IEQuit'     Name
 '('           Punctuation
 '$oIE'        Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/bash/example.sh.output b/tests/examplefiles/bash/example.sh.output
index ccfc2e7108..96f5acb164 100644
--- a/tests/examplefiles/bash/example.sh.output
+++ b/tests/examplefiles/bash/example.sh.output
@@ -1,29 +1,29 @@
 '#!/bin/bash\n' Comment.Hashbang
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"%d %s\\n"'  Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"%d %s\\n"'  Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '$(('         Keyword
 '10#1'        Literal.Number
 '))'          Keyword
-' '           Text
+' '           Text.Whitespace
 '"bar"'       Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'let'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'm = 10#'     Literal.String.Double
 '${'          Literal.String.Interpol
@@ -34,12 +34,12 @@
 '2'           Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$m'          Name.Variable
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'm'           Name.Variable
 '='           Operator
@@ -52,9 +52,9 @@
 ':'           Punctuation
 '3'           Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '10#'         Literal.Number
 '${'          Literal.String.Interpol
 '1'           Name.Variable
@@ -64,12 +64,12 @@
 '3'           Name.Variable
 '}'           Literal.String.Interpol
 '))'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$m'          Name.Variable
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'm'           Name.Variable
 '='           Operator
@@ -83,12 +83,12 @@
 '3'           Name.Variable
 '}'           Literal.String.Interpol
 '))'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$m'          Name.Variable
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'm'           Name.Variable
 '='           Operator
@@ -96,33 +96,33 @@
 '10#'         Literal.Number
 '$1'          Name.Variable
 '))'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$m'          Name.Variable
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'm'           Name.Variable
 '='           Operator
 '$(('         Keyword
 '10#1'        Literal.Number
 '))'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$m'          Name.Variable
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'm'           Name.Variable
 '='           Operator
 '$(('         Keyword
 '10'          Literal.Number
 '))'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$m'          Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/bash/ltmain.sh.output b/tests/examplefiles/bash/ltmain.sh.output
index dde06906c7..fbfdf65de4 100644
--- a/tests/examplefiles/bash/ltmain.sh.output
+++ b/tests/examplefiles/bash/ltmain.sh.output
@@ -48,12 +48,12 @@
 
 '# the same distribution terms that you use for the rest of that program.\n' Comment.Single
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'basename'    Name.Variable
 '='           Operator
 '"s,^.*/,,g"' Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh\n' Comment.Single
 
@@ -70,24 +70,24 @@
 '"'           Literal.String.Double
 '$0'          Name.Variable
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# define SED for historic ltconfig's generated by Libtool 1.3\n" Comment.Single
 
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$SED'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'SED'         Name.Variable
 '='           Operator
 'sed'         Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# The name of this program:\n' Comment.Single
 
@@ -95,227 +95,227 @@
 '='           Operator
 '`'           Literal.String.Backtick
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$progpath'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$SED'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$basename'   Name.Variable
 '`'           Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
 'modename'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$progname'   Name.Variable
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Global variables:\n' Comment.Single
 
 'EXIT_SUCCESS' Name.Variable
 '='           Operator
 '0'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'EXIT_FAILURE' Name.Variable
 '='           Operator
 '1'           Literal.Number
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'PROGRAM'     Name.Variable
 '='           Operator
 'ltmain.sh'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PACKAGE'     Name.Variable
 '='           Operator
 'libtool'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'VERSION'     Name.Variable
 '='           Operator
 '1'           Literal.Number
 '.5.22'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TIMESTAMP'   Name.Variable
 '='           Operator
 '" (1.1220.2.365 2005/12/18 22:14:06)"' Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# See if we are running on zsh, and set the options which allow our\n' Comment.Single
 
 '# commands through without removal of \\ escapes.\n' Comment.Single
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'ZSH_VERSION' Name.Variable
 '+set'        Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'setopt'      Text
-' '           Text
+' '           Text.Whitespace
 'NO_GLOB_SUBST' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Same for EGREP, and just to be sure, do LTCC as well\n' Comment.Single
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$EGREP'      Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'X'           Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'EGREP'       Name.Variable
 '='           Operator
 'egrep'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$LTCC'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'X'           Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'LTCC'        Name.Variable
 '='           Operator
 '${'          Literal.String.Interpol
 'CC'          Name.Variable
 '-gcc'        Punctuation
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Check that we have a working $echo.\n' Comment.Single
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$1'          Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'X--no-reexec' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Discard the --no-reexec flag, and continue.\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'shift'       Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$1'          Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'X--fallback-echo' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Avoid inline document here, it may be left over\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X`('         Literal.String.Double
 '$echo'       Name.Variable
 " '\\t') 2>/dev/null`" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'X\\t'"      Literal.String.Single
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Yippee, $echo works!\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Restart under the correct shell, and then maybe $echo will work.\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'exec'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$SHELL'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$progpath'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '--no-reexec' Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 '1'           Name.Variable
 '+'           Punctuation
@@ -323,47 +323,47 @@
 '$@'          Name.Variable
 '"'           Literal.String.Double
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$1'          Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'X--fallback-echo' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# used as fallback echo\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'shift'       Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '<<EOF\n$*\nEOF' Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_SUCCESS' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'default_mode' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'help'        Name.Variable
 '='           Operator
@@ -372,27 +372,27 @@
 '$progname'   Name.Variable
 " --help' for more information." Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'magic'       Name.Variable
 '='           Operator
 '"%%%MAGIC variable%%%"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'mkdir'       Name.Variable
 '='           Operator
 '"mkdir"'     Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'mv'          Name.Variable
 '='           Operator
 '"mv -f"'     Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'rm'          Name.Variable
 '='           Operator
 '"rm -f"'     Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Sed substitution that helps us do robust quoting.  It backslashifies\n' Comment.Single
 
@@ -406,71 +406,71 @@
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
 "' -e 1s/^X//'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sed_quote_subst' Name.Variable
 '='           Operator
 '\'s/\\([\\\\`\\\\"$\\\\\\\\]\\)/\\\\\\1/g\'' Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# test EBCDIC or ASCII\n' Comment.Single
 
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'X'           Text
 '|'           Punctuation
 'tr'          Text
-' '           Text
+' '           Text.Whitespace
 'X'           Text
-' '           Text
+' '           Text.Whitespace
 "'\\101'"     Literal.String.Single
 '`'           Literal.String.Backtick
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n '         Text
+'\n '         Text.Whitespace
 'A'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '# ASCII based system\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 '# \\n is not interpreted correctly by Solaris 8 /usr/ucb/tr\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'SP2NL'       Name.Variable
 '='           Operator
 "'tr \\040 \\012'" Literal.String.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'NL2SP'       Name.Variable
 '='           Operator
 "'tr \\015\\012 \\040\\040'" Literal.String.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n '         Text
+'\n '         Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '# EBCDIC based system\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'SP2NL'       Name.Variable
 '='           Operator
 "'tr \\100 \\n'" Literal.String.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'NL2SP'       Name.Variable
 '='           Operator
 "'tr \\r\\n \\100\\100'" Literal.String.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'esac'        Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# NLS nuisances.\n' Comment.Single
 
@@ -483,87 +483,87 @@
 '# We save the old values to restore during execute mode.\n' Comment.Single
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'LC_ALL'      Name.Variable
 '+set'        Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'set'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'save_LC_ALL' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$LC_ALL'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'LC_ALL'      Name.Variable
 '='           Operator
 'C'           Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'export'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'LC_ALL'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'LANG'        Name.Variable
 '+set'        Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'set'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'save_LANG'   Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$LANG'       Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'LANG'        Name.Variable
 '='           Operator
 'C'           Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'export'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'LANG'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Make sure IFS has a sensible default\n' Comment.Single
 
 'lt_nl'       Name.Variable
 '='           Operator
 "'\n'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'IFS'         Name.Variable
 '='           Operator
@@ -571,116 +571,116 @@
 ' \t'         Literal.String.Double
 '$lt_nl'      Name.Variable
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_old_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': not configured to build any kind of library' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Fatal configuration error.  See the ' Literal.String.Double
 '$PACKAGE'    Name.Variable
 ' docs for more information.' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Global variables.\n' Comment.Single
 
 'mode'        Name.Variable
 '='           Operator
 '$default_mode' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'nonopt'      Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'prev'        Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'prevopt'     Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'run'         Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'show'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$echo'       Name.Variable
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'show_help'   Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'execute_dlfiles' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'duplicate_deps' Name.Variable
 '='           Operator
 'no'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'preserve_args' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'lo2o'        Name.Variable
 '='           Operator
@@ -691,7 +691,7 @@
 '}'           Literal.String.Interpol
 '/'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'o2lo'        Name.Variable
 '='           Operator
@@ -702,177 +702,177 @@
 '}'           Literal.String.Interpol
 '\\$/.lo/'    Literal.String.Double
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$max_cmd_len' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name.Variable
 '='           Operator
 '0'           Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 'testring'    Name.Variable
 '='           Operator
 '"ABCD"'      Literal.String.Double
-'\n  '        Text
+'\n  '        Text.Whitespace
 'new_result'  Name.Variable
 '='           Operator
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 "# If test is not a shell built-in, we'll probably end up computing a\n" Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 '# maximum length that is only half of the actual maximum length, but\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 "# we can't tell.\n" Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"X"'         Literal.String.Double
 '`'           Literal.String.Backtick
 '$SHELL'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$0'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '--fallback-echo' Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$testring'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>/dev/null'  Text
 '`'           Literal.String.Backtick
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'             ' Text
+'             ' Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'XX'          Literal.String.Double
 '$testring'   Name.Variable
 '"'           Literal.String.Double
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'new_result'  Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'expr'        Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$testring'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ':'           Text
-' '           Text
+' '           Text.Whitespace
 '".*"'        Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '1'           Literal.Number
 '`'           Literal.String.Backtick
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'max_cmd_len' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$new_result' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$i'          Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '17'          Literal.Number
-' '           Text
+' '           Text.Whitespace
 '# 1/2 MB should be enough\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'i'           Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'expr'        Text
-' '           Text
+' '           Text.Whitespace
 '$i'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Text
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '`'           Literal.String.Backtick
-'\n    '      Text
+'\n    '      Text.Whitespace
 'testring'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$testring'   Name.Variable
 '$testring'   Name.Variable
 '"'           Literal.String.Double
-'\n  '        Text
+'\n  '        Text.Whitespace
 'done'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'testring'    Name.Variable
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Add a significant safety factor because C++ compilers can tack on massive\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 '# amounts of additional arguments before passing them to the linker.\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 '# It appears as though 1/2 is a usable value.\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'max_cmd_len' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'expr'        Text
-' '           Text
+' '           Text.Whitespace
 '$max_cmd_len' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '\\/'         Literal.String.Escape
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '`'           Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '#####################################\n' Comment.Single
 
@@ -880,7 +880,7 @@
 
 '# This seems to be the best place for them\n' Comment.Single
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# func_mktempdir [string]\n' Comment.Single
 
@@ -891,13 +891,13 @@
 '# given, STRING is the basename for that directory.\n' Comment.Single
 
 'func_mktempdir' Text
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 ')'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my_template' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -912,25 +912,25 @@
 '$progname'   Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '":"'         Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 "# Return a directory name, but don't create it in dry-run mode\n" Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'my_tmpdir'   Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -940,48 +940,48 @@
 '-'           Literal.String.Double
 '$$'          Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# If mktemp works, use that first and foremost\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'my_tmpdir'   Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'mktemp'      Text
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'my_template' Name.Variable
 '}'           Literal.String.Interpol
 '-XXXXXXXX'   Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>/dev/null'  Text
 '`'           Literal.String.Backtick
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_tmpdir'  Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Failing that, at least try and use $RANDOM to avoid a race\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'my_tmpdir'   Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -995,79 +995,79 @@
 '}'           Literal.String.Interpol
 '$$'          Name.Variable
 '"'           Literal.String.Double
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'save_mktempdir_umask' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'umask'       Name.Builtin
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'umask'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '0077'        Literal.Number
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$mkdir'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_tmpdir'  Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'umask'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$save_mktempdir_umask' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 "# If we're not in dry-run mode, bomb out on failure\n" Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_tmpdir'  Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'cannot create temporary directory \\`' Literal.String.Double
 '$my_tmpdir'  Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 '}'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$my_tmpdir'  Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# func_win32_libid arg\n' Comment.Single
 
@@ -1082,36 +1082,36 @@
 '# that is supplied when $file_magic_command is called.\n' Comment.Single
 
 'func_win32_libid' Text
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 ')'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win32_libid_type' Name.Variable
 '='           Operator
 '"unknown"'   Literal.String.Double
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win32_fileres' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'file'        Text
-' '           Text
+' '           Text.Whitespace
 '-L'          Text
-' '           Text
+' '           Text.Whitespace
 '$1'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>/dev/null'  Text
 '`'           Literal.String.Backtick
-'\n  '        Text
+'\n  '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$win32_fileres' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '*ar'         Text
 '\\ '         Literal.String.Escape
 'archive'     Text
@@ -1120,145 +1120,145 @@
 '\\ '         Literal.String.Escape
 'library*'    Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '# definitely import\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'win32_libid_type' Name.Variable
 '='           Operator
 '"x86 archive import"' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '*ar'         Text
 '\\ '         Literal.String.Escape
 'archive*'    Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '# could be an import, or static\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$OBJDUMP'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '$1'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$SED'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'10q'"       Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'      '      Text
+'      '      Text.Whitespace
 '$EGREP'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'file format pe-i386(.*architecture: i386)?'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win32_nmres' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$NM'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 'posix'       Text
-' '           Text
+' '           Text.Whitespace
 '-A'          Text
-' '           Text
+' '           Text.Whitespace
 '$1'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$SED'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'1,100{/ I /{s,.*,import,;p;q;};}'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$win32_nmres' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'import*'     Text
 ')'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'win32_libid_type' Name.Variable
 '='           Operator
 '"x86 archive import"' Literal.String.Double
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '*'           Text
 ')'           Operator
-'        '    Text
+'        '    Text.Whitespace
 'win32_libid_type' Name.Variable
 '='           Operator
 '"x86 archive static"' Literal.String.Double
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '*DLL*'       Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win32_libid_type' Name.Variable
 '='           Operator
 '"x86 DLL"'   Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '*executable*' Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '# but shell scripts are "executable" too...\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$win32_fileres' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*MS'         Text
 '\\ '         Literal.String.Escape
 'Windows'     Text
@@ -1267,28 +1267,28 @@
 '\\ '         Literal.String.Escape
 'Intel*'      Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win32_libid_type' Name.Variable
 '='           Operator
 '"x86 DLL"'   Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'esac'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$win32_libid_type' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# func_infer_tag arg\n' Comment.Single
 
@@ -1303,56 +1303,56 @@
 "# arg is usually of the form 'gcc ...'\n" Comment.Single
 
 'func_infer_tag' Text
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 ')'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$available_tags' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$tagname'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'CC_quoted'   Name.Variable
 '='           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'arg'         Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$CC'         Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -1382,7 +1382,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -1390,12 +1390,12 @@
 '$arg'        Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'CC_quoted'   Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -1403,38 +1403,38 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'done'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# Blanks in the command may have been stripped by the calling shell,\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# but not from the CC environment variable when configure was run.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$CC'         Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$CC'         Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' `'          Literal.String.Double
 '$echo'       Name.Variable
@@ -1443,9 +1443,9 @@
 '` '          Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '`'           Literal.String.Double
 '$echo'       Name.Variable
@@ -1454,25 +1454,25 @@
 '` '          Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$CC_quoted'  Name.Variable
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$CC_quoted'  Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' `'          Literal.String.Double
 '$echo'       Name.Variable
@@ -1481,9 +1481,9 @@
 '` '          Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '`'           Literal.String.Double
 '$echo'       Name.Variable
@@ -1493,58 +1493,58 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# Blanks at the start of $base_compile will cause this to fail\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 "# if we don't check for them as well.\n" Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'z'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$available_tags' Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'grep'        Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '^# ### BEGIN LIBTOOL TAG CONFIG: ' Literal.String.Double
 '$z'          Name.Variable
 '$'           Text
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '<'           Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$progpath'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '/dev/null'   Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Evaluate the configuration.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '`'           Literal.String.Double
 '${'          Literal.String.Interpol
@@ -1562,30 +1562,30 @@
 '$progpath'   Name.Variable
 '`'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'CC_quoted'   Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'arg'         Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$CC'         Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Double-quote args containing other shell metacharacters.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -1615,7 +1615,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -1623,12 +1623,12 @@
 '$arg'        Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'CC_quoted'   Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -1636,27 +1636,27 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'done'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 "# user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'\n" Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'trimedcc'    Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'CC'          Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$SED'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 's/'          Literal.String.Double
 '${'          Literal.String.Interpol
@@ -1665,10 +1665,10 @@
 '-//g'        Literal.String.Double
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'extendcc'    Name.Variable
 '='           Operator
 '${'          Literal.String.Interpol
@@ -1678,13 +1678,13 @@
 '${'          Literal.String.Interpol
 'CC'          Name.Variable
 '}'           Literal.String.Interpol
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc  \n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# (Gentoo-specific hack because we always export $CHOST)\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'mungedcc'    Name.Variable
 '='           Operator
 '${'          Literal.String.Interpol
@@ -1698,26 +1698,26 @@
 '${'          Literal.String.Interpol
 'trimedcc'    Name.Variable
 '}'           Literal.String.Interpol
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$@'          Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '"cc "'       Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" cc "'      Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'host'        Name.Variable
@@ -1725,9 +1725,9 @@
 '-cc '        Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '${'          Literal.String.Interpol
@@ -1739,17 +1739,17 @@
 '|'           Punctuation
 '\\\n'        Literal.String.Escape
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 '"gcc "'      Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" gcc "'     Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'host'        Name.Variable
@@ -1757,9 +1757,9 @@
 '-gcc '       Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '${'          Literal.String.Interpol
@@ -1769,33 +1769,33 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'tagname'     Name.Variable
 '='           Operator
 'CC'          Text
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'break'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '"'           Literal.String.Double
 '$trimedcc'   Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$trimedcc'   Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '`'           Literal.String.Double
 '$echo'       Name.Variable
@@ -1804,9 +1804,9 @@
 '` '          Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' `'          Literal.String.Double
 '$echo'       Name.Variable
@@ -1818,24 +1818,24 @@
 '|'           Punctuation
 '\\\n'        Literal.String.Escape
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 '"'           Literal.String.Double
 '$extendcc'   Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$extendcc'   Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '`'           Literal.String.Double
 '$echo'       Name.Variable
@@ -1844,9 +1844,9 @@
 '` '          Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' `'          Literal.String.Double
 '$echo'       Name.Variable
@@ -1858,24 +1858,24 @@
 '|'           Punctuation
 '\\\n'        Literal.String.Escape
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 '"'           Literal.String.Double
 '$mungedcc'   Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$mungedcc'   Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '`'           Literal.String.Double
 '$echo'       Name.Variable
@@ -1884,9 +1884,9 @@
 '` '          Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' `'          Literal.String.Double
 '$echo'       Name.Variable
@@ -1898,24 +1898,24 @@
 '|'           Punctuation
 '\\\n'        Literal.String.Escape
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$CC'         Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$CC'         Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' `'          Literal.String.Double
 '$echo'       Name.Variable
@@ -1924,9 +1924,9 @@
 '` '          Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '`'           Literal.String.Double
 '$echo'       Name.Variable
@@ -1935,25 +1935,25 @@
 '` '          Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$CC_quoted'  Name.Variable
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$CC_quoted'  Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' `'          Literal.String.Double
 '$echo'       Name.Variable
@@ -1962,9 +1962,9 @@
 '` '          Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '`'           Literal.String.Double
 '$echo'       Name.Variable
@@ -1974,122 +1974,122 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '# The compiler in the base compile command matches\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 '# the one in the tagged configuration.\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 '# Assume this is the tagged configuration we want.\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'tagname'     Name.Variable
 '='           Operator
 '$z'          Name.Variable
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'break'       Name.Builtin
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'done'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 "# If $tagname still isn't set, then no tagged configuration\n" Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# was found and let the user know that the "--tag" command\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# line option must be used.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$tagname'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': unable to infer tagged configuration' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": specify a tag with \\`--tag'" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#        else\n' Comment.Single
 
 '#          $echo "$modename: using $tagname tagged configuration"\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# func_extract_an_archive dir oldlib\n' Comment.Single
 
 'func_extract_an_archive' Text
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 ')'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'f_ex_an_ar_dir' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$1'          Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shift'       Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'f_ex_an_ar_oldlib' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$1'          Name.Variable
 '"'           Literal.String.Double
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '(cd '        Literal.String.Double
 '$f_ex_an_ar_dir' Name.Variable
@@ -2099,61 +2099,61 @@
 '$f_ex_an_ar_oldlib' Name.Variable
 ')'           Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '(cd \\$f_ex_an_ar_dir && ' Literal.String.Double
 '$AR'         Name.Variable
 ' x \\$f_ex_an_ar_oldlib)' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$?'          Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 '$AR'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 't'           Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$f_ex_an_ar_oldlib' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sort'        Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sort'        Text
-' '           Text
+' '           Text.Whitespace
 '-uc'         Text
-' '           Text
+' '           Text.Whitespace
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '1'           Literal.Number
 ')'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n     '     Text
+'\n     '     Text.Whitespace
 ':'           Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': ERROR: object name conflicts: ' Literal.String.Double
@@ -2161,41 +2161,41 @@
 '/'           Literal.String.Double
 '$f_ex_an_ar_oldlib' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# func_extract_archives gentop oldlib ...\n' Comment.Single
 
 'func_extract_archives' Text
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 ')'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my_gentop'   Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$1'          Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shift'       Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my_oldlibs'  Name.Variable
 '='           Operator
 '${'          Literal.String.Interpol
@@ -2205,29 +2205,29 @@
 '$@'          Name.Variable
 '"'           Literal.String.Double
 '}'           Literal.String.Interpol
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my_oldobjs'  Name.Variable
 '='           Operator
 '""'          Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my_xlib'     Name.Variable
 '='           Operator
 '""'          Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my_xabs'     Name.Variable
 '='           Operator
 '""'          Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my_xdir'     Name.Variable
 '='           Operator
 '""'          Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my_status'   Name.Variable
 '='           Operator
 '""'          Literal.String.Double
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'rm'          Name.Variable
@@ -2235,99 +2235,99 @@
 'r '          Literal.String.Double
 '$my_gentop'  Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'rm'          Name.Variable
 '}'           Literal.String.Interpol
 'r'           Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_gentop'  Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mkdir'      Name.Variable
 ' '           Literal.String.Double
 '$my_gentop'  Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$mkdir'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_gentop'  Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my_status'   Name.Variable
 '='           Operator
 '$?'          Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_status'  Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-ne'         Text
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_gentop'  Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$my_status'  Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'my_xlib'     Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$my_oldlibs' Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# Extract the objects.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$my_xlib'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '['           Operator
 '\\\\'        Literal.String.Escape
 '/'           Text
 ']'           Operator
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'A-Za-z'      Text
 ']'           Operator
@@ -2338,19 +2338,19 @@
 ']'           Operator
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'my_xabs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$my_xlib'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'my_xabs'     Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
@@ -2360,31 +2360,31 @@
 '/'           Literal.String.Double
 '$my_xlib'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'my_xlib'     Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$my_xlib'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%^.*/%%'"  Literal.String.Single
 '`'           Literal.String.Backtick
-'\n      '    Text
+'\n      '    Text.Whitespace
 'my_xdir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -2392,9 +2392,9 @@
 '/'           Literal.String.Double
 '$my_xlib'    Name.Variable
 '"'           Literal.String.Double
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'rm'          Name.Variable
@@ -2402,230 +2402,230 @@
 'r '          Literal.String.Double
 '$my_xdir'    Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'rm'          Name.Variable
 '}'           Literal.String.Interpol
 'r'           Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_xdir'    Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mkdir'      Name.Variable
 ' '           Literal.String.Double
 '$my_xdir'    Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$mkdir'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_xdir'    Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit_status' Name.Variable
 '='           Operator
 '$?'          Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$exit_status' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-ne'         Text
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_xdir'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$exit_status' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '*-darwin*'   Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Extracting ' Literal.String.Double
 '$my_xabs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Do not bother doing anything if just a dry run\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'darwin_orig_dir' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'pwd'         Name.Builtin
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$my_xdir'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$?'          Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'darwin_archive' Name.Variable
 '='           Operator
 '$my_xabs'    Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'darwin_curdir' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'pwd'         Name.Builtin
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'darwin_base_archive' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$darwin_archive' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%^.*/%%'"  Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'darwin_arches' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'lipo'        Text
-' '           Text
+' '           Text.Whitespace
 '-info'       Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$darwin_archive' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$EGREP'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 'Architectures' Text
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>/dev/null'  Text
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$darwin_arches' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' \n\t    '   Text
+' \n\t    '   Text.Whitespace
 'darwin_arches' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$darwin_arches' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$SED'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/.*are://'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'darwin_arch' Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$darwin_base_archive' Name.Variable
 ' has multiple architectures ' Literal.String.Double
 '$darwin_arches' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'darwin_arch' Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'  '          Text
+'  '          Text.Whitespace
 '$darwin_arches' Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'mkdir'       Text
-' '           Text
+' '           Text.Whitespace
 '-p'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'unfat-'      Literal.String.Double
 '$$'          Name.Variable
@@ -2638,15 +2638,15 @@
 'darwin_arch' Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'lipo'        Text
-' '           Text
+' '           Text.Whitespace
 '-thin'       Text
-' '           Text
+' '           Text.Whitespace
 '$darwin_arch' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-output'     Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'unfat-'      Literal.String.Double
 '$$'          Name.Variable
@@ -2663,15 +2663,15 @@
 'darwin_base_archive' Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'darwin_archive' Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'unfat-'      Literal.String.Double
 '$$'          Name.Variable
@@ -2684,25 +2684,25 @@
 'darwin_arch' Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'func_extract_an_archive' Text
-' '           Text
+' '           Text.Whitespace
 '"`pwd`"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'darwin_base_archive' Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$darwin_curdir' Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'unfat-'      Literal.String.Double
 '$$'          Name.Variable
@@ -2719,175 +2719,175 @@
 'darwin_base_archive' Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'done'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# $darwin_arches\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '## Okay now we have a bunch of thin objects, gotta fatten them up :)\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'darwin_filelist' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 'unfat-'      Text
 '$$'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-type'       Text
-' '           Text
+' '           Text.Whitespace
 'f'           Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '\\*'         Literal.String.Escape
 '.o'          Text
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '\\*'         Literal.String.Escape
 '.lo'         Text
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xargs'       Text
-' '           Text
+' '           Text.Whitespace
 'basename'    Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sort'        Text
-' '           Text
+' '           Text.Whitespace
 '-u'          Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$NL2SP'      Name.Variable
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'darwin_file' Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'darwin_files' Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'darwin_file' Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$darwin_filelist' Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'darwin_files' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 'unfat-'      Text
 '$$'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '$darwin_file' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$NL2SP'      Name.Variable
 '`'           Literal.String.Backtick
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'lipo'        Text
-' '           Text
+' '           Text.Whitespace
 '-create'     Text
-' '           Text
+' '           Text.Whitespace
 '-output'     Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$darwin_file' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '$darwin_files' Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'done'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# $darwin_filelist\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '${'          Literal.String.Interpol
 'rm'          Name.Variable
 '}'           Literal.String.Interpol
 'r'           Text
-' '           Text
+' '           Text.Whitespace
 'unfat-'      Text
 '$$'          Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$darwin_orig_dir' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$darwin_orig_dir' Name.Variable
 '"'           Literal.String.Double
-'\n \t    '   Text
+'\n \t    '   Text.Whitespace
 'func_extract_an_archive' Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_xdir'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_xabs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# $darwin_arches\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# $run\n'    Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'func_extract_an_archive' Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_xdir'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$my_xabs'    Name.Variable
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'my_oldobjs'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -2896,159 +2896,159 @@
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 '$my_xdir'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '\\*'         Literal.String.Escape
 '.'           Text
 '$objext'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '\\*'         Literal.String.Escape
 '.lo'         Text
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$NL2SP'      Name.Variable
 '`'           Literal.String.Backtick
-'\n    '      Text
+'\n    '      Text.Whitespace
 'done'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'func_extract_archives_result' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$my_oldobjs' Name.Variable
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# End of Shell function definitions\n' Comment.Single
 
 '#####################################\n' Comment.Single
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Darwin sucks\n' Comment.Single
 
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'std_shrext'  Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 '$shrext_cmds' Name.Variable
 '\\"'         Literal.String.Escape
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'disable_libs' Name.Variable
 '='           Operator
 'no'          Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Parse our command line options once, thoroughly.\n' Comment.Single
 
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$#'          Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-gt'         Text
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'do'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$1'          Name.Variable
 '"'           Literal.String.Double
-'\n  '        Text
+'\n  '        Text.Whitespace
 'shift'       Name.Builtin
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '-*'          Text
 '='           Operator
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'optarg'      Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/[-_a-zA-Z0-9]*=//'" Literal.String.Single
 '`'           Literal.String.Backtick
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'optarg'      Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'esac'        Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# If the previous option needs an argument, assign it.\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$prev'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'execute_dlfiles' Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'execute_dlfiles' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -3056,19 +3056,19 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'tag'         Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'tagname'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'preserve_args' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -3078,89 +3078,89 @@
 '='           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Check whether tagname contains only valid characters\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$tagname'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '*'           Text
 '['           Operator
 '!-_A-Za-z0-9,/' Text
 ']'           Operator
 '*'           Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$progname'   Name.Variable
 ': invalid tag name: ' Literal.String.Double
 '$tagname'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$tagname'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'CC'          Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Don\'t test for the "default" C tag, as we know, it\'s there, but\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# not specially marked.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'grep'        Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '^# ### BEGIN LIBTOOL TAG CONFIG: ' Literal.String.Double
 '$tagname'    Name.Variable
 '$'           Text
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '<'           Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$progpath'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '/dev/null'   Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'taglist'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -3168,12 +3168,12 @@
 ' '           Literal.String.Double
 '$tagname'    Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# Evaluate the configuration.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '`'           Literal.String.Double
 '${'          Literal.String.Interpol
@@ -3191,81 +3191,81 @@
 '$progpath'   Name.Variable
 '`'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$progname'   Name.Variable
 ': ignoring unknown tag ' Literal.String.Double
 '$tagname'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '=\\$arg'     Literal.String.Double
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prevopt'     Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'continue'    Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'fi'          Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Have we seen a non-optional argument yet?\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '--help'      Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'show_help'   Name.Variable
 '='           Operator
 'yes'         Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--version'   Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$PROGRAM'    Name.Variable
 ' (GNU '      Literal.String.Double
@@ -3274,67 +3274,67 @@
 '$VERSION'    Name.Variable
 '$TIMESTAMP'  Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"Copyright (C) 2005  Free Software Foundation, Inc."' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"This is free software; see the source for copying conditions.  There is NO"' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$?'          Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--config'    Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'1,/^# ### BEGIN LIBTOOL CONFIG/d'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'/^# ### END LIBTOOL CONFIG/,$d'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '$progpath'   Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Now print the configurations for the tags.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'tagname'     Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$taglist'    Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '/^# ### BEGIN LIBTOOL TAG CONFIG: ' Literal.String.Double
 '$tagname'    Name.Variable
@@ -3344,36 +3344,36 @@
 '$'           Text
 '/p'          Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '<'           Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$progpath'   Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'done'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$?'          Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--debug'     Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$progname'   Name.Variable
 ': enabling shell trace mode' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-x'          Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'preserve_args' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -3381,154 +3381,154 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--dry-run'   Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'run'         Name.Variable
 '='           Operator
 ':'           Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--features'  Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'host: '      Literal.String.Double
 '$host'       Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"enable shared libraries"' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"disable shared libraries"' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_old_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"enable static libraries"' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"disable static libraries"' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$?'          Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--finish'    Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'mode'        Name.Variable
 '='           Operator
 '"finish"'    Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--mode'      Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'prevopt'     Name.Variable
 '='           Operator
 '"--mode"'    Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'mode'        Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '--mode'      Text
 '='           Operator
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'mode'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$optarg'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--preserve-dup-deps' Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'duplicate_deps' Name.Variable
 '='           Operator
 '"yes"'       Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--quiet'     Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '--silent'    Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'show'        Name.Variable
 '='           Operator
 ':'           Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'preserve_args' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -3536,44 +3536,44 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '--tag'       Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prevopt'     Name.Variable
 '='           Operator
 '"--tag"'     Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'tag'         Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'preserve_args' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$preserve_args' Name.Variable
 ' --tag'      Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '--tag'       Text
 '='           Operator
 '*'           Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'tag'         Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$optarg'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 '1'           Name.Variable
 '+'           Punctuation
@@ -3581,206 +3581,206 @@
 '$@'          Name.Variable
 '"'           Literal.String.Double
 '}'           Literal.String.Interpol
-'\n    '      Text
+'\n    '      Text.Whitespace
 'shift'       Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'tag'         Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'preserve_args' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$preserve_args' Name.Variable
 ' --tag'      Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '-dlopen'     Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prevopt'     Name.Variable
 '='           Operator
 '"-dlopen"'   Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'execute_dlfiles' Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '-*'          Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': unrecognized option \\`' Literal.String.Double
 '$arg'        Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$help'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'nonopt'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'break'       Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'esac'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'done'        Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prevopt'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': option \\`' Literal.String.Double
 '$prevopt'    Name.Variable
 "' requires an argument" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$help'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fi'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$disable_libs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'no'          Text
 ')'           Operator
-' \n  '       Text
+' \n  '       Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'shared'      Text
 ')'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'build_libtool_libs' Name.Variable
 '='           Operator
 'no'          Text
-'\n  '        Text
+'\n  '        Text.Whitespace
 'build_old_libs' Name.Variable
 '='           Operator
 'yes'         Text
-'\n  '        Text
+'\n  '        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'static'      Text
 ')'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'build_old_libs' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$build_libtool_libs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'esac'        Keyword
 '`'           Literal.String.Backtick
-'\n  '        Text
+'\n  '        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'esac'        Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# If this variable is set in any of the actions, the command in it\n' Comment.Single
 
@@ -3790,324 +3790,324 @@
 
 'exec_cmd'    Name.Variable
 '='           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$show_help'  Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Infer the operation mode.\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mode'       Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"*** Warning: inferring the mode of operation is deprecated."' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"*** Future versions of Libtool will require --mode=MODE be specified."' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$nonopt'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*cc'         Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'cc*'         Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*++'         Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'gcc*'        Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-gcc*'      Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'g++*'        Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xlc*'        Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'mode'        Name.Variable
 '='           Operator
 'link'        Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'arg'         Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 'do'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-c'          Text
 ')'           Operator
-'\n\t   '     Text
+'\n\t   '     Text.Whitespace
 'mode'        Name.Variable
 '='           Operator
 'compile'     Text
-'\n\t   '     Text
+'\n\t   '     Text.Whitespace
 'break'       Name.Builtin
-'\n\t   '     Text
+'\n\t   '     Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'done'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*db'         Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*dbx'        Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*strace'     Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*truss'      Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'mode'        Name.Variable
 '='           Operator
 'execute'     Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*install*'   Text
 '|'           Punctuation
 'cp'          Text
 '|'           Punctuation
 'mv'          Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'mode'        Name.Variable
 '='           Operator
 'install'     Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*rm'         Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'mode'        Name.Variable
 '='           Operator
 'uninstall'   Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# If we have no mode, but dlfiles were specified, then do execute mode.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$execute_dlfiles' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'mode'        Name.Variable
 '='           Operator
 'execute'     Text
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Just use the default operation mode.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mode'       Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$nonopt'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': warning: cannot infer operation mode from \\`' Literal.String.Double
 '$nonopt'     Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': warning: cannot infer operation mode without MODE-ARGS' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'fi'          Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Only execute mode is allowed to have -dlopen flags.\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$execute_dlfiles' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mode'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'execute'     Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": unrecognized option \\`-dlopen'" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$help'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n  '        Text
+'\n  '        Text.Whitespace
 'fi'          Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Change the help message to a mode-specific one.\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'generic_help' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$help'       Name.Variable
 '"'           Literal.String.Double
-'\n  '        Text
+'\n  '        Text.Whitespace
 'help'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -4117,180 +4117,180 @@
 '$mode'       Name.Variable
 "' for more information." Literal.String.Double
 '"'           Literal.String.Double
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# These modes are in order of execution frequency so that they run quickly.\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$mode'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# libtool compile mode\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'compile'     Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'modename'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': compile'   Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Get the compilation command and the source file.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'base_compile' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'srcfile'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$nonopt'     Name.Variable
 '"'           Literal.String.Double
-'  '          Text
+'  '          Text.Whitespace
 '#  always keep a non-empty value in "srcfile"\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'suppress_opt' Name.Variable
 '='           Operator
 'yes'         Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'suppress_output' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'arg_mode'    Name.Variable
 '='           Operator
 'normal'      Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'libobj'      Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'later'       Name.Variable
 '='           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'arg'         Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg_mode'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'arg'         Text
-'  '          Text
+'  '          Text.Whitespace
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# do not "continue".  Instead, add this to base_compile\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'lastarg'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'arg_mode'    Name.Variable
 '='           Operator
 'normal'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'target'      Text
-' '           Text
+' '           Text.Whitespace
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'libobj'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'arg_mode'    Name.Variable
 '='           Operator
 'normal'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'normal'      Text
-' '           Text
+' '           Text.Whitespace
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Accept any command-line options.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-o'          Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$libobj'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": you cannot specify \\`-o' more than once" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'arg_mode'    Name.Variable
 '='           Operator
 'target'      Text
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '-static'     Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-prefer-pic' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-prefer-non-pic' Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'later'       Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -4298,113 +4298,113 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '-no-suppress' Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'suppress_opt' Name.Variable
 '='           Operator
 'no'          Text
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '-Xcompiler'  Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'arg_mode'    Name.Variable
 '='           Operator
 'arg'         Text
-'  '          Text
+'  '          Text.Whitespace
 '#  the next one goes into the "base_compile" arg list\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'continue'    Keyword
-'      '      Text
+'      '      Text.Whitespace
 '#  The current "srcfile" will either be retained or\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'            ' Text
+'            ' Text.Whitespace
 '#  replaced later.  I would guess that would be a bug.\n' Comment.Single
 
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-Wc,*'       Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'args'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"s/^-Wc,//"' Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'lastarg'     Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'save_ifs'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$IFS'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 "','"         Literal.String.Single
-'\n \t  '     Text
+'\n \t  '     Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'arg'         Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$args'       Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 '# Double-quote args containing other shell metacharacters.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# Many Bourne shells cannot handle close brackets correctly\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# in scan sets, so we specify it separately.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -4434,7 +4434,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -4442,12 +4442,12 @@
 '$arg'        Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'lastarg'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -4455,37 +4455,37 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'done'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'lastarg'     Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$lastarg'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"s/^ //"'    Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 '# Add the arguments to base_compile.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'base_compile' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -4493,101 +4493,101 @@
 ' '           Literal.String.Double
 '$lastarg'    Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# Accept the current argument as the source file.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 '# The previous "srcfile" becomes the current argument.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 '#\n'         Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'lastarg'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$srcfile'    Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'srcfile'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'  '          Text
+'  '          Text.Whitespace
 '#  case $arg\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 '#  case $arg_mode\n' Comment.Single
 
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# Aesthetically quote the previous argument.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'lastarg'     Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$lastarg'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$sed_quote_subst' Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$lastarg'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# Double-quote args containing other shell metacharacters.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# Many Bourne shells cannot handle close brackets correctly\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# in scan sets, and some SunOS ksh mistreat backslash-escaping\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# in scan sets (worked around with variable expansion),\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 "# and furthermore cannot handle '|' '&' '(' ')' in scan sets \n" Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# at all, so we specify them separately.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -4617,7 +4617,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'lastarg'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -4625,12 +4625,12 @@
 '$lastarg'    Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'base_compile' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -4638,263 +4638,263 @@
 ' '           Literal.String.Double
 '$lastarg'    Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'done'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# for arg\n' Comment.Single
 
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg_mode'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'arg'         Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': you must specify an argument for -Xcompile' Literal.String.Double
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'target'      Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": you must specify a target with \\`-o'" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# Get the name of the library object.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$libobj'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'libobj'      Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$srcfile'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%^.*/%%'"  Literal.String.Single
 '`'           Literal.String.Backtick
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Recognize several different file suffixes.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 '# If the user specifies -o file.o, it is replaced with file.lo\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 "'[cCFSifmso]'" Literal.String.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$libobj'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.ada'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'ada'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.adb'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'adb'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.ads'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'ads'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.asm'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'asm'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.c++'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'c++'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.cc'        Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'cc'          Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.ii'        Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'ii'          Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.class'     Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'class'       Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.cpp'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'cpp'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.cxx'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'cxx'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.f90'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'f90'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.for'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.java'      Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xform'       Name.Variable
 '='           Operator
 'java'        Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'libobj'      Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$libobj'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 's/\\.'       Literal.String.Double
 '$xform'      Name.Variable
@@ -4902,154 +4902,154 @@
 '/.lo/'       Literal.String.Double
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$libobj'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.lo'        Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'obj'         Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$libobj'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lo2o'       Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': cannot determine name of library object from \\`' Literal.String.Double
 '$libobj'     Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'func_infer_tag' Text
-' '           Text
+' '           Text.Whitespace
 '$base_compile' Name.Variable
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'arg'         Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$later'      Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '-static'     Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'build_old_libs' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-prefer-pic' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'pic_mode'    Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-prefer-non-pic' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'pic_mode'    Name.Variable
 '='           Operator
 'no'          Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'done'        Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'qlibobj'     Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$libobj'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$sed_quote_subst' Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$qlibobj'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -5079,7 +5079,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'qlibobj'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5087,130 +5087,130 @@
 '$qlibobj'    Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$libobj'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$qlibobj'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$libobj'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'grep'        Text
-' '           Text
+' '           Text.Whitespace
 '\'[]~#^*{};<>?"\'' Literal.String.Single
 '"\'"'        Literal.String.Double
 "' \t&()|`$[]'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': libobj name \\`' Literal.String.Double
 '$libobj'     Name.Variable
 "' may not contain shell special characters." Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'objname'     Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$obj'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%^.*/%%'"  Literal.String.Single
 '`'           Literal.String.Backtick
-'\n    '      Text
+'\n    '      Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$obj'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%/[^/]*$%%'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$xdir'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$obj'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '$xdir'       Name.Variable
 '/'           Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'lobj'        Name.Variable
 '='           Operator
 '${'          Literal.String.Interpol
@@ -5219,67 +5219,67 @@
 '$objdir'     Name.Variable
 '/'           Text
 '$objname'    Name.Variable
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$base_compile' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': you must specify a compilation command' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$help'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Delete any leftover library objects.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_old_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'removelist'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5294,9 +5294,9 @@
 '}'           Literal.String.Interpol
 'T'           Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'removelist'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5309,17 +5309,17 @@
 '}'           Literal.String.Interpol
 'T'           Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$removelist' Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 'trap'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 ' '           Literal.String.Double
@@ -5329,138 +5329,138 @@
 '; exit '     Literal.String.Double
 '$EXIT_FAILURE' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '15'          Literal.Number
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# On Cygwin there\'s no "real" PIC flag so we must build both object types\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host_os'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'cygwin*'     Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'mingw*'      Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pw32*'       Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'os2*'        Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'pic_mode'    Name.Variable
 '='           Operator
 'default'     Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_mode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$deplibs_check_method' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pass_all'    Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# non-PIC code in shared libraries is not supported\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'pic_mode'    Name.Variable
 '='           Operator
 'default'     Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Calculate the filename of the output object if compiler does\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 '# not support -o with -c\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$compiler_c_o' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'output_obj'  Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$srcfile'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%^.*/%%'"  Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%\\.[^.]*$%%'" Literal.String.Single
 '`'           Literal.String.Backtick
 '.'           Text
 '${'          Literal.String.Interpol
 'objext'      Name.Variable
 '}'           Literal.String.Interpol
-'\n      '    Text
+'\n      '    Text.Whitespace
 'lockfile'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$output_obj' Name.Variable
 '.lock'       Literal.String.Double
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'removelist'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5470,9 +5470,9 @@
 ' '           Literal.String.Double
 '$lockfile'   Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'trap'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 ' '           Literal.String.Double
@@ -5482,112 +5482,112 @@
 '; exit '     Literal.String.Double
 '$EXIT_FAILURE' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '15'          Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'output_obj'  Name.Variable
 '='           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'need_locks'  Name.Variable
 '='           Operator
 'no'          Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 'lockfile'    Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Lock this critical section if it is needed\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 '# We use this script file to make the link, it avoids creating a new file\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$need_locks' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'until'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'ln'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$srcfile'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lockfile'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>/dev/null'  Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Waiting for ' Literal.String.Double
 '$lockfile'   Name.Variable
 ' to be removed' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'sleep'       Text
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 'done'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$need_locks' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'warn'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lockfile'   Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\\n*** ERROR, ' Literal.String.Double
 '$lockfile'   Name.Variable
@@ -5595,83 +5595,83 @@
 '$lockfile'   Name.Variable
 " 2>/dev/null`\n\nThis indicates that another process is trying to use the same\ntemporary object file, and libtool could not work around it because\nyour compiler does not support \\`-c' and \\`-o' together.  If you\nrepeat this compilation, it may succeed, by chance, but you had better\navoid parallel builds (make -j) in this platform, or get a better\ncompiler." Literal.String.Double
 '"'           Literal.String.Double
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$removelist' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$srcfile'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lockfile'   Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$fix_srcfile_path' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'srcfile'     Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 '$fix_srcfile_path' Name.Variable
 '\\"'         Literal.String.Escape
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'qsrcfile'    Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$srcfile'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$sed_quote_subst' Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$qsrcfile'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -5701,7 +5701,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'qsrcfile'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5709,95 +5709,95 @@
 '$qsrcfile'   Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$libobj'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'libobj'      Name.Variable
 '}'           Literal.String.Interpol
 'T'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Create a libtool object file (analogous to a ".la" file),\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 "# but don't create it if we're doing a dry run.\n" Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'libobj'      Name.Variable
 '}'           Literal.String.Interpol
 'T'           Text
-' '           Text
+' '           Text.Whitespace
 '<<EOF\n# $libobj - a libtool object file\n# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP\n#\n# Please DO NOT delete this file!\n# It is necessary for linking the library.\n\n# Name of the PIC object.\nEOF' Literal.String
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Only build a PIC object if we are building libtool libraries.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# Without this assignment, base_compile gets emptied.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'fbsd_hideous_sh_bug' Name.Variable
 '='           Operator
 '$base_compile' Name.Variable
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_mode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'command'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5807,12 +5807,12 @@
 ' '           Literal.String.Double
 '$pic_flag'   Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'else'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 "# Don't build PIC code\n" Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'command'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5820,17 +5820,17 @@
 ' '           Literal.String.Double
 '$qsrcfile'   Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'xdir'        Name.Variable
@@ -5838,11 +5838,11 @@
 '$objdir'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mkdir'      Name.Variable
 ' '           Literal.String.Double
@@ -5851,40 +5851,40 @@
 '}'           Literal.String.Interpol
 '$objdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$mkdir'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'xdir'        Name.Variable
 '}'           Literal.String.Interpol
 '$objdir'     Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit_status' Name.Variable
 '='           Operator
 '$?'          Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$exit_status' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-ne'         Text
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'xdir'        Name.Variable
@@ -5892,33 +5892,33 @@
 '$objdir'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$exit_status' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_obj' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Place PIC objects in $objdir\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'command'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5926,101 +5926,101 @@
 ' -o '        Literal.String.Double
 '$lobj'       Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lobj'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_obj' Name.Variable
 '"'           Literal.String.Double
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$command'    Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$command'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 'else'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_obj' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$removelist' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$need_locks' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'warn'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n\t '       Text
+'\n\t '       Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X`cat '      Literal.String.Double
 '$lockfile'   Name.Variable
 ' 2>/dev/null`' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$srcfile'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\\n*** ERROR, ' Literal.String.Double
 '$lockfile'   Name.Variable
@@ -6031,54 +6031,54 @@
 '$srcfile'    Name.Variable
 "\n\nThis indicates that another process is trying to use the same\ntemporary object file, and libtool could not work around it because\nyour compiler does not support \\`-c' and \\`-o' together.  If you\nrepeat this compilation, it may succeed, by chance, but you had better\navoid parallel builds (make -j) in this platform, or get a better\ncompiler." Literal.String.Double
 '"'           Literal.String.Double
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$removelist' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Just move the object if needed, then go on to compile the next one\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_obj' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$output_obj' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$lobj'       Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mv'         Name.Variable
 ' '           Literal.String.Double
@@ -6086,158 +6086,158 @@
 ' '           Literal.String.Double
 '$lobj'       Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$mv'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$output_obj' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$lobj'       Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'error'       Name.Variable
 '='           Operator
 '$?'          Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$removelist' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$error'      Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Append the name of the PIC object to the libtool object file.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '>>'          Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'libobj'      Name.Variable
 '}'           Literal.String.Interpol
 'T'           Text
-' '           Text
+' '           Text.Whitespace
 "<<EOF\npic_object='$objdir/$objname'\n\nEOF" Literal.String
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Allow error messages only from the first compilation.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$suppress_opt' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'suppress_output' Name.Variable
 '='           Operator
 "' >/dev/null 2>&1'" Literal.String.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 "# No PIC object so indicate it doesn't exist in the libtool\n" Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# object file.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '>>'          Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'libobj'      Name.Variable
 '}'           Literal.String.Interpol
 'T'           Text
-' '           Text
+' '           Text.Whitespace
 '<<EOF\npic_object=none\n\nEOF' Literal.String
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Only build a position-dependent object if we build old libraries.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_old_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_mode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 "# Don't build PIC code\n" Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'command'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -6245,9 +6245,9 @@
 ' '           Literal.String.Double
 '$qsrcfile'   Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'else'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'command'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -6257,24 +6257,24 @@
 ' '           Literal.String.Double
 '$pic_flag'   Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$compiler_c_o' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'command'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -6282,101 +6282,101 @@
 ' -o '        Literal.String.Double
 '$obj'        Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Suppress compiler output if we already did a PIC compilation.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'command'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$command'    Name.Variable
 '$suppress_output' Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$obj'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_obj' Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$command'    Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$command'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 'else'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$removelist' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$need_locks' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'warn'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n\t '       Text
+'\n\t '       Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X`cat '      Literal.String.Double
 '$lockfile'   Name.Variable
 ' 2>/dev/null`' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$srcfile'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\\n*** ERROR, ' Literal.String.Double
 '$lockfile'   Name.Variable
@@ -6387,54 +6387,54 @@
 '$srcfile'    Name.Variable
 "\n\nThis indicates that another process is trying to use the same\ntemporary object file, and libtool could not work around it because\nyour compiler does not support \\`-c' and \\`-o' together.  If you\nrepeat this compilation, it may succeed, by chance, but you had better\navoid parallel builds (make -j) in this platform, or get a better\ncompiler." Literal.String.Double
 '"'           Literal.String.Double
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$removelist' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Just move the object if needed\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_obj' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$output_obj' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$obj'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mv'         Name.Variable
 ' '           Literal.String.Double
@@ -6442,246 +6442,246 @@
 ' '           Literal.String.Double
 '$obj'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$mv'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$output_obj' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$obj'        Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'error'       Name.Variable
 '='           Operator
 '$?'          Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$removelist' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$error'      Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Append the name of the non-PIC object the libtool object file.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# Only append if the libtool object file exists.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '>>'          Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'libobj'      Name.Variable
 '}'           Literal.String.Interpol
 'T'           Text
-' '           Text
+' '           Text.Whitespace
 "<<EOF\n# Name of the non-PIC object.\nnon_pic_object='$objname'\n\nEOF" Literal.String
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# Append the name of the non-PIC object the libtool object file.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# Only append if the libtool object file exists.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '>>'          Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'libobj'      Name.Variable
 '}'           Literal.String.Interpol
 'T'           Text
-' '           Text
+' '           Text.Whitespace
 '<<EOF\n# Name of the non-PIC object.\nnon_pic_object=none\n\nEOF' Literal.String
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$mv'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'libobj'      Name.Variable
 '}'           Literal.String.Interpol
 'T'           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'libobj'      Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Unlock the critical section if it was locked\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$need_locks' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$rm'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lockfile'   Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_SUCCESS' Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# libtool link mode\n' Comment.Single
 
-'  '          Text
+'  '          Text.Whitespace
 'link'        Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'relink'      Text
 ')'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'modename'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': link'      Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*-*-cygwin*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-mingw*'  Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-pw32*'   Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-os2*'    Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# It is impossible to link a dll without this setting, and\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 "# we shouldn't force the makefile maintainer to figure out\n" Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# which system we are compiling for in order to pass an extra\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# flag for every libtool invocation.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# allow_undefined=no\n' Comment.Single
 
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# FIXME: Unfortunately, there are problems with the above when trying\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# to make a dll which has undefined symbols, in which case not\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# even a static library is built.  For now, we need to specify\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# -no-undefined on the libtool link line when we can be certain\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# that all symbols are satisfied, otherwise we get a static library.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'allow_undefined' Name.Variable
 '='           Operator
 'yes'         Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'allow_undefined' Name.Variable
 '='           Operator
 'yes'         Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'libtool_args' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$nonopt'     Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'base_compile' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -6689,364 +6689,364 @@
 ' '           Literal.String.Double
 '$@'          Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$nonopt'     Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$nonopt'     Name.Variable
 '"'           Literal.String.Double
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'compile_rpath' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'finalize_rpath' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'compile_shlibpath' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'finalize_shlibpath' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'convenience' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'old_convenience' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'old_deplibs' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'linker_flags' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'dllsearchpath' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'lib_search_path' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'pwd'         Name.Builtin
 '`'           Literal.String.Backtick
-'\n    '      Text
+'\n    '      Text.Whitespace
 'inst_prefix_dir' Name.Variable
 '='           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'avoid_version' Name.Variable
 '='           Operator
 'no'          Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'dlfiles'     Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'dlprefiles'  Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'dlself'      Name.Variable
 '='           Operator
 'no'          Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'export_dynamic' Name.Variable
 '='           Operator
 'no'          Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'export_symbols' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'export_symbols_regex' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'generated'   Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'libobjs'     Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ltlibs'      Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'module'      Name.Variable
 '='           Operator
 'no'          Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'no_install'  Name.Variable
 '='           Operator
 'no'          Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'objs'        Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'non_pic_objects' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'notinst_path' Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '# paths that contain not-installed libtool libraries\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'precious_files_regex' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prefer_static_libs' Name.Variable
 '='           Operator
 'no'          Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'preload'     Name.Variable
 '='           Operator
 'no'          Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prevarg'     Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'release'     Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'rpath'       Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'xrpath'      Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'perm_rpath'  Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'temp_rpath'  Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'thread_safe' Name.Variable
 '='           Operator
 'no'          Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'vinfo'       Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'vinfo_number' Name.Variable
 '='           Operator
 'no'          Text
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'func_infer_tag' Text
-' '           Text
+' '           Text.Whitespace
 '$base_compile' Name.Variable
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# We need to know -static, to get the right output filenames.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'arg'         Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '-all-static' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-static'     Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"X-all-static"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$link_static_flag' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': warning: complete static linking is impossible in this configuration' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$link_static_flag' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'dlopen_self' Name.Variable
 '='           Operator
 '$dlopen_self_static' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prefer_static_libs' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_flag'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$link_static_flag' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'dlopen_self' Name.Variable
 '='           Operator
 '$dlopen_self_static' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prefer_static_libs' Name.Variable
 '='           Operator
 'built'       Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'build_libtool_libs' Name.Variable
 '='           Operator
 'no'          Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'build_old_libs' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'break'       Name.Builtin
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'done'        Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# See if our shared archives depend on static archives.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$old_archive_from_new_cmds' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'build_old_libs' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Go through the arguments, transforming them on the way.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$#'          Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-gt'         Text
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$1'          Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'shift'       Name.Builtin
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -7076,48 +7076,48 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'qarg'        Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$sed_quote_subst' Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
 '\\"'         Literal.String.Escape
-' '           Text
+' '           Text.Whitespace
 '### testsuite: skip nested quoting test\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'qarg'        Name.Variable
 '='           Operator
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'libtool_args' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -7125,247 +7125,247 @@
 ' '           Literal.String.Double
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# If the previous option needs an argument, assign it.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$prev'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'output'      Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$compile_command' Name.Variable
 ' @OUTPUT@'   Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$finalize_command' Name.Variable
 ' @OUTPUT@'   Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$prev'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'dlfiles'     Text
 '|'           Punctuation
 'dlprefiles'  Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$preload'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Add the symbol object into the linking commands.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$compile_command' Name.Variable
 ' @SYMFILE@'  Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$finalize_command' Name.Variable
 ' @SYMFILE@'  Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'preload'     Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*.la'        Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*.lo'        Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '# We handle these cases below.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'force'       Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlself'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'dlself'      Name.Variable
 '='           Operator
 'needless'    Text
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'export_dynamic' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'self'        Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlprefiles'  Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'dlself'      Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlfiles'     Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlopen_self' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'dlself'      Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'dlself'      Name.Variable
 '='           Operator
 'needless'    Text
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'export_dynamic' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlfiles'     Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'dlfiles'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -7373,9 +7373,9 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'dlprefiles'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -7383,465 +7383,465 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'expsyms'     Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'export_symbols' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': symbol file \\`' Literal.String.Double
 '$arg'        Name.Variable
 "' does not exist" Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'expsyms_regex' Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'export_symbols_regex' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'inst_prefix' Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'inst_prefix_dir' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'precious_regex' Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'precious_files_regex' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'release'     Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'release'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'objectlist'  Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'save_arg'    Name.Variable
 '='           Operator
 '$arg'        Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'moreargs'    Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'fil'         Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '$save_arg'   Name.Variable
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'do'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#\t      moreargs="$moreargs $fil"\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '$fil'        Name.Variable
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '# A libtool-controlled object.\n' Comment.Single
 
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '# Check to see that this really is a libtool object.\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'2q'"        Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'grep'        Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '^# Generated by .*' Literal.String.Double
 '$PACKAGE'    Name.Variable
 '"'           Literal.String.Double
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '1'           Literal.Number
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'pic_object'  Name.Variable
 '='           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'non_pic_object' Name.Variable
 '='           Operator
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '# Read the .lo file\n' Comment.Single
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '# If there is no directory component, then add one.\n' Comment.Single
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '*/*'         Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Text
 '\\\\'        Literal.String.Escape
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'esac'        Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t   '     Text
+'\t\t   '     Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n\t\t   '   Text
+'\n\t\t   '   Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t   '     Text
+'\t\t   '     Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': cannot find name of object for \\`' Literal.String.Double
 '$arg'        Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'fi'          Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '# Extract subdirectory from the argument.\n' Comment.Single
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%/[^/]*$%%'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$xdir'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'else'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$xdir'       Name.Variable
 '/'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'fi'          Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '# Prepend the subdirectory the object is found in.\n' Comment.Single
 
-'\t\t  '      Text
+'\t\t  '      Text.Whitespace
 'pic_object'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$xdir'       Name.Variable
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\n\t\t  '  Text
+'\n\n\t\t  '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlfiles'     Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlopen_support' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'dlfiles'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -7849,46 +7849,46 @@
 ' '           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'continue'    Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'else'        Keyword
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 '# If libtool objects are unsupported, then we need to preload.\n' Comment.Single
 
-'\t\t      '  Text
+'\t\t      '  Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'dlprefiles'  Text
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'fi'          Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t\t  '  Text
+'\n\n\t\t  '  Text.Whitespace
 '# CHECK ME:  I think I busted this.  -Ossama\n' Comment.Single
 
-'\t\t  '      Text
+'\t\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlprefiles'  Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 '# Preload the old-style object.\n' Comment.Single
 
-'\t\t    '    Text
+'\t\t    '    Text.Whitespace
 'dlprefiles'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -7896,15 +7896,15 @@
 ' '           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t\t  '  Text
+'\n\n\t\t  '  Text.Whitespace
 '# A PIC object.\n' Comment.Single
 
-'\t\t  '      Text
+'\t\t  '      Text.Whitespace
 'libobjs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -7912,47 +7912,47 @@
 ' '           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'fi'          Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '# Non-PIC object.\n' Comment.Single
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '# Prepend the subdirectory the object is found in.\n' Comment.Single
 
-'\t\t  '      Text
+'\t\t  '      Text.Whitespace
 'non_pic_object' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$xdir'       Name.Variable
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\n\t\t  '  Text
+'\n\n\t\t  '  Text.Whitespace
 '# A standard non-PIC object\n' Comment.Single
 
-'\t\t  '      Text
+'\t\t  '      Text.Whitespace
 'non_pic_objects' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -7960,55 +7960,55 @@
 ' '           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'fi'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'else'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '# If the PIC object exists, use it instead.\n' Comment.Single
 
-'\t\t  '      Text
+'\t\t  '      Text.Whitespace
 '# $xdir was prepended to $pic_object above.\n' Comment.Single
 
-'\t\t  '      Text
+'\t\t  '      Text.Whitespace
 'non_pic_object' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'non_pic_objects' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8016,110 +8016,110 @@
 ' '           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'fi'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'else'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# Only an error if not doing a dry-run.\n' Comment.Single
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': \\`'       Literal.String.Double
 '$arg'        Name.Variable
 "' is not a valid libtool object" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'else'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '# Dry-run case.\n' Comment.Single
 
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '# Extract subdirectory from the argument.\n' Comment.Single
 
-'\t\t  '      Text
+'\t\t  '      Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%/[^/]*$%%'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$xdir'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'else'        Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$xdir'       Name.Variable
 '/'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t\t  '  Text
+'\n\n\t\t  '  Text.Whitespace
 'pic_object'  Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '${'          Literal.String.Interpol
@@ -8133,23 +8133,23 @@
 'arg'         Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lo2o'       Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'non_pic_object' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '${'          Literal.String.Interpol
@@ -8159,18 +8159,18 @@
 'arg'         Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lo2o'       Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'libobjs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8178,7 +8178,7 @@
 ' '           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'non_pic_objects' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8186,66 +8186,66 @@
 ' '           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'fi'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'done'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': link input file \\`' Literal.String.Double
 '$save_arg'   Name.Variable
 "' does not exist" Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '$save_arg'   Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'rpath'       Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xrpath'      Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# We need an absolute path.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '['           Operator
 '\\\\'        Literal.String.Escape
 '/'           Text
 ']'           Operator
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'A-Za-z'      Text
 ']'           Operator
@@ -8256,58 +8256,58 @@
 ']'           Operator
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': only absolute run-paths are allowed' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'rpath'       Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$rpath'      Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -8316,13 +8316,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'rpath'       Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8330,23 +8330,23 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$xrpath'     Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -8355,13 +8355,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xrpath'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8369,25 +8369,25 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'xcompiler'   Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8395,10 +8395,10 @@
 ' '           Literal.String.Double
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8406,7 +8406,7 @@
 ' '           Literal.String.Double
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8414,15 +8414,15 @@
 ' '           Literal.String.Double
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'xlinker'     Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'linker_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8430,7 +8430,7 @@
 ' '           Literal.String.Double
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8439,10 +8439,10 @@
 '$wl'         Name.Variable
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8451,7 +8451,7 @@
 '$wl'         Name.Variable
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8460,15 +8460,15 @@
 '$wl'         Name.Variable
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'xcclinker'   Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'linker_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8476,7 +8476,7 @@
 ' '           Literal.String.Double
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8484,10 +8484,10 @@
 ' '           Literal.String.Double
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8495,7 +8495,7 @@
 ' '           Literal.String.Double
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8503,46 +8503,46 @@
 ' '           Literal.String.Double
 '$qarg'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'shrext'      Text
 ')'           Operator
-'\n  \t  '    Text
+'\n  \t  '    Text.Whitespace
 'shrext_cmds' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'darwin_framework' Text
 '|'           Punctuation
 'darwin_framework_skip' Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"darwin_framework"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8550,7 +8550,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8558,7 +8558,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8566,68 +8566,68 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '=\\"\\$arg\\"' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# test -n "$prev"\n' Comment.Single
 
-'\n      '    Text
+'\n      '    Text.Whitespace
 'prevarg'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '-all-static' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$link_static_flag' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8635,7 +8635,7 @@
 ' '           Literal.String.Double
 '$link_static_flag' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8643,178 +8643,178 @@
 ' '           Literal.String.Double
 '$link_static_flag' Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-allow-undefined' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# FIXME: remove this flag sometime in the future.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": \\`-allow-undefined' is deprecated because it is the default" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-avoid-version' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'avoid_version' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-dlopen'     Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'dlfiles'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-dlpreopen'  Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'dlprefiles'  Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-export-dynamic' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'export_dynamic' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-export-symbols' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-export-symbols-regex' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$export_symbols' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$export_symbols_regex' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': more than one -exported-symbols argument is not allowed' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"X-export-symbols"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'expsyms'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'expsyms_regex' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-framework'  Text
 '|'           Punctuation
 '-arch'       Text
 '|'           Punctuation
 '-isysroot'   Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$CC'         Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -8828,9 +8828,9 @@
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -8845,17 +8845,17 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' \n\t\t'     Text
+' \n\t\t'     Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'darwin_framework_skip' Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8863,16 +8863,16 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t     '   Text
+'\n\t     '   Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'darwin_framework' Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8880,7 +8880,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8888,30 +8888,30 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-inst-prefix-dir' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'inst_prefix' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# so, if we see these flags be careful not to treat them like -L\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '-L'          Text
 '['           Operator
 'A-Z'         Text
@@ -8921,22 +8921,22 @@
 ']'           Operator
 '*:*'         Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$with_gcc'   Name.Variable
 '/'           Text
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'no/*-*-irix*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/*-*-irix*'  Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8944,7 +8944,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -8952,56 +8952,56 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-L*'         Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'dir'         Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^-L//'"   Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# We need an absolute path.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$dir'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '['           Operator
 '\\\\'        Literal.String.Escape
 '/'           Text
 ']'           Operator
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'A-Za-z'      Text
 ']'           Operator
@@ -9012,60 +9012,60 @@
 ']'           Operator
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'absdir'      Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'pwd'         Name.Builtin
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$absdir'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': cannot determine absolute directory name of \\`' Literal.String.Double
 '$dir'        Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'absdir'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'notinst_path' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9073,29 +9073,29 @@
 ' '           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'dir'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$absdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$deplibs'    Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' -L'         Literal.String.Double
@@ -9104,13 +9104,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9118,7 +9118,7 @@
 ' -L'         Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'lib_search_path' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9126,60 +9126,60 @@
 ' '           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*-*-cygwin*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-mingw*'  Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-pw32*'   Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-os2*'    Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'testbindir'  Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s*/lib$*/bin*'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
 '$dllsearchpath' Name.Variable
 ':'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ':'           Literal.String.Double
@@ -9188,13 +9188,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'dllsearchpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9204,17 +9204,17 @@
 '"'           Literal.String.Double
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
 '$dllsearchpath' Name.Variable
 ':'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ':'           Literal.String.Double
@@ -9223,13 +9223,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'dllsearchpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9239,272 +9239,272 @@
 '"'           Literal.String.Double
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-l*'         Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"X-lc"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"X-lm"'      Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*-*-cygwin*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-mingw*'  Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-pw32*'   Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-beos*'   Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 "# These systems don't actually have a C or math library (as such)\n" Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*-*-os2*'    Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 "# These systems don't actually have a C library (as such)\n" Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"X-lc"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*-*-openbsd*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-freebsd*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-dragonfly*' Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Do not include libc due to us having libc/libc_r.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"X-lc"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*-*-rhapsody*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-darwin1.' Text
 '['           Operator
 '012'         Literal.Number
 ']'           Operator
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Rhapsody C and math libraries are in the System framework\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$deplibs'    Name.Variable
 ' -framework System' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*-*-sco3.2v5*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-sco5v6*' Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Causes problems with __ctype\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"X-lc"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*-*-sysv4.2uw2*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-sysv5*'  Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-unixware*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-OpenUNIX*' Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Compiler inserts libc in the correct place for threads to work\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"X-lc"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"X-lc_r"'    Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t '       Text
+'\n\t '       Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t '       Text
+'\n\t '       Text.Whitespace
 '*-*-openbsd*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-freebsd*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-dragonfly*' Text
 ')'           Operator
-'\n\t   '     Text
+'\n\t   '     Text.Whitespace
 '# Do not include libc_r directly, use -pthread flag.\n' Comment.Single
 
-'\t   '       Text
+'\t   '       Text.Whitespace
 'continue'    Keyword
-'\n\t   '     Text
+'\n\t   '     Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t '       Text
+'\n\t '       Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9512,21 +9512,21 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Tru64 UNIX uses -model [arg] to determine the layout of C++\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# classes, name mangling, and exception handling.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '-model'      Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9534,7 +9534,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9542,7 +9542,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9550,16 +9550,16 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'xcompiler'   Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n     '   Text
+'\n\n     '   Text.Whitespace
 '-mt'         Text
 '|'           Punctuation
 '-mthreads'   Text
@@ -9574,7 +9574,7 @@
 '|'           Punctuation
 '--thread-safe' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9582,7 +9582,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9590,7 +9590,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9598,54 +9598,54 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-module'     Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'module'      Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# -64, -mips[0-9] enable 64-bit mode on the SGI compiler\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# -r[0-9][0-9]* specifies the processor on the SGI compiler\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# +DA*, +DD* enable 64-bit mode on the HP compiler\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# -q* pass through compiler args for the IBM compiler\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# -m* pass through architecture-specific compiler args for GCC\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# -m*, -t[45]*, -txscale* pass through architecture-specific\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# compiler args for GCC\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# -pg pass through profiling flag for GCC\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# @file GCC response files\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '-64'         Text
 '|'           Punctuation
 '-mips'       Text
@@ -9683,10 +9683,10 @@
 '|'           Punctuation
 '-pg'         Text
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'      '      Text
+'      '      Text.Whitespace
 '-t'          Text
 '['           Operator
 '45'          Literal.Number
@@ -9697,40 +9697,40 @@
 '|'           Punctuation
 '@*'          Text
 ')'           Operator
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Unknown arguments in both finalize_command and compile_command need\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# to be aesthetically quoted because they are evaled later.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$sed_quote_subst' Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -9760,7 +9760,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9768,12 +9768,12 @@
 '$arg'        Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9781,7 +9781,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9789,7 +9789,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -9797,236 +9797,236 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'continue'    Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-shrext'     Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'shrext'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-no-fast-install' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fast_install' Name.Variable
 '='           Operator
 'no'          Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-no-install' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*-*-cygwin*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-mingw*'  Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-pw32*'   Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-os2*'    Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# The PATH hackery in wrapper scripts is required on Windows\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 '# in order for the loader to find any dlls it needs.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": warning: \\`-no-install' is ignored for " Literal.String.Double
 '$host'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": warning: assuming \\`-no-fast-install' instead" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fast_install' Name.Variable
 '='           Operator
 'no'          Text
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'no_install'  Name.Variable
 '='           Operator
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-no-undefined' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'allow_undefined' Name.Variable
 '='           Operator
 'no'          Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-objectlist' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'objectlist'  Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-o'          Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'output'      Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-precious-files-regex' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'precious_regex' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-release'    Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'release'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-rpath'      Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'rpath'       Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-R'          Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'xrpath'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-R*'         Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'dir'         Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^-R//'"   Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# We need an absolute path.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$dir'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '['           Operator
 '\\\\'        Literal.String.Escape
 '/'           Text
 ']'           Operator
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'A-Za-z'      Text
 ']'           Operator
@@ -10037,43 +10037,43 @@
 ']'           Operator
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': only absolute run-paths are allowed' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$xrpath'     Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -10082,13 +10082,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xrpath'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10096,145 +10096,145 @@
 ' '           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-static'     Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# The effects of -static are defined in a previous loop.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# We used to do the same as -all-static on platforms that\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 "# didn't have a PIC flag, but the assumption that the effects\n" Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# would be equivalent was wrong.  It would break on at least\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# Digital Unix and AIX.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-thread-safe' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'thread_safe' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-version-info' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'vinfo'       Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '-version-number' Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'vinfo'       Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'vinfo_number' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-Wc,*'       Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'args'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$sed_quote_subst' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^-Wc,//'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'save_ifs'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$IFS'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 "','"         Literal.String.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'flag'        Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$args'       Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$flag'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -10264,7 +10264,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'flag'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10272,12 +10272,12 @@
 '$flag'       Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10286,7 +10286,7 @@
 '$wl'         Name.Variable
 '$flag'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10294,102 +10294,102 @@
 ' '           Literal.String.Double
 '$flag'       Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'done'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"s/^ //"'    Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-Wl,*'       Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'args'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$sed_quote_subst' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^-Wl,//'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'save_ifs'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$IFS'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 "','"         Literal.String.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'flag'        Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$args'       Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$flag'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -10419,7 +10419,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'flag'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10427,12 +10427,12 @@
 '$flag'       Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10441,7 +10441,7 @@
 '$wl'         Name.Variable
 '$flag'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10450,7 +10450,7 @@
 '$wl'         Name.Variable
 '$flag'       Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'linker_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10458,116 +10458,116 @@
 ' '           Literal.String.Double
 '$flag'       Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'done'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"s/^ //"'    Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-Xcompiler'  Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'xcompiler'   Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-Xlinker'    Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'xlinker'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '-XCClinker'  Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'xcclinker'   Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Some other compiler flag.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '-*'          Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+*'          Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Unknown arguments in both finalize_command and compile_command need\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# to be aesthetically quoted because they are evaled later.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$sed_quote_subst' Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -10597,7 +10597,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10605,22 +10605,22 @@
 '$arg'        Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '*.'          Text
 '$objext'     Name.Variable
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# A standard object.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'objs'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10628,295 +10628,295 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '*.lo'        Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# A libtool-controlled object.\n' Comment.Single
 
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Check to see that this really is a libtool object.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'2q'"        Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'grep'        Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '^# Generated by .*' Literal.String.Double
 '$PACKAGE'    Name.Variable
 '"'           Literal.String.Double
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '1'           Literal.Number
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'pic_object'  Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'non_pic_object' Name.Variable
 '='           Operator
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 '# Read the .lo file\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 '# If there is no directory component, then add one.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*/*'         Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Text
 '\\\\'        Literal.String.Escape
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t     '     Text
+'\t     '     Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n\t     '   Text
+'\n\t     '   Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t     '     Text
+'\t     '     Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': cannot find name of object for \\`' Literal.String.Double
 '$arg'        Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 '# Extract subdirectory from the argument.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%/[^/]*$%%'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$xdir'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
-'\n \t  '     Text
+'\n \t  '     Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$xdir'       Name.Variable
 '/'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Prepend the subdirectory the object is found in.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'pic_object'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$xdir'       Name.Variable
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlfiles'     Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlopen_support' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'dlfiles'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10924,46 +10924,46 @@
 ' '           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'continue'    Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'else'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# If libtool objects are unsupported, then we need to preload.\n' Comment.Single
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
 'dlprefiles'  Text
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 '# CHECK ME:  I think I busted this.  -Ossama\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlprefiles'  Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '# Preload the old-style object.\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'dlprefiles'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10971,15 +10971,15 @@
 ' '           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 '# A PIC object.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'libobjs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -10987,47 +10987,47 @@
 ' '           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 '# Non-PIC object.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Prepend the subdirectory the object is found in.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'non_pic_object' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$xdir'       Name.Variable
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 '# A standard non-PIC object\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'non_pic_objects' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11035,55 +11035,55 @@
 ' '           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'none'        Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# If the PIC object exists, use it instead.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# $xdir was prepended to $pic_object above.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'non_pic_object' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'non_pic_objects' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11091,110 +11091,110 @@
 ' '           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# Only an error if not doing a dry-run.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$run'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': \\`'       Literal.String.Double
 '$arg'        Name.Variable
 "' is not a valid libtool object" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Dry-run case.\n' Comment.Single
 
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Extract subdirectory from the argument.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%/[^/]*$%%'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$xdir'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'xdir'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$xdir'       Name.Variable
 '/'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 'pic_object'  Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '${'          Literal.String.Interpol
@@ -11208,23 +11208,23 @@
 'arg'         Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lo2o'       Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'non_pic_object' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '${'          Literal.String.Interpol
@@ -11234,18 +11234,18 @@
 'arg'         Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lo2o'       Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'libobjs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11253,7 +11253,7 @@
 ' '           Literal.String.Double
 '$pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'non_pic_objects' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11261,21 +11261,21 @@
 ' '           Literal.String.Double
 '$non_pic_object' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '*.'          Text
 '$libext'     Name.Variable
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# An archive.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11283,7 +11283,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'old_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11291,36 +11291,36 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '*.la'        Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# A libtool-controlled library.\n' Comment.Single
 
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlfiles'     Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# This library was specified with -dlopen.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'dlfiles'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11328,28 +11328,28 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlprefiles'  Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# The library was specified with -dlpreopen.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'dlprefiles'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11357,12 +11357,12 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prev'        Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11370,53 +11370,53 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Some other compiler argument.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Unknown arguments in both finalize_command and compile_command need\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# to be aesthetically quoted because they are evaled later.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$sed_quote_subst' Name.Variable
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$arg'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 '['           Operator
 '\\['         Literal.String.Escape
@@ -11446,7 +11446,7 @@
 '|'           Punctuation
 '""'          Literal.String.Double
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11454,36 +11454,36 @@
 '$arg'        Name.Variable
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'esac'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# arg\n'     Comment.Single
 
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# Now actually substitute the argument into the commands.\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11491,7 +11491,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11499,91 +11499,91 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'done'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# argument parsing loop\n' Comment.Single
 
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prev'       Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': the \\`'   Literal.String.Double
 '$prevarg'    Name.Variable
 "' option requires an argument" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$help'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$export_dynamic' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$export_dynamic_flag_spec' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'arg'         Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 '$export_dynamic_flag_spec' Name.Variable
 '\\"'         Literal.String.Escape
-'\n      '    Text
+'\n      '    Text.Whitespace
 'compile_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11591,7 +11591,7 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'finalize_command' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11599,64 +11599,64 @@
 ' '           Literal.String.Double
 '$arg'        Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'oldlibs'     Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# calculate the name of the file, without its directory\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'outputname'  Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$output'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%^.*/%%'"  Literal.String.Single
 '`'           Literal.String.Backtick
-'\n    '      Text
+'\n    '      Text.Whitespace
 'libobjs_save' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$libobjs'    Name.Variable
 '"'           Literal.String.Double
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$shlibpath_var' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# get the directories listed in $shlibpath_var\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'shlib_search_path' Name.Variable
 '='           Operator
 '\\`'         Literal.String.Escape
 '\\$'         Literal.String.Escape
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '\\"'         Literal.String.Escape
 'X'           Text
 '\\$'         Literal.String.Escape
@@ -11664,90 +11664,90 @@
 '$shlibpath_var' Name.Variable
 '}'           Operator
 '\\"'         Literal.String.Escape
-' '           Text
+' '           Text.Whitespace
 '\\|'         Literal.String.Escape
-' '           Text
+' '           Text.Whitespace
 '\\$'         Literal.String.Escape
 'Xsed'        Text
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "\\'"         Literal.String.Escape
 's/:/'        Text
-' '           Text
+' '           Text.Whitespace
 '/g'          Text
 "\\'"         Literal.String.Escape
 '\\`'         Literal.String.Escape
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'shlib_search_path' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'sys_lib_search_path' Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 '$sys_lib_search_path_spec' Name.Variable
 '\\"'         Literal.String.Escape
-'\n    '      Text
+'\n    '      Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'sys_lib_dlsearch_path' Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 '$sys_lib_dlsearch_path_spec' Name.Variable
 '\\"'         Literal.String.Escape
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'output_objdir' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$output'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%/[^/]*$%%'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$output_objdir' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$output'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'output_objdir' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$objdir'     Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'output_objdir' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -11755,261 +11755,261 @@
 '/'           Literal.String.Double
 '$objdir'     Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Create the object directory.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_objdir' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mkdir'      Name.Variable
 ' '           Literal.String.Double
 '$output_objdir' Name.Variable
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$mkdir'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$output_objdir' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit_status' Name.Variable
 '='           Operator
 '$?'          Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$exit_status' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-ne'         Text
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_objdir' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$exit_status' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Determine the type of output\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$output'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '""'          Literal.String.Double
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': you must specify an output file' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$help'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n      '    Text
+'\n      '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.'          Text
 '$libext'     Name.Variable
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'linkmode'    Name.Variable
 '='           Operator
 'oldlib'      Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.lo'        Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*.'          Text
 '$objext'     Name.Variable
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'linkmode'    Name.Variable
 '='           Operator
 'obj'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*.la'        Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'linkmode'    Name.Variable
 '='           Operator
 'lib'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'linkmode'    Name.Variable
 '='           Operator
 'prog'        Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# Anything else should be a program.\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'esac'        Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*cygwin*'    Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*mingw*'     Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*pw32*'      Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 "# don't eliminate duplications in $postdeps and $predeps\n" Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'duplicate_compiler_generated_deps' Name.Variable
 '='           Operator
 'yes'         Text
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'duplicate_compiler_generated_deps' Name.Variable
 '='           Operator
 '$duplicate_deps' Name.Variable
-'\n      '    Text
+'\n      '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'specialdeplibs' Name.Variable
 '='           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'libs'        Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Find all interdependent deplibs by searching for libraries\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 '# that are linked more than once (e.g. -la -lb -la)\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'deplib'      Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$deplibs'    Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$duplicate_deps' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"Xyes"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$libs'       Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -12018,7 +12018,7 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'specialdeplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12026,14 +12026,14 @@
 ' '           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'libs'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12041,24 +12041,24 @@
 ' '           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'done'        Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'libs'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12070,58 +12070,58 @@
 ' '           Literal.String.Double
 '$postdeps'   Name.Variable
 '"'           Literal.String.Double
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# Compute libraries that are listed more than once in $predeps\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# $postdeps and mark them as special (i.e., whose duplicates are\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 '# not to be eliminated).\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'pre_post_deps' Name.Variable
 '='           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$duplicate_compiler_generated_deps' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"Xyes"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'pre_post_dep' Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$predeps'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$postdeps'   Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pre_post_deps' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -12130,7 +12130,7 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'specialdeplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12138,12 +12138,12 @@
 ' '           Literal.String.Double
 '$pre_post_deps' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'pre_post_deps' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12151,245 +12151,245 @@
 ' '           Literal.String.Double
 '$pre_post_dep' Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'done'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'pre_post_deps' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'newdependency_libs' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'newlib_search_path' Name.Variable
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'need_relink' Name.Variable
 '='           Operator
 'no'          Text
-' '           Text
+' '           Text.Whitespace
 "# whether we're linking any uninstalled libtool libraries\n" Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'notinst_deplibs' Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '# not-installed libtool libraries\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$linkmode'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'lib'         Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'passes'      Name.Variable
 '='           Operator
 '"conv link"' Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'file'        Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$dlfiles'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$dlprefiles' Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$file'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*.la'        Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": libraries can \\`-dlopen' only libtool libraries: " Literal.String.Double
 '$file'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'done'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'prog'        Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'alldeplibs'  Name.Variable
 '='           Operator
 'no'          Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'newdlfiles'  Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'newdlprefiles' Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'passes'      Name.Variable
 '='           Operator
 '"conv scan dlopen dlpreopen link"' Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'passes'      Name.Variable
 '='           Operator
 '"conv"'      Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'esac'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'pass'        Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$passes'     Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 ','           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"lib,link"'  Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n\t '       Text
+'\n\t '       Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 ','           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"prog,scan"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'libs'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$pass'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'dlopen'      Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'libs'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$dlfiles'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'dlpreopen'   Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'libs'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$dlprefiles' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'link'        Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'libs'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12397,67 +12397,67 @@
 ' %DEPLIBS% ' Literal.String.Double
 '$dependency_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlopen'      Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Collect dlpreopened libraries\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'save_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'fi'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'deplib'      Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$libs'       Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'lib'         Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'found'       Name.Variable
 '='           Operator
 'no'          Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$deplib'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-mt'         Text
 '|'           Punctuation
 '-mthreads'   Text
@@ -12472,24 +12472,24 @@
 '|'           Punctuation
 '--thread-safe' Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 ','           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"prog,link"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12497,7 +12497,7 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12505,9 +12505,9 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'compiler_flags' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12515,118 +12515,118 @@
 ' '           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-l*'         Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": warning: \\`-l' is ignored for archives/objects" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'name'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^-l//'"   Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'searchdir'   Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$newlib_search_path' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$lib_search_path' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$sys_lib_search_path' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$shlib_search_path' Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'search_ext'  Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '.la'         Text
-' '           Text
+' '           Text.Whitespace
 '$std_shrext' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '.so'         Text
-' '           Text
+' '           Text.Whitespace
 '.a'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '# Search the libtool library\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'lib'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12639,93 +12639,93 @@
 'search_ext'  Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lib'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$search_ext' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '".la"'       Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'found'       Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'else'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'found'       Name.Variable
 '='           Operator
 'no'          Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'fi'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'break'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'done'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'done'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$found'      Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 "# deplib doesn't seem to be a libtool library\n" Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 ','           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"prog,link"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12733,7 +12733,7 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12741,9 +12741,9 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12751,19 +12751,19 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'newdependency_libs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -12771,41 +12771,41 @@
 ' '           Literal.String.Double
 '$newdependency_libs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# deplib is a libtool library\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# We need to do some special things here, and not later.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$allow_libtool_libs_with_static_runtimes' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"Xyes"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$predeps'    Name.Variable
@@ -12813,9 +12813,9 @@
 '$postdeps'   Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -12824,191 +12824,191 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'2q'"        Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '$lib'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'grep'        Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '^# Generated by .*' Literal.String.Double
 '$PACKAGE'    Name.Variable
 '"'           Literal.String.Double
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '1'           Literal.Number
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'library_names' Name.Variable
 '='           Operator
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'old_library' Name.Variable
 '='           Operator
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$lib'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '*/*'         Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Text
 '\\\\'        Literal.String.Escape
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '$lib'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$lib'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'esac'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'l'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$old_library' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$library_names' Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'll'          Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$l'          Name.Variable
 '"'           Literal.String.Double
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'done'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$ll'         Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# only static version available\n' Comment.Single
 
-'\t\t    '    Text
+'\t\t    '    Text.Whitespace
 'found'       Name.Variable
 '='           Operator
 'no'          Text
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'ladir'       Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$lib'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%/[^/]*$%%'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$ladir'      Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$lib'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'ladir'       Name.Variable
 '='           Operator
 '"."'         Literal.String.Double
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'lib'         Name.Variable
 '='           Operator
 '$ladir'      Name.Variable
 '/'           Text
 '$old_library' Name.Variable
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 ','           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"prog,link"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13016,7 +13016,7 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13024,9 +13024,9 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'else'        Keyword
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13034,19 +13034,19 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'newdependency_libs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13054,48 +13054,48 @@
 ' '           Literal.String.Double
 '$newdependency_libs' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'fi'          Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'continue'    Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'fi'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'fi'          Keyword
-'\n\t        ' Text
+'\n\t        ' Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# -l\n'      Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '-L*'         Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$linkmode'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'lib'         Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13103,21 +13103,21 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'conv'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'newdependency_libs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13125,7 +13125,7 @@
 ' '           Literal.String.Double
 '$newdependency_libs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'newlib_search_path' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13134,42 +13134,42 @@
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^-L//'"   Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prog'        Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'conv'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13177,26 +13177,26 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'scan'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13204,9 +13204,9 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13214,7 +13214,7 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13222,9 +13222,9 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'newlib_search_path' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13233,104 +13233,104 @@
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^-L//'"   Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ": warning: \\`-L' is ignored for archives/objects" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# linkmode\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# -L\n'      Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '-R*'         Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'link'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'dir'         Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^-R//'"   Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Make sure the xrpath contains only unique directories.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$xrpath'     Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -13339,13 +13339,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'xrpath'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13353,14 +13353,14 @@
 ' '           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13368,43 +13368,43 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*.la'        Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'lib'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*.'          Text
 '$libext'     Name.Variable
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'conv'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13412,187 +13412,187 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$linkmode'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'lib'         Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'valid_a_lib' Name.Variable
 '='           Operator
 'no'          Text
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$deplibs_check_method' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'match_pattern*' Text
 ')'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'set'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'dummy'       Text
-' '           Text
+' '           Text.Whitespace
 '$deplibs_check_method' Name.Variable
-'\n\t        ' Text
+'\n\t        ' Text.Whitespace
 'match_pattern_regex' Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'expr'        Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$deplibs_check_method' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ':'           Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$2'          Name.Variable
 ' \\(.*\\)'   Literal.String.Double
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '\\"'         Literal.String.Escape
 '$deplib'     Name.Variable
 '\\"'         Literal.String.Escape
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t    '    Text
+'\t\t    '    Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$SED'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '10q'         Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t    '    Text
+'\t\t    '    Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$EGREP'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$match_pattern_regex' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '/dev/null'   Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'valid_a_lib' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'fi'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'pass_all'    Text
 ')'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'valid_a_lib' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$valid_a_lib' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '*** Warning: Trying to link with static lib archive ' Literal.String.Double
 '$deplib'     Name.Variable
 '.'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"*** I have the capability to make that library automatically link in when"' Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"*** you link to this library.  But I can only do this if you have a"' Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"*** shared version of the library, which you do not appear to have"' Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '*** because the file extensions .' Literal.String.Double
 '$libext'     Name.Variable
 ' of this argument makes me believe' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"*** that it is just a static archive that I should not used here."' Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '*** Warning: Linking the shared library ' Literal.String.Double
 '$output'     Name.Variable
 ' against the' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '*** static library ' Literal.String.Double
 '$deplib'     Name.Variable
 ' is not portable!' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13600,33 +13600,33 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'prog'        Text
 ')'           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'link'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13634,9 +13634,9 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13644,7 +13644,7 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13652,48 +13652,48 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'continue'    Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'esac'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# linkmode\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# *.$libext\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '*.lo'        Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*.'          Text
 '$objext'     Name.Variable
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'conv'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13701,68 +13701,68 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlpreopen'   Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlopen_support' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 "# If there is no dlopen support or we're linking statically,\n" Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 '# we need to preload.\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'newdlprefiles' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13770,7 +13770,7 @@
 ' '           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13778,7 +13778,7 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13786,9 +13786,9 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'newdlfiles'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -13796,64 +13796,64 @@
 ' '           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '%DEPLIBS%'   Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'alldeplibs'  Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# case $deplib\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$found'      Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lib'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': cannot find the library \\`' Literal.String.Double
@@ -13862,262 +13862,262 @@
 '$deplib'     Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Check to see that this really is a libtool archive.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Operator
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'2q'"        Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '$lib'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'grep'        Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '^# Generated by .*' Literal.String.Double
 '$PACKAGE'    Name.Variable
 '"'           Literal.String.Double
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '1'           Literal.Number
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': \\`'       Literal.String.Double
 '$lib'        Name.Variable
 "' is not a valid libtool archive" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'ladir'       Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$lib'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%/[^/]*$%%'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$ladir'      Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$lib'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'ladir'       Name.Variable
 '='           Operator
 '"."'         Literal.String.Double
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'dlname'      Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'dlopen'      Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'dlpreopen'   Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'libdir'      Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'library_names' Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'old_library' Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# If the library was installed with an old release of libtool,\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 '# it will not redefine variables installed, or shouldnotlink\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'installed'   Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'shouldnotlink' Name.Variable
 '='           Operator
 'no'          Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'avoidtemprpath' Name.Variable
 '='           Operator
-'\n\n\n\t'    Text
+'\n\n\n\t'    Text.Whitespace
 '# Read the .la file\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$lib'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*/*'         Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Text
 '\\\\'        Literal.String.Escape
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '$lib'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$lib'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 ','           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"lib,link"'  Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n\t   '     Text
+'\n\t   '     Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 ','           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"prog,scan"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n\t   '     Text
+'\n\t   '     Text.Whitespace
 '{'           Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlopen'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'dlfiles'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14125,17 +14125,17 @@
 ' '           Literal.String.Double
 '$dlopen'     Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlpreopen'  Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'dlprefiles'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14143,27 +14143,27 @@
 ' '           Literal.String.Double
 '$dlpreopen'  Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'conv'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# Only check for convenience libraries\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14171,56 +14171,56 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': cannot find name of link library for \\`' Literal.String.Double
 '$lib'        Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# It is a libtool convenience library, so add in its objects.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'convenience' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14232,7 +14232,7 @@
 '/'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'old_convenience' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14244,21 +14244,21 @@
 '/'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'tmp_libs'    Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'deplib'      Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$dependency_libs' Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14266,33 +14266,33 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n              ' Text
+'\n              ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$duplicate_deps' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"Xyes"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t        ' Text
+'\n\t        ' Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$tmp_libs'   Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t        ' Text
+'\n\t        ' Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -14301,7 +14301,7 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'specialdeplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14309,14 +14309,14 @@
 ' '           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t        ' Text
+'\n\t        ' Text.Whitespace
 'esac'        Keyword
-'\n              ' Text
+'\n              ' Text.Whitespace
 'fi'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'tmp_libs'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14324,226 +14324,226 @@
 ' '           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'done'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': \\`'       Literal.String.Double
 '$lib'        Name.Variable
 "' is not a convenience library" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# $pass = conv\n' Comment.Single
 
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Get the name of the library we link against.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'linklib'     Name.Variable
 '='           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'l'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$old_library' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$library_names' Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'linklib'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$l'          Name.Variable
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'done'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': cannot find name of link library for \\`' Literal.String.Double
 '$lib'        Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# This library was specified with -dlopen.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlopen'      Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': cannot -dlopen a convenience library: \\`' Literal.String.Double
 '$lib'        Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlname'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n\t     '   Text
+'\n\t     '   Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlopen_support' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n\t     '   Text
+'\n\t     '   Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 "# If there is no dlname, no dlopen support or we're linking\n" Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# statically, we need to preload.  We also need to preload any\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 "# dependent libraries so libltdl's deplib preloader doesn't\n" Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# bomb out in the load deplibs phase.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'dlprefiles'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14553,9 +14553,9 @@
 ' '           Literal.String.Double
 '$dependency_libs' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'newdlfiles'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14563,33 +14563,33 @@
 ' '           Literal.String.Double
 '$lib'        Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# $pass = dlopen\n' Comment.Single
 
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# We need an absolute path.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$ladir'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '['           Operator
 '\\\\'        Literal.String.Escape
 '/'           Text
 ']'           Operator
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'A-Za-z'      Text
 ']'           Operator
@@ -14600,227 +14600,227 @@
 ']'           Operator
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'abs_ladir'   Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$ladir'      Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'abs_ladir'   Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$ladir'      Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'pwd'         Name.Builtin
 '`'           Literal.String.Backtick
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$abs_ladir'  Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': warning: cannot determine absolute directory name of \\`' Literal.String.Double
 '$ladir'      Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': passing it literally to the linker, although it might fail' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'abs_ladir'   Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$ladir'      Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'esac'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'laname'      Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$lib'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s%^.*/%%'"  Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Find the relevant object directory and library name.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$installed'  Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Xyes'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$libdir'     Name.Variable
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$abs_ladir'  Name.Variable
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': warning: library \\`' Literal.String.Double
 '$lib'        Name.Variable
 "' was moved." Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'dir'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$ladir'      Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'absdir'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$abs_ladir'  Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'libdir'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$abs_ladir'  Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'dir'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'absdir'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$hardcode_automatic' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Xyes'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'avoidtemprpath' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'else'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '!'           Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$ladir'      Name.Variable
 '/'           Literal.String.Double
@@ -14828,37 +14828,37 @@
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$abs_ladir'  Name.Variable
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'dir'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$ladir'      Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'absdir'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$abs_ladir'  Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Remove this search path later\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'notinst_path' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14866,9 +14866,9 @@
 ' '           Literal.String.Double
 '$abs_ladir'  Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'dir'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14876,7 +14876,7 @@
 '/'           Literal.String.Double
 '$objdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'absdir'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14884,10 +14884,10 @@
 '/'           Literal.String.Double
 '$objdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Remove this search path later\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'notinst_path' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -14895,107 +14895,107 @@
 ' '           Literal.String.Double
 '$abs_ladir'  Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# $installed = yes\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'name'        Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$laname'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/\\.la$//'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^lib//'"  Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# This library was specified with -dlpreopen.\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dlpreopen'   Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': cannot -dlpreopen a convenience library: \\`' Literal.String.Double
 '$lib'        Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '>'           Text
 '&'           Punctuation
 '2'           Literal.Number
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# Prefer using a static library (so that no silly _DYNAMIC symbols\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 '# are required to link).\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'newdlprefiles' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15005,23 +15005,23 @@
 '/'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# Otherwise, use the dlname, so that lt_dlopen finds it.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlname'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'newdlprefiles' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15031,9 +15031,9 @@
 '/'           Literal.String.Double
 '$dlname'     Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'newdlprefiles' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15043,45 +15043,45 @@
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# $pass = dlpreopen\n' Comment.Single
 
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# Link the convenience library\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15091,24 +15091,24 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 ','           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"prog,link"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15118,7 +15118,7 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15128,9 +15128,9 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15138,44 +15138,44 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '# used for prog,scan pass\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\n\n\t'    Text
+'\n\n\n\t'    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'link'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'newlib_search_path' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15183,7 +15183,7 @@
 ' '           Literal.String.Double
 '$ladir'      Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15191,78 +15191,78 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 'linkalldeplibs' Name.Variable
 '='           Operator
 'no'          Text
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$link_all_deplibs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$library_names' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n\t     '   Text
+'\n\t     '   Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'linkalldeplibs' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 'tmp_libs'    Name.Variable
 '='           Operator
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'deplib'      Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$dependency_libs' Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$deplib'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '-L*'         Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'newlib_search_path' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15271,46 +15271,46 @@
 '"'           Literal.String.Double
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$Xsed'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^-L//'"   Literal.String.Single
 '`'           Literal.String.Backtick
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '### testsuite: skip nested quoting test\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Need to link against all dependency_libs?\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkalldeplibs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15318,15 +15318,15 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '# Need to hardcode shared library paths\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 '# or/and link against static libraries\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'newdependency_libs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15334,35 +15334,35 @@
 ' '           Literal.String.Double
 '$newdependency_libs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '$duplicate_deps' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"Xyes"'      Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$tmp_libs'   Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -15371,7 +15371,7 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'specialdeplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15379,14 +15379,14 @@
 ' '           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'tmp_libs'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15394,115 +15394,115 @@
 ' '           Literal.String.Double
 '$deplib'     Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'done'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# for deplib\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'continue'    Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# $linkmode = prog...\n' Comment.Single
 
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 ','           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"prog,link"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$library_names' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n\t     '   Text
+'\n\t     '   Text.Whitespace
 '{'           Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$prefer_static_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# We need to hardcode the library path\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$shlibpath_var' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$avoidtemprpath' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '# Make sure the rpath contains only unique directories.\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$temp_rpath' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -15511,10 +15511,10 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -15523,13 +15523,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'temp_rpath'  Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15537,33 +15537,33 @@
 ' '           Literal.String.Double
 '$absdir'     Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 '# Hardcode the library path.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# Skip directories that are in the system default run-time\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# search path.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$sys_lib_dlsearch_path' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -15572,22 +15572,22 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$compile_rpath' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -15596,13 +15596,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'compile_rpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15610,24 +15610,24 @@
 ' '           Literal.String.Double
 '$absdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$sys_lib_dlsearch_path' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -15636,22 +15636,22 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$finalize_rpath' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -15660,13 +15660,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'finalize_rpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15674,187 +15674,187 @@
 ' '           Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# $linkmode,$pass = prog,link...\n' Comment.Single
 
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$alldeplibs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n\t     '   Text
+'\n\t     '   Text.Whitespace
 '{'           Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$deplibs_check_method' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pass_all'    Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n\t       ' Text
+'\n\t       ' Text.Whitespace
 '{'           Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n\t\t '     Text
+'\n\t\t '     Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$library_names' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# We only need to search for static libraries\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'continue'    Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'link_static' Name.Variable
 '='           Operator
 'no'          Text
-' '           Text
+' '           Text.Whitespace
 '# Whether the deplib will be linked statically\n' Comment.Single
 
-'\t'          Text
+'\t'          Text.Whitespace
 'use_static_libs' Name.Variable
 '='           Operator
 '$prefer_static_libs' Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$use_static_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'built'       Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$installed'  Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'use_static_libs' Name.Variable
 '='           Operator
 'no'          Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$library_names' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n\t   '     Text
+'\n\t   '     Text.Whitespace
 '{'           Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$use_static_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$installed'  Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'notinst_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -15862,143 +15862,143 @@
 ' '           Literal.String.Double
 '$lib'        Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'need_relink' Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# This is a shared library\n' Comment.Single
 
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 "# Warn about portability, can't link against -module's on\n" Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 '# some systems (darwin)\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$shouldnotlink' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$pass'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'link'        Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '*** Warning: Linking the executable ' Literal.String.Double
 '$output'     Name.Variable
 ' against the loadable module' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '*** Warning: Linking the shared library ' Literal.String.Double
 '$output'     Name.Variable
 ' against the loadable module' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '*** '        Literal.String.Double
 '$linklib'    Name.Variable
 ' is not portable!' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n\t     '   Text
+'\n\t     '   Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_into_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Hardcode the library path.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# Skip directories that are in the system default run-time\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '# search path.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$sys_lib_dlsearch_path' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -16007,22 +16007,22 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$compile_rpath' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -16031,13 +16031,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'compile_rpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -16045,24 +16045,24 @@
 ' '           Literal.String.Double
 '$absdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '$sys_lib_dlsearch_path' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -16071,22 +16071,22 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$finalize_rpath' Name.Variable
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ' '           Literal.String.Double
@@ -16095,13 +16095,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'finalize_rpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -16109,182 +16109,182 @@
 ' '           Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$old_archive_from_expsyms_cmds' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# figure out the soname\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'set'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'dummy'       Text
-' '           Text
+' '           Text.Whitespace
 '$library_names' Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'realname'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$2'          Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'shift'       Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shift'       Name.Builtin
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'libname'     Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '\\\\'        Literal.String.Escape
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '\\"'         Literal.String.Escape
 '$libname_spec' Name.Variable
 '\\"'         Literal.String.Escape
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 "# use dlname if we got it. it's perfectly good, no?\n" Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$dlname'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'soname'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$dlname'     Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$soname_spec' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '# bleh windows\n' Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*cygwin*'    Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'mingw*'      Text
 ')'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'major'       Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 'expr'        Text
-' '           Text
+' '           Text.Whitespace
 '$current'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-'           Text
-' '           Text
+' '           Text.Whitespace
 '$age'        Name.Variable
 '`'           Literal.String.Backtick
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'versuffix'   Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-'           Literal.String.Double
 '$major'      Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'soname'      Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 '$soname_spec' Name.Variable
 '\\"'         Literal.String.Escape
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'soname'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$realname'   Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 '# Make a new name for the extract_expsyms_cmds to use\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'soroot'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$soname'     Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'soname'      Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$soroot'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s/^.*\\///'" Literal.String.Single
 '`'           Literal.String.Backtick
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'newlib'      Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -16300,16 +16300,16 @@
 '$'           Text
 "//'`.a"      Literal.String.Double
 '"'           Literal.String.Double
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 '# If the library has no export list, then create one now\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_objdir' Name.Variable
 '/'           Literal.String.Double
@@ -16317,277 +16317,277 @@
 '-def'        Literal.String.Double
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'extracting exported symbol list from \\`' Literal.String.Double
 '$soname'     Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'save_ifs'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$IFS'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 "'~'"         Literal.String.Single
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'cmds'        Name.Variable
 '='           Operator
 '$extract_expsyms_cmds' Name.Variable
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'cmd'         Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$cmds'       Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'cmd'         Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 '$cmd'        Name.Variable
 '\\"'         Literal.String.Escape
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$cmd'        Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$cmd'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$?'          Name.Variable
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'done'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 '# Create $newlib\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$output_objdir' Name.Variable
 '/'           Literal.String.Double
 '$newlib'     Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'generating import library for \\`' Literal.String.Double
 '$soname'     Name.Variable
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'save_ifs'    Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$IFS'        Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 "'~'"         Literal.String.Single
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'cmds'        Name.Variable
 '='           Operator
 '$old_archive_from_expsyms_cmds' Name.Variable
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'cmd'         Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$cmds'       Name.Variable
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'cmd'         Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 '$cmd'        Name.Variable
 '\\"'         Literal.String.Escape
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$show'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$cmd'        Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$run'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$cmd'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$?'          Name.Variable
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'done'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'IFS'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$save_ifs'   Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# make sure the library variables are pointing to the new library\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'dir'         Name.Variable
 '='           Operator
 '$output_objdir' Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'linklib'     Name.Variable
 '='           Operator
 '$newlib'     Name.Variable
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '# test -n "$old_archive_from_expsyms_cmds"\n' Comment.Single
 
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mode'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'relink'      Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'add_shlibpath' Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'add'         Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'lib_linked'  Name.Variable
 '='           Operator
 'yes'         Text
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$hardcode_action' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'immediate'   Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'unsupported' Text
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_direct' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -16595,47 +16595,47 @@
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '*-*-sco3.2v5.0.' Text
 '['           Operator
 '024'         Literal.Number
 ']'           Operator
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-L'          Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '*-*-sysv4*uw2*' Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-L'          Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '*-*-sysv5OpenUNIX*' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*-*-sysv5UnixWare7.' Text
 '['           Operator
 '01'          Literal.Number
@@ -16645,94 +16645,94 @@
 '10'          Literal.Number
 ']'           Operator
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t    '    Text
+'\t\t    '    Text.Whitespace
 '*-*-unixware7*' Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-L'          Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '*-*-darwin*' Text
-' '           Text
+' '           Text.Whitespace
 ')'           Operator
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 '# if the lib is a module then we can not link against\n' Comment.Single
 
-'\t\t    '    Text
+'\t\t    '    Text.Whitespace
 '# it, someone is ignoring the new warnings I added\n' Comment.Single
 
-'\t\t    '    Text
+'\t\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '/usr/bin/file' Text
-' '           Text
+' '           Text.Whitespace
 '-L'          Text
-' '           Text
+' '           Text.Whitespace
 '$add'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '/dev/null'   Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '$EGREP'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '": [^:]* bundle"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '>/dev/null'  Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '** Warning, lib ' Literal.String.Double
 '$linklib'    Name.Variable
 ' is a module, not a shared library' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t        ' Text
+'\n\t\t        ' Text.Whitespace
 '$echo'       Name.Variable
-'\n\t\t        ' Text
+'\n\t\t        ' Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"** And there doesn\'t seem to be a static archive available"' Literal.String.Double
-'\n\t\t        ' Text
+'\n\t\t        ' Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"** The link will probably fail, sorry"' Literal.String.Double
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'else'        Keyword
-'\n\t\t        ' Text
+'\n\t\t        ' Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -16740,119 +16740,119 @@
 '/'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'fi'          Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'fi'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'esac'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_minus_L' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$host'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '*-*-sunos*'  Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'add_shlibpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'esac'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-L'          Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-l'          Literal.String.Double
 '$name'       Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_shlibpath_var' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add_shlibpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-l'          Literal.String.Double
 '$name'       Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'else'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'lib_linked'  Name.Variable
 '='           Operator
 'no'          Text
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'fi'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'relink'      Text
 ')'           Operator
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_direct' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -16860,58 +16860,58 @@
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_minus_L' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-L'          Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "# Try looking first in the location we're being installed to.\n" Comment.Single
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$inst_prefix_dir' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$libdir'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 '['           Operator
 '\\\\'        Literal.String.Escape
 '/'           Text
 ']'           Operator
 '*'           Text
 ')'           Operator
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -16920,122 +16920,122 @@
 '$inst_prefix_dir' Name.Variable
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t\t      ' Text
+'\n\t\t      ' Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 'esac'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'fi'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-l'          Literal.String.Double
 '$name'       Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_shlibpath_var' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add_shlibpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$dir'        Name.Variable
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-l'          Literal.String.Double
 '$name'       Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'else'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'lib_linked'  Name.Variable
 '='           Operator
 'no'          Text
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'fi'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'lib_linked'  Name.Variable
 '='           Operator
 'no'          Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'esac'        Keyword
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$lib_linked' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '$echo'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$modename'   Name.Variable
 ': configuration error: unsupported hardcode properties' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$EXIT_FAILURE' Name.Variable
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$add_shlibpath' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
 '$compile_shlibpath' Name.Variable
 ':'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ':'           Literal.String.Double
@@ -17044,13 +17044,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'compile_shlibpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17058,39 +17058,39 @@
 '$add_shlibpath' Name.Variable
 ':'           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$add_dir'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17098,17 +17098,17 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$add'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17116,19 +17116,19 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$add_dir'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17136,17 +17136,17 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$add'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17154,62 +17154,62 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_direct' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t '       Text
+'\t\t '       Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_minus_L' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t '       Text
+'\t\t '       Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_shlibpath_var' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
 '$finalize_shlibpath' Name.Variable
 ':'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ':'           Literal.String.Double
@@ -17218,13 +17218,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'finalize_shlibpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17232,72 +17232,72 @@
 '$libdir'     Name.Variable
 ':'           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'esac'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$mode'       Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'relink'      Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'add_shlibpath' Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'add'         Name.Variable
 '='           Operator
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 '# Finalize command for both is simple: just hardcode it.\n' Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_direct' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17305,59 +17305,59 @@
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_minus_L' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-L'          Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-l'          Literal.String.Double
 '$name'       Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_shlibpath_var' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
 '$finalize_shlibpath' Name.Variable
 ':'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 '"'           Literal.String.Double
 ':'           Literal.String.Double
@@ -17366,13 +17366,13 @@
 '"'           Literal.String.Double
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 'finalize_shlibpath' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17380,61 +17380,61 @@
 '$libdir'     Name.Variable
 ':'           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'esac'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-l'          Literal.String.Double
 '$name'       Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_automatic' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$inst_prefix_dir' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n\t\t '     Text
+'\n\t\t '     Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$inst_prefix_dir' Name.Variable
 '$libdir'     Name.Variable
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t        ' Text
+'\n\t        ' Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17443,9 +17443,9 @@
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'else'        Keyword
-'\n\t        ' Text
+'\n\t        ' Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17453,50 +17453,50 @@
 '/'           Literal.String.Double
 '$linklib'    Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'fi'          Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 "# We cannot seem to hardcode it, guess we'll fake it.\n" Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-L'          Literal.String.Double
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 "# Try looking first in the location we're being installed to.\n" Comment.Single
 
-'\t      '    Text
+'\t      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$inst_prefix_dir' Name.Variable
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '$libdir'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-'\n\t\t  '    Text
+'\n\t\t  '    Text.Whitespace
 '['           Operator
 '\\\\'        Literal.String.Escape
 '/'           Text
 ']'           Operator
 '*'           Text
 ')'           Operator
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 'add_dir'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17505,48 +17505,48 @@
 '$inst_prefix_dir' Name.Variable
 '$libdir'     Name.Variable
 '"'           Literal.String.Double
-'\n\t\t    '  Text
+'\n\t\t    '  Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'esac'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'fi'          Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'add'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '-l'          Literal.String.Double
 '$name'       Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\n\t    '  Text
+'\n\n\t    '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$add_dir'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17554,17 +17554,17 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$add'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17572,19 +17572,19 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'else'        Keyword
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$add_dir'    Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17592,17 +17592,17 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t      '  Text
+'\n\t      '  Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$add'        Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'deplibs'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17610,67 +17610,67 @@
 ' '           Literal.String.Double
 '$deplibs'    Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'fi'          Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$linkmode'   Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'prog'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# Here we assume that one of hardcode_direct or hardcode_minus_L\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 '# is not unsupported.  This is valid on all known static and\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 '# shared platforms.\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$hardcode_direct' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'unsupported' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'linklib'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$old_library' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17680,7 +17680,7 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17690,9 +17690,9 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'else'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'compile_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17703,7 +17703,7 @@
 ' '           Literal.String.Double
 '$compile_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'finalize_deplibs' Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -17714,44 +17714,44 @@
 ' '           Literal.String.Double
 '$finalize_deplibs' Name.Variable
 '"'           Literal.String.Double
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fi'          Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$build_libtool_libs' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yes'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 '# Not a shared library\n' Comment.Single
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$deplibs_check_method' Name.Variable
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '!'           Text
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pass_all'    Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 "# We're trying link a shared library against a static one\n" Comment.Single
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 "# but the system doesn't support it.\n" Comment.Single
diff --git a/tests/examplefiles/bash/stripheredoc.sh.output b/tests/examplefiles/bash/stripheredoc.sh.output
index 697e0fa54b..1f3eacc559 100644
--- a/tests/examplefiles/bash/stripheredoc.sh.output
+++ b/tests/examplefiles/bash/stripheredoc.sh.output
@@ -1,4 +1,4 @@
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '<<-EOF\n  Hello world $PATH\n  EOF' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/bc/example.bc.output b/tests/examplefiles/bc/example.bc.output
index 303d3eeb16..6a4e0ffb04 100644
--- a/tests/examplefiles/bc/example.bc.output
+++ b/tests/examplefiles/bc/example.bc.output
@@ -3,7 +3,7 @@
 '*'           Comment.Multiline
 ' Calculate the Greatest Common Divisor of a and b.\n ' Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'define'      Keyword
 ' '           Text
@@ -18,7 +18,7 @@
 ')'           Punctuation
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -30,9 +30,9 @@
 'm'           Text
 'p'           Text
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -43,7 +43,7 @@
 '*'           Comment.Multiline
 ' Euclidean algorithm\n     ' Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -60,7 +60,7 @@
 ')'           Punctuation
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -82,7 +82,7 @@
 ' '           Text
 'b'           Text
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -98,7 +98,7 @@
 ' '           Text
 'b'           Text
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -116,14 +116,14 @@
 'm'           Text
 'p'           Text
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 ' '           Text
 ' '           Text
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -133,10 +133,10 @@
 ' '           Text
 'a'           Text
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"gcd(225, 150) = "' Literal.String
 ' '           Text
@@ -151,93 +151,93 @@
 ' '           Text
 '150'         Literal.Number
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '/*'          Comment.Multiline
 ' assign operators ' Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
 '='           Operator
 ' '           Text
 '10'          Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
 '+='          Operator
 ' '           Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 '++'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '++'          Operator
 'a'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 '--'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '--'          Operator
 'a'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
 '+='          Operator
 ' '           Text
 '5'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
 '-='          Operator
 ' '           Text
 '5'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
 '*='          Operator
 ' '           Text
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
 '/='          Operator
 ' '           Text
 '3'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
 '^='          Operator
 ' '           Text
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
 '%='          Operator
 ' '           Text
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '/*'          Comment.Multiline
 ' comparison ' Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 ' '           Text
@@ -250,10 +250,10 @@
 ')'           Punctuation
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 ' '           Text
@@ -266,10 +266,10 @@
 ')'           Punctuation
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 ' '           Text
@@ -282,10 +282,10 @@
 ')'           Punctuation
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 ' '           Text
@@ -298,10 +298,10 @@
 ')'           Punctuation
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 ' '           Text
@@ -314,10 +314,10 @@
 ')'           Punctuation
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 ' '           Text
@@ -330,12 +330,12 @@
 ')'           Punctuation
 ' '           Text
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
@@ -360,7 +360,7 @@
 '*'           Comment.Multiline
 ' 2       '   Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
@@ -383,7 +383,7 @@
 '/'           Comment.Multiline
 ' 1.5     '   Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
@@ -408,7 +408,7 @@
 '*'           Comment.Multiline
 ' 3       '   Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
@@ -435,7 +435,7 @@
 '*'           Comment.Multiline
 ' 4   '       Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
@@ -461,7 +461,7 @@
 '/'           Comment.Multiline
 ' 0.4 '       Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
@@ -486,7 +486,7 @@
 '/'           Comment.Multiline
 ' 1.4 '       Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
 ' '           Text
@@ -511,4 +511,4 @@
 '/'           Comment.Multiline
 ' 1.4 '       Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/clay/example.clay.output b/tests/examplefiles/clay/example.clay.output
index dde5f69381..2f108b72b0 100644
--- a/tests/examplefiles/clay/example.clay.output
+++ b/tests/examplefiles/clay/example.clay.output
@@ -204,18 +204,7 @@
 'assert'      Name
 '['           Punctuation
 '"'           Literal.String
-'b'           Literal.String
-'o'           Literal.String
-'u'           Literal.String
-'n'           Literal.String
-'d'           Literal.String
-'s'           Literal.String
-'C'           Literal.String
-'h'           Literal.String
-'e'           Literal.String
-'c'           Literal.String
-'k'           Literal.String
-'s'           Literal.String
+'boundsChecks' Literal.String
 '"'           Literal.String
 ']'           Punctuation
 '('           Punctuation
@@ -239,42 +228,7 @@
 ','           Punctuation
 ' '           Text.Whitespace
 '"'           Literal.String
-'S'           Literal.String
-'t'           Literal.String
-'r'           Literal.String
-'i'           Literal.String
-'n'           Literal.String
-'g'           Literal.String
-'L'           Literal.String
-'i'           Literal.String
-'t'           Literal.String
-'e'           Literal.String
-'r'           Literal.String
-'a'           Literal.String
-'l'           Literal.String
-'R'           Literal.String
-'e'           Literal.String
-'f'           Literal.String
-' '           Literal.String
-'i'           Literal.String
-'n'           Literal.String
-'d'           Literal.String
-'e'           Literal.String
-'x'           Literal.String
-' '           Literal.String
-'o'           Literal.String
-'u'           Literal.String
-'t'           Literal.String
-' '           Literal.String
-'o'           Literal.String
-'f'           Literal.String
-' '           Literal.String
-'b'           Literal.String
-'o'           Literal.String
-'u'           Literal.String
-'n'           Literal.String
-'d'           Literal.String
-'s'           Literal.String
+'StringLiteralRef index out of bounds' Literal.String
 '"'           Literal.String
 ')'           Punctuation
 ';'           Punctuation
@@ -307,25 +261,9 @@
 '='           Operator
 ' '           Text.Whitespace
 '"""'         Literal.String
-'\n'          Literal.String
-
-'l'           Literal.String
-'o'           Literal.String
-'n'           Literal.String
-'g'           Literal.String
+'\nlong'      Literal.String
 '\\t'         Literal.String.Escape
-'l'           Literal.String
-'o'           Literal.String
-'n'           Literal.String
-'g'           Literal.String
-'\n'          Literal.String
-
-'s'           Literal.String
-'t'           Literal.String
-'o'           Literal.String
-'r'           Literal.String
-'y'           Literal.String
-'\n'          Literal.String
+'long\nstory\n' Literal.String
 
 '"""'         Literal.String
 '\n'          Text.Whitespace
diff --git a/tests/examplefiles/cmake/main.cmake.output b/tests/examplefiles/cmake/main.cmake.output
index 317ab3d711..32aa109863 100644
--- a/tests/examplefiles/cmake/main.cmake.output
+++ b/tests/examplefiles/cmake/main.cmake.output
@@ -6,9 +6,9 @@
 ' '           Text.Whitespace
 'FATAL_ERROR' Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SET'         Name.Builtin
 '('           Punctuation
@@ -22,7 +22,7 @@
 'main.c'      Literal.String
 ' '           Text.Whitespace
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SET'         Name.Builtin
 '('           Punctuation
@@ -34,7 +34,7 @@
 '}'           Operator
 ' '           Text.Whitespace
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MESSAGE'     Name.Builtin
 '('           Punctuation
@@ -99,7 +99,7 @@
 ' '           Text.Whitespace
 '# this message contains literal characters\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MESSAGE'     Name.Builtin
 '('           Punctuation
@@ -128,7 +128,7 @@
 ' '           Text.Whitespace
 '# prints "Hi. ) MESSAGE( x )"\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MESSAGE'     Name.Builtin
 '('           Punctuation
@@ -180,7 +180,7 @@
 ' '           Text.Whitespace
 '# rule 3\n'  Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SET'         Name.Builtin
 '('           Punctuation
@@ -282,7 +282,7 @@
 '               ' Text.Whitespace
 '# prints "y=x" to stdout (without quotes)\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SET'         Name.Builtin
 '('           Punctuation
@@ -359,7 +359,7 @@
 '  '          Text.Whitespace
 '# prints "a b c" to stdout (without quotes)\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# This is a comment.\n' Comment
 
@@ -373,7 +373,7 @@
 'here'        Literal.String
 ' '           Text.Whitespace
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ANOTHER_COMMAND' Name.Builtin
 '('           Punctuation
@@ -385,7 +385,7 @@
 '('           Punctuation
 ' '           Text.Whitespace
 'these'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'arguments'   Literal.String
@@ -404,4 +404,4 @@
 'lines'       Literal.String
 ' '           Text.Whitespace
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/cobol/example.cob.output b/tests/examplefiles/cobol/example.cob.output
index 68e8434cd4..f18293d96b 100644
--- a/tests/examplefiles/cobol/example.cob.output
+++ b/tests/examplefiles/cobol/example.cob.output
@@ -4,7 +4,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13,7 +13,7 @@
 ' '           Text.Whitespace
 'OCic'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -139,7 +139,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -147,13 +147,13 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 'REPOSITORY'  Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -163,7 +163,7 @@
 ' '           Text.Whitespace
 'INTRINSIC'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -171,13 +171,13 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 'FILE-CONTROL' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -190,7 +190,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Bat-File-Name' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
@@ -202,9 +202,9 @@
 ' '           Text.Whitespace
 'SEQUENTIAL'  Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -217,7 +217,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Output-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
@@ -229,9 +229,9 @@
 ' '           Text.Whitespace
 'SEQUENTIAL'  Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -244,7 +244,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'File-Name'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
@@ -264,7 +264,7 @@
 ' '           Text.Whitespace
 'FSM-Status'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -272,7 +272,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -280,7 +280,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -288,7 +288,7 @@
 ' '           Text.Whitespace
 'Bat-File'    Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -297,9 +297,9 @@
 '                ' Text.Whitespace
 'PIC X(2048)' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -307,7 +307,7 @@
 ' '           Text.Whitespace
 'Cobc-Output' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -316,9 +316,9 @@
 '             ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -326,7 +326,7 @@
 ' '           Text.Whitespace
 'Source-Code' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -335,9 +335,9 @@
 '          '  Text.Whitespace
 'PIC X(80)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -345,7 +345,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -353,9 +353,9 @@
 ' '           Text.Whitespace
 'screenio'    Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -364,9 +364,9 @@
 '               ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 ' '           Text.Whitespace
@@ -375,9 +375,9 @@
 '                         ' Text.Whitespace
 'PIC X(512)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -386,9 +386,9 @@
 '                    ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -397,9 +397,9 @@
 '            ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -408,9 +408,9 @@
 '           ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -419,16 +419,16 @@
 '                 ' Text.Whitespace
 'PIC X(12)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Config-Keys' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '     '       Text.Whitespace
@@ -437,7 +437,7 @@
 '                  ' Text.Whitespace
 'PIC 9(4)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '     '       Text.Whitespace
@@ -446,7 +446,7 @@
 '                  ' Text.Whitespace
 'PIC 9(4)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '     '       Text.Whitespace
@@ -455,7 +455,7 @@
 '                  ' Text.Whitespace
 'PIC 9(4)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '     '       Text.Whitespace
@@ -464,7 +464,7 @@
 '                  ' Text.Whitespace
 'PIC 9(4)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '     '       Text.Whitespace
@@ -473,7 +473,7 @@
 '                  ' Text.Whitespace
 'PIC 9(4)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '     '       Text.Whitespace
@@ -482,7 +482,7 @@
 '                  ' Text.Whitespace
 'PIC 9(4)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '     '       Text.Whitespace
@@ -491,9 +491,9 @@
 '                  ' Text.Whitespace
 'PIC 9(4)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 ' '           Text.Whitespace
@@ -502,9 +502,9 @@
 '                    ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -513,9 +513,9 @@
 '                       ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -524,16 +524,16 @@
 '                    ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'File-Name'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -547,16 +547,16 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'File-Status-Message' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -568,7 +568,7 @@
 'VALUE '      Keyword.Pseudo
 "'Status Code: '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -577,7 +577,7 @@
 '               ' Text.Whitespace
 'PIC 9(2)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -589,7 +589,7 @@
 'VALUE '      Keyword.Pseudo
 "', Meaning: '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -598,16 +598,16 @@
 '                  ' Text.Whitespace
 'PIC X(25)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Flags'       Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -616,7 +616,7 @@
 '  '          Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -628,7 +628,7 @@
 'VALUE '      Keyword.Pseudo
 "'Y'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '        '    Text.Whitespace
@@ -640,7 +640,7 @@
 'VALUE '      Keyword.Pseudo
 "'W'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -652,7 +652,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '     '       Text.Whitespace
@@ -661,7 +661,7 @@
 '               ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '        '    Text.Whitespace
@@ -673,7 +673,7 @@
 'VALUE '      Keyword.Pseudo
 "'Y'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '        '    Text.Whitespace
@@ -685,7 +685,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0809'      Comment
 '     '       Text.Whitespace
@@ -694,7 +694,7 @@
 '         '   Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0809'      Comment
 '        '    Text.Whitespace
@@ -707,7 +707,7 @@
 'VALUE '      Keyword.Pseudo
 "'Y'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0809'      Comment
 '        '    Text.Whitespace
@@ -719,7 +719,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -728,7 +728,7 @@
 '        '    Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -740,7 +740,7 @@
 'VALUE '      Keyword.Pseudo
 "'Y'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -752,7 +752,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -761,7 +761,7 @@
 '      '      Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -773,7 +773,7 @@
 'VALUE '      Keyword.Pseudo
 "'Y'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -785,7 +785,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '     '       Text.Whitespace
@@ -794,7 +794,7 @@
 '       '     Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '        '    Text.Whitespace
@@ -806,7 +806,7 @@
 'VALUE '      Keyword.Pseudo
 "'Y'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '        '    Text.Whitespace
@@ -818,7 +818,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0809'      Comment
 '     '       Text.Whitespace
@@ -827,7 +827,7 @@
 '     '       Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0809'      Comment
 '        '    Text.Whitespace
@@ -839,7 +839,7 @@
 'VALUE '      Keyword.Pseudo
 "'L'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0809'      Comment
 '        '    Text.Whitespace
@@ -851,7 +851,7 @@
 'VALUE '      Keyword.Pseudo
 "'I'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0809'      Comment
 '        '    Text.Whitespace
@@ -863,7 +863,7 @@
 'VALUE '      Keyword.Pseudo
 "' '"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -872,7 +872,7 @@
 '           ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -884,7 +884,7 @@
 'VALUE '      Keyword.Pseudo
 "'Y'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -896,9 +896,9 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 ' '           Text.Whitespace
@@ -907,10 +907,10 @@
 '             ' Text.Whitespace
 'PIC X(80)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -921,9 +921,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -934,9 +934,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 ' '           Text.Whitespace
@@ -947,9 +947,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 ' '           Text.Whitespace
@@ -960,9 +960,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -971,9 +971,9 @@
 '                 ' Text.Whitespace
 'PIC XXXX/XX/XXBXX/XX' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 ' '           Text.Whitespace
@@ -984,7 +984,7 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -995,7 +995,7 @@
 ' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -1006,7 +1006,7 @@
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -1017,7 +1017,7 @@
 ' '           Text.Whitespace
 '2'           Literal.Number.Integer
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -1028,9 +1028,9 @@
 ' '           Text.Whitespace
 '3'           Literal.Number.Integer
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 ' '           Text.Whitespace
@@ -1039,9 +1039,9 @@
 '             ' Text.Whitespace
 'PIC X(7)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1050,9 +1050,9 @@
 '              ' Text.Whitespace
 'PIC X(80)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1061,9 +1061,9 @@
 '              ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1072,9 +1072,9 @@
 '                 ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1083,9 +1083,9 @@
 '              ' Text.Whitespace
 'PIC X(30)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1094,9 +1094,9 @@
 '              ' Text.Whitespace
 'PIC X(40)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1105,9 +1105,9 @@
 '                   ' Text.Whitespace
 'PIC X(31)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1117,16 +1117,16 @@
 'VALUE '      Keyword.Pseudo
 "'>'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Switch-Display' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -1135,7 +1135,7 @@
 '      '      Text.Whitespace
 'PIC X(19)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -1144,7 +1144,7 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -1153,9 +1153,9 @@
 '           ' Text.Whitespace
 'PIC X(60)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1164,7 +1164,7 @@
 '              ' Text.Whitespace
 'PIC X(12)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -1177,7 +1177,7 @@
 ' '           Text.Whitespace
 "'@C'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -1190,7 +1190,7 @@
 ' '           Text.Whitespace
 "'@D'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -1200,7 +1200,7 @@
 'VALUE '      Keyword.Pseudo
 "'@DLL'"      Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -1213,7 +1213,7 @@
 ' '           Text.Whitespace
 "'@E'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -1226,7 +1226,7 @@
 ' '           Text.Whitespace
 "'@EX'"       Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -1239,7 +1239,7 @@
 ' '           Text.Whitespace
 "'@N'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -1252,7 +1252,7 @@
 ' '           Text.Whitespace
 "'@T'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -1265,7 +1265,7 @@
 ' '           Text.Whitespace
 "'@S'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -1278,9 +1278,9 @@
 ' '           Text.Whitespace
 "'@X'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1289,16 +1289,16 @@
 '    '        Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Switch-Value' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -1307,7 +1307,7 @@
 '                     ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -1316,7 +1316,7 @@
 ' '           Text.Whitespace
 'PIC X(255)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1326,19 +1326,19 @@
 'REDEFINES'   Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '88 '         Literal.Number.Integer
 'Valid-Config-Filename' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1354,7 +1354,7 @@
 ' '           Text.Whitespace
 "'DEFAULT'"   Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '              ' Text.Whitespace
@@ -1366,16 +1366,16 @@
 '      '      Text.Whitespace
 "'MVS'"       Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Switches'    Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -1388,14 +1388,14 @@
 ' '           Text.Whitespace
 'SPACES'      Name.Constant
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '05 '         Literal.Number.Integer
 'S-CfgS'      Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1407,7 +1407,7 @@
 'VALUE '      Keyword.Pseudo
 "' '"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1419,7 +1419,7 @@
 'VALUE '      Keyword.Pseudo
 "' '"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1431,7 +1431,7 @@
 'VALUE '      Keyword.Pseudo
 "' '"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1444,7 +1444,7 @@
 ' '           Text.Whitespace
 'Selection-Char' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1456,7 +1456,7 @@
 'VALUE '      Keyword.Pseudo
 "' '"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1468,7 +1468,7 @@
 'VALUE '      Keyword.Pseudo
 "' '"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1480,7 +1480,7 @@
 'VALUE '      Keyword.Pseudo
 "' '"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -1493,14 +1493,14 @@
 ' '           Text.Whitespace
 'SPACES'      Name.Constant
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '05 '         Literal.Number.Integer
 'S-Yes-No-Switches' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1512,7 +1512,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1524,7 +1524,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '        '    Text.Whitespace
@@ -1536,7 +1536,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '        '    Text.Whitespace
@@ -1548,7 +1548,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1560,7 +1560,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1572,7 +1572,7 @@
 'VALUE '      Keyword.Pseudo
 "'Y'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1584,7 +1584,7 @@
 'VALUE '      Keyword.Pseudo
 "'A'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1596,7 +1596,7 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -1608,9 +1608,9 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1621,9 +1621,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '   '         Text.Whitespace
@@ -1631,7 +1631,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -1751,7 +1751,7 @@
 'X'           Name.Variable
 '"DA"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1763,7 +1763,7 @@
 'X'           Name.Variable
 '"C0"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1775,7 +1775,7 @@
 'X'           Name.Variable
 '"BF"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1787,7 +1787,7 @@
 'X'           Name.Variable
 '"D9"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1799,7 +1799,7 @@
 'X'           Name.Variable
 '"C2"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1811,7 +1811,7 @@
 'X'           Name.Variable
 '"C1"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1823,7 +1823,7 @@
 'X'           Name.Variable
 '"C4"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1835,7 +1835,7 @@
 'X'           Name.Variable
 '"B3"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -1876,9 +1876,9 @@
 ' '           Text.Whitespace
 'SCREEN'      Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -1888,7 +1888,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                    ' Text.Whitespace
@@ -1898,7 +1898,7 @@
 ' '           Text.Whitespace
 'AUTO'        Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -1912,7 +1912,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -1922,7 +1922,7 @@
 '  '          Text.Whitespace
 'HIGHLIGHT'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -1937,7 +1937,7 @@
 ' '           Text.Whitespace
 'LD-UL-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -1948,7 +1948,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -1960,9 +1960,9 @@
 ' '           Text.Whitespace
 'LD-UR-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -1977,7 +1977,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -1989,9 +1989,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2006,7 +2006,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2018,9 +2018,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2035,7 +2035,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2047,9 +2047,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2064,7 +2064,7 @@
 ' '           Text.Whitespace
 'LD-LL-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2075,7 +2075,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2087,9 +2087,9 @@
 ' '           Text.Whitespace
 'LD-LR-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2104,7 +2104,7 @@
 ' '           Text.Whitespace
 'LD-UL-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2115,7 +2115,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2127,7 +2127,7 @@
 ' '           Text.Whitespace
 'LD-Upper-T'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2138,7 +2138,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2150,9 +2150,9 @@
 ' '           Text.Whitespace
 'LD-UR-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2167,7 +2167,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2179,7 +2179,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2191,9 +2191,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2208,7 +2208,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2220,7 +2220,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2232,9 +2232,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2249,7 +2249,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2261,7 +2261,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2273,9 +2273,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2290,7 +2290,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2302,7 +2302,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2314,9 +2314,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2331,7 +2331,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2343,7 +2343,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2355,9 +2355,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2372,7 +2372,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2384,7 +2384,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2396,9 +2396,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2413,7 +2413,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2425,7 +2425,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2437,9 +2437,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2454,7 +2454,7 @@
 ' '           Text.Whitespace
 'LD-LL-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2465,7 +2465,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2477,7 +2477,7 @@
 ' '           Text.Whitespace
 'LD-Lower-T'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2488,7 +2488,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2500,9 +2500,9 @@
 ' '           Text.Whitespace
 'LD-LR-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2517,7 +2517,7 @@
 ' '           Text.Whitespace
 'LD-UL-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2528,7 +2528,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2540,9 +2540,9 @@
 ' '           Text.Whitespace
 'LD-UR-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2557,7 +2557,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2569,9 +2569,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2586,7 +2586,7 @@
 ' '           Text.Whitespace
 'LD-LL-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2597,7 +2597,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2609,9 +2609,9 @@
 ' '           Text.Whitespace
 'LD-LR-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2626,7 +2626,7 @@
 ' '           Text.Whitespace
 'LD-UL-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2637,7 +2637,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2649,9 +2649,9 @@
 ' '           Text.Whitespace
 'LD-UR-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2666,7 +2666,7 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2678,9 +2678,9 @@
 ' '           Text.Whitespace
 'LD-Vert-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2695,7 +2695,7 @@
 ' '           Text.Whitespace
 'LD-LL-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2706,7 +2706,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2718,7 +2718,7 @@
 ' '           Text.Whitespace
 'LD-LR-Corner' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -2741,7 +2741,7 @@
 ' '           Text.Whitespace
 'HIGHLIGHT'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '       '     Text.Whitespace
@@ -2755,7 +2755,7 @@
 'VALUE '      Keyword.Pseudo
 "' OCic ('"   Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '       '     Text.Whitespace
@@ -2766,7 +2766,7 @@
 ' '           Text.Whitespace
 'OC-Compiled' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '       '     Text.Whitespace
@@ -2775,13 +2775,13 @@
 "') OpenCOBOL V1.1 06FEB2009 '" Literal.String.Single
 ' '           Text.Whitespace
 '&'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                               ' Text.Whitespace
 "'Interactive Compilation         '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '       '     Text.Whitespace
@@ -2798,7 +2798,7 @@
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -2812,7 +2812,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2822,7 +2822,7 @@
 '  '          Text.Whitespace
 'HIGHLIGHT'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2836,7 +2836,7 @@
 'VALUE '      Keyword.Pseudo
 "'On/Off Switches:'" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2847,7 +2847,7 @@
 'VALUE '      Keyword.Pseudo
 "'Configuration:'" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2866,7 +2866,7 @@
 '                              ' Text.Whitespace
 "'):'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2885,7 +2885,7 @@
 '                              ' Text.Whitespace
 "'y):'"       Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -2899,7 +2899,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2909,7 +2909,7 @@
 ' '           Text.Whitespace
 'LOWLIGHT'    Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2923,7 +2923,7 @@
 'VALUE '      Keyword.Pseudo
 "'Program:  '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2937,7 +2937,7 @@
 'VALUE '      Keyword.Pseudo
 "'Folder:   '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2951,9 +2951,9 @@
 'VALUE '      Keyword.Pseudo
 "'Filename: '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2967,7 +2967,7 @@
 'VALUE '      Keyword.Pseudo
 "'F-Key: Select Opt'" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2981,7 +2981,7 @@
 'VALUE '      Keyword.Pseudo
 "'Enter: Compile   '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -2995,7 +2995,7 @@
 'VALUE '      Keyword.Pseudo
 "'Esc:   Quit      '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -3009,7 +3009,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3019,7 +3019,7 @@
 ' '           Text.Whitespace
 'HIGHLIGHT'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3036,7 +3036,7 @@
 ' '           Text.Whitespace
 'Prog-Name'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3053,7 +3053,7 @@
 ' '           Text.Whitespace
 'Prog-Folder' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3070,7 +3070,7 @@
 ' '           Text.Whitespace
 'Prog-File-Name' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -3084,7 +3084,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3094,7 +3094,7 @@
 ' '           Text.Whitespace
 'HIGHLIGHT'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3108,7 +3108,7 @@
 'VALUE '      Keyword.Pseudo
 "'F1'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3122,7 +3122,7 @@
 'VALUE '      Keyword.Pseudo
 "'F2'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3136,7 +3136,7 @@
 'VALUE '      Keyword.Pseudo
 "'F3'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3150,7 +3150,7 @@
 'VALUE '      Keyword.Pseudo
 "'F4'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3164,7 +3164,7 @@
 'VALUE '      Keyword.Pseudo
 "'F5'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3178,7 +3178,7 @@
 'VALUE '      Keyword.Pseudo
 "'F6'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3192,7 +3192,7 @@
 'VALUE '      Keyword.Pseudo
 "'F7'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3206,7 +3206,7 @@
 'VALUE '      Keyword.Pseudo
 "'F8'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3220,7 +3220,7 @@
 'VALUE '      Keyword.Pseudo
 "'F9'"        Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -3234,7 +3234,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3244,7 +3244,7 @@
 '   '         Text.Whitespace
 'HIGHLIGHT'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3261,7 +3261,7 @@
 ' '           Text.Whitespace
 'S-DEBUG'     Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3278,7 +3278,7 @@
 ' '           Text.Whitespace
 'S-DLL'       Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3295,7 +3295,7 @@
 ' '           Text.Whitespace
 'S-SUBROUTINE' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3312,7 +3312,7 @@
 ' '           Text.Whitespace
 'S-EXECUTE'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3329,7 +3329,7 @@
 ' '           Text.Whitespace
 'S-NOTRUNC'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3346,7 +3346,7 @@
 ' '           Text.Whitespace
 'S-TRACE'     Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3363,7 +3363,7 @@
 ' '           Text.Whitespace
 'S-TRACEALL'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3380,7 +3380,7 @@
 ' '           Text.Whitespace
 'S-SOURCE'    Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3397,7 +3397,7 @@
 ' '           Text.Whitespace
 'S-XREF'      Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -3411,7 +3411,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3421,7 +3421,7 @@
 '  '          Text.Whitespace
 'LOWLIGHT'    Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3435,7 +3435,7 @@
 'VALUE '      Keyword.Pseudo
 "'Compile debug lines   '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3449,7 +3449,7 @@
 'VALUE '      Keyword.Pseudo
 "'Always make DLLs      '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3463,7 +3463,7 @@
 'VALUE '      Keyword.Pseudo
 "'Pgm is a SUBROUTINE   '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3477,7 +3477,7 @@
 'VALUE '      Keyword.Pseudo
 "'Execute if compile OK '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3491,7 +3491,7 @@
 'VALUE '      Keyword.Pseudo
 "'No COMP/BINARY trunc  '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3505,7 +3505,7 @@
 'VALUE '      Keyword.Pseudo
 "'Trace procedures      '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3519,7 +3519,7 @@
 'VALUE '      Keyword.Pseudo
 "'Trace proc + stmnts   '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3533,7 +3533,7 @@
 'VALUE '      Keyword.Pseudo
 "'Produce source listing'" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3547,7 +3547,7 @@
 'VALUE '      Keyword.Pseudo
 "'Produce xref listing  '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -3561,7 +3561,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3571,7 +3571,7 @@
 ' '           Text.Whitespace
 'HIGHLIGHT'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3585,7 +3585,7 @@
 'VALUE '      Keyword.Pseudo
 "'S-F1'"      Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3599,7 +3599,7 @@
 'VALUE '      Keyword.Pseudo
 "'S-F2'"      Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3613,7 +3613,7 @@
 'VALUE '      Keyword.Pseudo
 "'S-F3'"      Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3627,7 +3627,7 @@
 'VALUE '      Keyword.Pseudo
 "'S-F4'"      Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3641,7 +3641,7 @@
 'VALUE '      Keyword.Pseudo
 "'S-F5'"      Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3655,7 +3655,7 @@
 'VALUE '      Keyword.Pseudo
 "'S-F6'"      Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3669,7 +3669,7 @@
 'VALUE '      Keyword.Pseudo
 "'S-F7'"      Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -3683,7 +3683,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3693,7 +3693,7 @@
 ' '           Text.Whitespace
 'HIGHLIGHT'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3710,7 +3710,7 @@
 ' '           Text.Whitespace
 'S-Cfg-BS2000' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3727,7 +3727,7 @@
 ' '           Text.Whitespace
 'S-Cfg-COBOL85' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3744,7 +3744,7 @@
 ' '           Text.Whitespace
 'S-Cfg-COBOL2002' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3761,7 +3761,7 @@
 ' '           Text.Whitespace
 'S-Cfg-DEFAULT' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3778,7 +3778,7 @@
 ' '           Text.Whitespace
 'S-Cfg-IBM'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3795,7 +3795,7 @@
 ' '           Text.Whitespace
 'S-Cfg-MF'    Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3812,7 +3812,7 @@
 ' '           Text.Whitespace
 'S-Cfg-MVS'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -3826,7 +3826,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3836,7 +3836,7 @@
 ' '           Text.Whitespace
 'LOWLIGHT'    Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3850,7 +3850,7 @@
 'VALUE '      Keyword.Pseudo
 "'BS2000    '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3864,7 +3864,7 @@
 'VALUE '      Keyword.Pseudo
 "'COBOL85   '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3878,7 +3878,7 @@
 'VALUE '      Keyword.Pseudo
 "'COBOL2002 '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3892,7 +3892,7 @@
 'VALUE '      Keyword.Pseudo
 "'Default   '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3906,7 +3906,7 @@
 'VALUE '      Keyword.Pseudo
 "'IBM       '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3920,7 +3920,7 @@
 'VALUE '      Keyword.Pseudo
 "'MicroFocus'" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3934,7 +3934,7 @@
 'VALUE '      Keyword.Pseudo
 "'MVS       '" Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *>\n'  Comment
 
@@ -3948,7 +3948,7 @@
 'BACKGROUND-COLOR' Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-COLOR-BLACK' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3958,7 +3958,7 @@
 ' '           Text.Whitespace
 'HIGHLIGHT'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3975,7 +3975,7 @@
 ' '           Text.Whitespace
 'S-EXTRA'     Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
@@ -3992,7 +3992,7 @@
 ' '           Text.Whitespace
 'S-ARGS'      Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -4002,7 +4002,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -4026,7 +4026,7 @@
 ' '           Text.Whitespace
 'DECLARATIVES' Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4036,7 +4036,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4054,7 +4054,7 @@
 ' '           Text.Whitespace
 'Source-Code' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4062,14 +4062,14 @@
 '-'           Operator
 'Handle-Error' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'COPY'        Keyword.Pseudo
 ' '           Text.Whitespace
 'FileStat-Msgs' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -4080,7 +4080,7 @@
 'BY'          Keyword.Pseudo
 ' '           Text.Whitespace
 'FSM-Status'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                   ' Text.Whitespace
@@ -4090,7 +4090,7 @@
 ' '           Text.Whitespace
 'FSM-Msg'     Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4101,7 +4101,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4114,7 +4114,7 @@
 '35\n               ' Literal.Number.Integer
 'DISPLAY\n                   ' Keyword.Reserved
 '\'File not found: "\'' Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -4124,12 +4124,12 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 '\'"\''       Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -4139,7 +4139,7 @@
 ' '           Text.Whitespace
 'DISPLAY\n                   ' Keyword.Reserved
 '\'Error accessing file: "\'' Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -4149,12 +4149,12 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 '\'"\''       Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -4164,7 +4164,7 @@
 ' '           Text.Whitespace
 'GOBACK\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4172,7 +4172,7 @@
 ' '           Text.Whitespace
 'DECLARATIVES' Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -4184,9 +4184,9 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4195,7 +4195,7 @@
 '100'         Literal.Number.Integer
 '-'           Operator
 'Initialization' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '     '       Text.Whitespace
@@ -4208,7 +4208,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'TRUE'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '     '       Text.Whitespace
@@ -4219,7 +4219,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Complete'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '         '   Text.Whitespace
@@ -4228,7 +4228,7 @@
 '200'         Literal.Number.Integer
 '-'           Operator
 'Let-User-Set-Switches' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '         '   Text.Whitespace
@@ -4237,7 +4237,7 @@
 '210'         Literal.Number.Integer
 '-'           Operator
 'Run-Compiler' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
@@ -4253,7 +4253,7 @@
 '-'           Operator
 'Compile-OK-Warn' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
@@ -4275,7 +4275,7 @@
 ' '           Text.Whitespace
 'SPACE'       Name.Constant
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -4284,12 +4284,12 @@
 '220'         Literal.Number.Integer
 '-'           Operator
 'Make-Listing' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '         '   Text.Whitespace
@@ -4302,7 +4302,7 @@
 ' '           Text.Whitespace
 'SPACES'      Name.Constant
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '         '   Text.Whitespace
@@ -4312,7 +4312,7 @@
 '-'           Operator
 'Output-File-Avail' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '             ' Text.Whitespace
@@ -4321,20 +4321,20 @@
 '230'         Literal.Number.Integer
 '-'           Operator
 'Run-Program' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '         '   Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '     '       Text.Whitespace
 'END-PERFORM\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4342,7 +4342,7 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4351,12 +4351,12 @@
 '900'         Literal.Number.Integer
 '-'           Operator
 'Terminate'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      * -- Control will NOT return\n' Comment
 
@@ -4370,7 +4370,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -4540,7 +4540,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4548,7 +4548,7 @@
 '-'           Operator
 'Init'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4558,14 +4558,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4573,7 +4573,7 @@
 '-'           Operator
 'Extract-Kwd-And-Value' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4590,7 +4590,7 @@
 '('           Punctuation
 'Command-Line-Args' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -4601,14 +4601,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'J'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'UNSTRING'    Keyword.Reserved
 ' '           Text.Whitespace
 'Command-Line-Args' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -4621,7 +4621,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword-And-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -4630,7 +4630,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -4648,7 +4648,7 @@
 'UNSTRING'    Keyword.Reserved
 ' '           Text.Whitespace
 'Switch-Keyword-And-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -4656,7 +4656,7 @@
 ' '           Text.Whitespace
 'BY '         Keyword.Pseudo
 "'='"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -4666,7 +4666,7 @@
 ','           Punctuation
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -4677,7 +4677,7 @@
 '030'         Literal.Number.Integer
 '-'           Operator
 'Process-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -4685,9 +4685,9 @@
 ' '           Text.Whitespace
 'END-PERFORM\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4695,15 +4695,15 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EXIT'        Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -4725,22 +4725,22 @@
 '-'           Operator
 'Build-And-Issue-Command' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'DISPLAY\n              ' Keyword.Reserved
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'END-DISPLAY\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4748,13 +4748,13 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EXIT'        Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -4766,7 +4766,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -4774,7 +4774,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4782,7 +4782,7 @@
 '-'           Operator
 'Init'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4796,7 +4796,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4810,9 +4810,9 @@
 ' '           Text.Whitespace
 'TRUE\n           ' Name.Builtin
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -4820,7 +4820,7 @@
 '-'           Operator
 'Process'     Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -4831,7 +4831,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Is-EXTRA' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -4842,7 +4842,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -4854,7 +4854,7 @@
 ' '           Text.Whitespace
 'BY '         Keyword.Pseudo
 "'='"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -4864,7 +4864,7 @@
 ','           Punctuation
 ' '           Text.Whitespace
 'S-EXTRA'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
@@ -4873,7 +4873,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -4889,14 +4889,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Is-CONFIG' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -4906,7 +4906,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -4916,27 +4916,27 @@
 '('           Punctuation
 'Switch-Value' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'EVALUATE'    Keyword.Reserved
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
 'WHEN '       Keyword.Pseudo
 "'BS2000'"    Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -4947,7 +4947,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -4958,13 +4958,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-BS2000' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
 'WHEN '       Keyword.Pseudo
 "'COBOL85'"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -4975,7 +4975,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -4986,13 +4986,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-COBOL85' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
 'WHEN '       Keyword.Pseudo
 "'COBOL2002'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5003,7 +5003,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5014,13 +5014,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-COBOL2002' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
 'WHEN '       Keyword.Pseudo
 "'DEFAULT'"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5031,7 +5031,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5042,13 +5042,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-DEFAULT' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
 'WHEN '       Keyword.Pseudo
 "'IBM'"       Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5059,7 +5059,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5070,13 +5070,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-IBM'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
 'WHEN '       Keyword.Pseudo
 "'MF'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5087,7 +5087,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5098,13 +5098,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-MF'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
 'WHEN '       Keyword.Pseudo
 "'MVS'"       Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5115,7 +5115,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5126,7 +5126,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-MVS'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -5138,26 +5138,26 @@
 "'An invalid /CONFIG switch value '" Literal.String.Single
 ' '           Text.Whitespace
 '&'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                          ' Text.Whitespace
 "'was specified on the command line '" Literal.String.Single
 ' '           Text.Whitespace
 '&'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                          ' Text.Whitespace
 "'- ignored'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                       ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5166,7 +5166,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Is-DEBUG' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5176,7 +5176,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5186,14 +5186,14 @@
 '('           Punctuation
 'Switch-Value' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5202,7 +5202,7 @@
 '040'         Literal.Number.Integer
 '-'           Operator
 'Process-Yes-No-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5211,7 +5211,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Switch-Is-Good' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -5222,19 +5222,19 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-DEBUG'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Is-DLL' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5244,7 +5244,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5254,14 +5254,14 @@
 '('           Punctuation
 'Switch-Value' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5270,7 +5270,7 @@
 '040'         Literal.Number.Integer
 '-'           Operator
 'Process-Yes-No-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5279,7 +5279,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Switch-Is-Good' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
@@ -5290,7 +5290,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-DLL'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5299,7 +5299,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Is-EXECUTE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5309,7 +5309,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5319,14 +5319,14 @@
 '('           Punctuation
 'Switch-Value' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5335,7 +5335,7 @@
 '040'         Literal.Number.Integer
 '-'           Operator
 'Process-Yes-No-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5344,7 +5344,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Switch-Is-Good' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -5355,7 +5355,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-EXECUTE'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5364,7 +5364,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Is-NOTRUNC' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5374,7 +5374,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5384,14 +5384,14 @@
 '('           Punctuation
 'Switch-Value' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5400,7 +5400,7 @@
 '040'         Literal.Number.Integer
 '-'           Operator
 'Process-Yes-No-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5409,7 +5409,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Switch-Is-Good' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -5420,19 +5420,19 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-NOTRUNC'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Is-SOURCE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5442,7 +5442,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5452,14 +5452,14 @@
 '('           Punctuation
 'Switch-Value' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5468,7 +5468,7 @@
 '050'         Literal.Number.Integer
 '-'           Operator
 'Process-Yes-No-All' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5477,7 +5477,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Switch-Is-Good' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
@@ -5488,7 +5488,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-SOURCE'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5497,7 +5497,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Is-TRACE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5507,7 +5507,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5517,14 +5517,14 @@
 '('           Punctuation
 'Switch-Value' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5533,7 +5533,7 @@
 '050'         Literal.Number.Integer
 '-'           Operator
 'Process-Yes-No-All' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5542,7 +5542,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Switch-Is-Good' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -5553,19 +5553,19 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-TRACE'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Is-XREF' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5575,7 +5575,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5585,14 +5585,14 @@
 '('           Punctuation
 'Switch-Value' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5601,7 +5601,7 @@
 '050'         Literal.Number.Integer
 '-'           Operator
 'Process-Yes-No-All' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5610,7 +5610,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Switch-Is-Good' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
@@ -5621,7 +5621,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-XREF'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -5638,13 +5638,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'STRING '     Keyword.Reserved
 '\'"\''       Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                    ' Text.Whitespace
@@ -5652,19 +5652,19 @@
 '('           Punctuation
 'Switch-Keyword' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                    ' Text.Whitespace
 '\'" is not a valid switch \'' Literal.String.Single
 ' '           Text.Whitespace
 '&'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                   ' Text.Whitespace
 "'- ignored'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                    ' Text.Whitespace
@@ -5675,7 +5675,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5693,9 +5693,9 @@
 ' '           Text.Whitespace
 'END-EVALUATE\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -5703,13 +5703,13 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EXIT'        Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -5721,7 +5721,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -5729,7 +5729,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -5737,20 +5737,20 @@
 '-'           Operator
 'Process'     Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EVALUATE'    Keyword.Reserved
 ' '           Text.Whitespace
 'SV-1'        Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'WHEN '       Keyword.Pseudo
 "'Y'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5760,13 +5760,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'WHEN '       Keyword.Pseudo
 "'N'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5776,7 +5776,7 @@
 'To'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -5791,7 +5791,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5802,12 +5802,12 @@
 '('           Punctuation
 'Switch-Value' Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
 '\'" is not a valid value for the "\'' Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5817,7 +5817,7 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 '\'" switch\'' Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -5828,7 +5828,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -5846,9 +5846,9 @@
 ' '           Text.Whitespace
 'END-EVALUATE\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -5856,13 +5856,13 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EXIT'        Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -5874,7 +5874,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -5882,7 +5882,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -5890,7 +5890,7 @@
 '-'           Operator
 'Process'     Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -5901,7 +5901,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "'A'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -5911,7 +5911,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -5922,15 +5922,15 @@
 '040'         Literal.Number.Integer
 '-'           Operator
 'Process-Yes-No-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'END-IF\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -5938,13 +5938,13 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EXIT'        Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -5956,7 +5956,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -5964,7 +5964,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -5972,7 +5972,7 @@
 '-'           Operator
 'Init'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -5983,7 +5983,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "'A'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -5992,7 +5992,7 @@
 '070'         Literal.Number.Integer
 '-'           Operator
 'Find-LINKAGE-SECTION' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6001,7 +6001,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Compile-As-Subpgm' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -6011,7 +6011,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6023,7 +6023,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6036,13 +6036,13 @@
 '040'         Literal.Number.Integer
 '-'           Operator
 'Process-Yes-No-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'END-IF\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -6054,7 +6054,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -6062,7 +6062,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -6070,7 +6070,7 @@
 '-'           Operator
 'Init'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -6079,7 +6079,7 @@
 'INPUT'       Keyword.Pseudo
 ' '           Text.Whitespace
 'Source-Code' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -6111,7 +6111,7 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 'st-Prog-Complete' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6126,7 +6126,7 @@
 'CLOSE'       Keyword.Reserved
 ' '           Text.Whitespace
 'Source-Code' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -6142,12 +6142,12 @@
 'USING'       Keyword.Pseudo
 ' '           Text.Whitespace
 'Source-Code-Record' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
 'F-Source-Record-Type' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6158,7 +6158,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Source-Rec-Ident' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -6177,9 +6177,9 @@
 ' '           Text.Whitespace
 'END-PERFORM\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -6187,7 +6187,7 @@
 '-'           Operator
 'Process-Source' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -6208,7 +6208,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Source-Rec-Linkage' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                ' Text.Whitespace
@@ -6217,7 +6217,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Source-Rec-Ident' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6232,7 +6232,7 @@
 'CLOSE'       Keyword.Reserved
 ' '           Text.Whitespace
 'Source-Code' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -6248,12 +6248,12 @@
 'USING'       Keyword.Pseudo
 ' '           Text.Whitespace
 'Source-Code-Record' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
 'F-Source-Record-Type' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6264,7 +6264,7 @@
 'CLOSE'       Keyword.Reserved
 ' '           Text.Whitespace
 'Source-Code' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -6273,7 +6273,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Source-Rec-Linkage' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6289,9 +6289,9 @@
 ' '           Text.Whitespace
 'END-IF\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -6299,13 +6299,13 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EXIT'        Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -6317,7 +6317,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -6325,9 +6325,9 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 ' '           Text.Whitespace
@@ -6335,18 +6335,18 @@
 '-'           Operator
 'Determine-OS-Type' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'CALL '       Keyword.Reserved
 "'GETOSTYPE'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'END-CALL'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -6357,21 +6357,21 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'OS-Type'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'EVALUATE'    Keyword.Reserved
 ' '           Text.Whitespace
 'TRUE'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'OS-Unknown'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -6381,7 +6381,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Dir-Char'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -6391,7 +6391,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'OS-Type-Literal' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6402,7 +6402,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F1'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6413,7 +6413,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F2'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6424,7 +6424,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F3'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6435,7 +6435,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F4'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6446,7 +6446,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F5'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6457,7 +6457,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F6'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6468,14 +6468,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F7'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'OS-Windows'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -6485,7 +6485,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Dir-Char'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -6495,7 +6495,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'OS-Type-Literal' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6506,7 +6506,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F1'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6517,7 +6517,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F2'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6528,7 +6528,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F3'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6539,7 +6539,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F4'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6550,7 +6550,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F5'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6561,7 +6561,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F6'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6572,14 +6572,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F7'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'OS-Cygwin'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -6589,7 +6589,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Dir-Char'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -6599,7 +6599,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'OS-Type-Literal' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6610,7 +6610,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F1'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6621,7 +6621,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F2'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6632,7 +6632,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F3'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6643,7 +6643,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F4'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6654,7 +6654,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F5'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6665,7 +6665,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F6'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6676,14 +6676,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F7'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'OS-UNIX'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -6693,7 +6693,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Dir-Char'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -6703,7 +6703,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'OS-Type-Literal' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6714,7 +6714,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F1'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6725,7 +6725,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F2'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6736,7 +6736,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F3'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6747,7 +6747,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F4'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6758,7 +6758,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F5'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6769,7 +6769,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F6'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '             ' Text.Whitespace
@@ -6780,19 +6780,19 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F7'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'END-EVALUATE' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -6800,7 +6800,7 @@
 '-'           Operator
 'Set-Environment-Vars' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -6811,7 +6811,7 @@
 ' '           Text.Whitespace
 'TO '         Keyword.Pseudo
 "'Y'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -6822,14 +6822,14 @@
 '        '    Text.Whitespace
 'TO '         Keyword.Pseudo
 "'Y'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -6837,14 +6837,14 @@
 '-'           Operator
 'Generate-Cobc-Output-Fn' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'ACCEPT'      Keyword.Reserved
 ' '           Text.Whitespace
 'Env-TEMP'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6852,7 +6852,7 @@
 ' '           Text.Whitespace
 'ENVIRONMENT ' Keyword.Reserved
 '"TEMP"'      Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -6865,7 +6865,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Output-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -6877,17 +6877,17 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '            ' Text.Whitespace
 'Dir-Char'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '            ' Text.Whitespace
 "'OC-Messages.TXT'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '            ' Text.Whitespace
@@ -6898,15 +6898,15 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Output-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'END-STRING\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -6914,7 +6914,7 @@
 '-'           Operator
 'Generate-Banner-Line-Info' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -6930,14 +6930,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'OC-Compiled' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'INSPECT'     Keyword.Reserved
 ' '           Text.Whitespace
 'OC-Compiled' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6948,7 +6948,7 @@
 ' '           Text.Whitespace
 'BY '         Keyword.Pseudo
 "':'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6958,9 +6958,9 @@
 ' '           Text.Whitespace
 'SPACE\n           ' Name.Constant
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -6968,14 +6968,14 @@
 '-'           Operator
 'Establish-Switch-Settings' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'ACCEPT'      Keyword.Reserved
 ' '           Text.Whitespace
 'Command-Line-Args' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -6994,14 +6994,14 @@
 ' '           Text.Whitespace
 'Leading'     Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '       '     Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Command-Line-Args' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7011,7 +7011,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Tally'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -7027,7 +7027,7 @@
 ' '           Text.Whitespace
 'ALL '        Keyword.Pseudo
 "'@'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7045,7 +7045,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'File-Name'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7056,12 +7056,12 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Command-Line-Args' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
@@ -7073,7 +7073,7 @@
 ' '           Text.Whitespace
 'BY '         Keyword.Pseudo
 "'@'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -7083,7 +7083,7 @@
 ','           Punctuation
 ' '           Text.Whitespace
 'Dummy'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7092,7 +7092,7 @@
 'INSPECT'     Keyword.Reserved
 ' '           Text.Whitespace
 'Command-Line-Args' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -7108,7 +7108,7 @@
 'UNSTRING'    Keyword.Reserved
 ' '           Text.Whitespace
 'Command-Line-Args' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -7124,7 +7124,7 @@
 ','           Punctuation
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7137,7 +7137,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Command-Line-Args' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
@@ -7153,7 +7153,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Command-Line-Args' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7171,7 +7171,7 @@
 ' '           Text.Whitespace
 'DISPLAY\n                   ' Keyword.Reserved
 "'No program filename was specified'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7182,7 +7182,7 @@
 '900'         Literal.Number.Integer
 '-'           Operator
 'Terminate'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7193,7 +7193,7 @@
 '010'         Literal.Number.Integer
 '-'           Operator
 'Parse-Args'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7204,7 +7204,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "'A'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7214,7 +7214,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Keyword' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7224,7 +7224,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Switch-Value' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7233,7 +7233,7 @@
 '070'         Literal.Number.Integer
 '-'           Operator
 'Find-LINKAGE-SECTION' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7242,7 +7242,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Compile-As-Subpgm' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -7252,7 +7252,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-SUBROUTINE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7264,7 +7264,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-SUBROUTINE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7284,7 +7284,7 @@
 'BY'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Selection-Char' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7299,14 +7299,14 @@
 ' '           Text.Whitespace
 'BY '         Keyword.Pseudo
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -7314,7 +7314,7 @@
 '-'           Operator
 'Determine-Folder-Path' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7324,7 +7324,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -7345,7 +7345,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "':'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -7355,7 +7355,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Dir-Char'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -7381,7 +7381,7 @@
 '='           Operator
 ' '           Text.Whitespace
 'Dir-Char'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7391,7 +7391,7 @@
 'FROM'        Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7411,7 +7411,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Prog-Folder' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7422,7 +7422,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Prog-File-Name' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7438,7 +7438,7 @@
 '('           Punctuation
 'I'           Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7450,19 +7450,19 @@
 ' '           Text.Whitespace
 'BY '         Keyword.Pseudo
 "'*'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Prog-Folder' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                  ' Text.Whitespace
 'Prog-File-Name' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7479,7 +7479,7 @@
 '('           Punctuation
 'I'           Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7493,7 +7493,7 @@
 ' '           Text.Whitespace
 'BY '         Keyword.Pseudo
 "'.'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7503,7 +7503,7 @@
 ','           Punctuation
 ' '           Text.Whitespace
 'Prog-Extension' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7520,7 +7520,7 @@
 'ACCEPT'      Keyword.Reserved
 ' '           Text.Whitespace
 'Prog-Folder' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -7528,23 +7528,23 @@
 ' '           Text.Whitespace
 'ENVIRONMENT ' Keyword.Reserved
 "'CD'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'END-ACCEPT'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'CALL '       Keyword.Reserved
 '"CBL_CHANGE_DIR"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -7556,14 +7556,14 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-CALL\n          ' Keyword.Reserved
 ' '           Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -7584,7 +7584,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "':'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -7594,15 +7594,15 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Dir-Char'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'END-IF\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 ' '           Text.Whitespace
@@ -7610,7 +7610,7 @@
 '-'           Operator
 'Other'       Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -7624,7 +7624,7 @@
 ' '           Text.Whitespace
 'Horizontal-Line' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -7634,7 +7634,7 @@
 '('           Punctuation
 "' OCic for '" Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                      ' Text.Whitespace
@@ -7645,19 +7645,19 @@
 'Trailing'    Keyword.Pseudo
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                      ' Text.Whitespace
 "' Copyright (C) 2009-2010, Gary L. Cutler,'" Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                      ' Text.Whitespace
 "' GPL'"      Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '       '     Text.Whitespace
@@ -7665,15 +7665,15 @@
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -7681,13 +7681,13 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EXIT'        Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -7699,7 +7699,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -7709,7 +7709,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -7717,7 +7717,7 @@
 '-'           Operator
 'Init'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7731,9 +7731,9 @@
 ' '           Text.Whitespace
 'TRUE\n           ' Name.Builtin
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -7741,7 +7741,7 @@
 '-'           Operator
 'Show-And-Change-Switches' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -7752,14 +7752,14 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'No-Switch-Changes' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'ACCEPT\n                  ' Keyword.Reserved
 ' '           Text.Whitespace
 'Switches-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -7775,14 +7775,14 @@
 'EVALUATE'    Keyword.Reserved
 ' '           Text.Whitespace
 'COB-CRT-STATUS' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-F1'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7801,7 +7801,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-DEBUG'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7813,7 +7813,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-DEBUG'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7822,7 +7822,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-F2'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7841,7 +7841,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-DLL'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7853,7 +7853,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-DLL'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7862,7 +7862,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-F3'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7881,7 +7881,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-SUBROUTINE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                         ' Text.Whitespace
@@ -7891,7 +7891,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-EXECUTE'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7903,7 +7903,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-SUBROUTINE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7912,7 +7912,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-F4'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7939,7 +7939,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-EXECUTE'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7951,7 +7951,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-EXECUTE'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7960,7 +7960,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-F5'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7979,7 +7979,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-NOTRUNC'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -7991,7 +7991,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-NOTRUNC'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8000,7 +8000,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-F6'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8019,7 +8019,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-TRACE'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                         ' Text.Whitespace
@@ -8029,7 +8029,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-TRACEALL'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8041,7 +8041,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-TRACE'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8050,7 +8050,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-F7'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8069,7 +8069,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-TRACEALL'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                         ' Text.Whitespace
@@ -8079,7 +8079,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-TRACE'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8091,19 +8091,19 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-TRACEALL'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-F8'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                     ' Text.Whitespace
@@ -8114,7 +8114,7 @@
 '='           Operator
 ' '           Text.Whitespace
 'SPACE'       Name.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                         ' Text.Whitespace
@@ -8125,12 +8125,12 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-SOURCE'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                     ' Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                         ' Text.Whitespace
@@ -8140,19 +8140,19 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-SOURCE'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                     ' Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-F9'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                     ' Text.Whitespace
@@ -8163,7 +8163,7 @@
 '='           Operator
 ' '           Text.Whitespace
 'SPACE'       Name.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                         ' Text.Whitespace
@@ -8174,12 +8174,12 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-XREF'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                     ' Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                         ' Text.Whitespace
@@ -8189,7 +8189,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-XREF'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                     ' Text.Whitespace
@@ -8198,7 +8198,7 @@
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'COB-SCR-ESC' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8207,14 +8207,14 @@
 '900'         Literal.Number.Integer
 '-'           Operator
 'Terminate'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F1'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8225,7 +8225,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8236,14 +8236,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-BS2000' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F2'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8254,7 +8254,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8265,14 +8265,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-COBOL85' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F3'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8283,7 +8283,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8294,14 +8294,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-COBOL2002' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F4'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8312,7 +8312,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8323,14 +8323,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-DEFAULT' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F5'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8341,7 +8341,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8352,14 +8352,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-IBM'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F6'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8370,7 +8370,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8381,14 +8381,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-MF'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0310'      Comment
 '                 ' Text.Whitespace
 'WHEN'        Keyword.Pseudo
 ' '           Text.Whitespace
 'CK-S-F7'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8399,7 +8399,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-CfgS'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -8410,7 +8410,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'S-Cfg-MVS'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -8420,14 +8420,14 @@
 ' '           Text.Whitespace
 'MOVE '       Keyword.Reserved
 "'An unsupported key was pressed'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                       ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8449,9 +8449,9 @@
 ' '           Text.Whitespace
 'END-PERFORM\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -8459,13 +8459,13 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EXIT'        Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -8477,7 +8477,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -8485,7 +8485,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -8493,7 +8493,7 @@
 '-'           Operator
 'Init'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -8504,24 +8504,24 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                    ' Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                    ' Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'DISPLAY\n              ' Keyword.Reserved
 ' '           Text.Whitespace
 'Switches-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -8533,7 +8533,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -8556,7 +8556,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Config-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8575,7 +8575,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Config-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8594,7 +8594,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Config-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8613,7 +8613,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Config-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8632,7 +8632,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Config-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8651,7 +8651,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Config-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8665,15 +8665,15 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Config-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'END-EVALUATE\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -8681,7 +8681,7 @@
 '-'           Operator
 'Build-Compile-Command' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '    '        Text.Whitespace
@@ -8692,13 +8692,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'STRING '     Keyword.Reserved
 "'cobc -std='" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -8708,19 +8708,19 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -8729,7 +8729,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -8743,13 +8743,13 @@
 '='           Operator
 ' '           Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'STRING '     Keyword.Reserved
 "'-m '"       Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8760,7 +8760,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8769,7 +8769,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8779,7 +8779,7 @@
 ' '           Text.Whitespace
 'STRING '     Keyword.Reserved
 "'-x '"       Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8790,7 +8790,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8799,7 +8799,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8815,13 +8815,13 @@
 '='           Operator
 ' '           Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'STRING '     Keyword.Reserved
 "'-fdebugging-line '" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8832,7 +8832,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8841,7 +8841,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8857,13 +8857,13 @@
 '='           Operator
 ' '           Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'STRING '     Keyword.Reserved
 "'-fnotrunc '" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8874,7 +8874,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8883,7 +8883,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8899,13 +8899,13 @@
 '='           Operator
 ' '           Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0809'      Comment
 '         '   Text.Whitespace
 'STRING '     Keyword.Reserved
 "'-ftraceall '" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8916,7 +8916,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8925,7 +8925,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8941,13 +8941,13 @@
 '='           Operator
 ' '           Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'STRING '     Keyword.Reserved
 "'-ftrace '"  Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8958,7 +8958,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -8967,7 +8967,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -8975,7 +8975,7 @@
 ' '           Text.Whitespace
 'END-IF\n'    Keyword.Reserved
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '     '       Text.Whitespace
@@ -8986,13 +8986,13 @@
 '>'           Operator
 ' '           Text.Whitespace
 'SPACES'      Name.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '         '   Text.Whitespace
 'STRING '     Keyword.Reserved
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '                ' Text.Whitespace
@@ -9002,12 +9002,12 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '                ' Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '                ' Text.Whitespace
@@ -9018,7 +9018,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '                ' Text.Whitespace
@@ -9027,17 +9027,17 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '         '   Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0709'      Comment
 '     '       Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -9049,7 +9049,7 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -9060,7 +9060,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Cmd'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -9069,15 +9069,15 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'END-STRING\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -9085,7 +9085,7 @@
 '-'           Operator
 'Run-Compiler' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -9095,22 +9095,22 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'DISPLAY'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'Switches-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '     '       Text.Whitespace
@@ -9131,7 +9131,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -9143,12 +9143,12 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '            ' Text.Whitespace
 "' 2>'"       Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '            ' Text.Whitespace
@@ -9158,7 +9158,7 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '            ' Text.Whitespace
@@ -9169,7 +9169,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -9177,7 +9177,7 @@
 ' '           Text.Whitespace
 'CALL '       Keyword.Reserved
 "'SYSTEM'"    Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -9189,12 +9189,12 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'END-CALL'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -9217,12 +9217,12 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'TRUE'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -9235,12 +9235,12 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'TRUE'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -9249,7 +9249,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Compile-OK'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -9258,26 +9258,26 @@
 'INPUT'       Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Output' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'READ'        Keyword.Reserved
 ' '           Text.Whitespace
 'Cobc-Output' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'AT'          Keyword.Pseudo
 ' '           Text.Whitespace
 'END'         Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
 'CONTINUE'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -9286,7 +9286,7 @@
 'AT'          Keyword.Pseudo
 ' '           Text.Whitespace
 'END'         Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
@@ -9299,24 +9299,24 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'TRUE'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-READ'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'CLOSE'       Keyword.Reserved
 ' '           Text.Whitespace
 'Cobc-Output' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -9327,7 +9327,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -9336,7 +9336,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Compile-OK'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -9346,28 +9346,28 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'DISPLAY'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'Switches-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'CALL '       Keyword.Reserved
 "'C$SLEEP'"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -9378,7 +9378,7 @@
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-CALL'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -9389,7 +9389,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '         '   Text.Whitespace
@@ -9404,22 +9404,22 @@
 'TRUE\n          ' Name.Builtin
 ' '           Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'DISPLAY'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'Blank-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -9428,7 +9428,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Compile-OK-Warn' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -9436,12 +9436,12 @@
 "' Compilation was successful, but '" Literal.String.Single
 ' '           Text.Whitespace
 '&'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                     ' Text.Whitespace
 "'warnings were generated:'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SCROLL*                AT LINE 24 COLUMN 1\n' Comment
 
@@ -9450,18 +9450,18 @@
 'GC0909'      Comment
 '             ' Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'DISPLAY '    Keyword.Reserved
 "'Compilation Failed:'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SCROLL*                AT LINE 24 COLUMN 1\n' Comment
 
@@ -9470,12 +9470,12 @@
 'GC0909'      Comment
 '             ' Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '         '   Text.Whitespace
@@ -9488,7 +9488,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'TRUE'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0609'      Comment
 '         '   Text.Whitespace
@@ -9501,13 +9501,13 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'TRUE'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'DISPLAY '    Keyword.Reserved
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SCROLL*            AT LINE 24 COLUMN 1\n' Comment
 
@@ -9516,7 +9516,7 @@
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -9525,14 +9525,14 @@
 'INPUT'       Keyword.Pseudo
 ' '           Text.Whitespace
 'Cobc-Output' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'PERFORM'     Keyword.Reserved
 ' '           Text.Whitespace
 'FOREVER'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -9543,19 +9543,19 @@
 'AT'          Keyword.Pseudo
 ' '           Text.Whitespace
 'END'         Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
 'EXIT'        Keyword.Reserved
 ' '           Text.Whitespace
 'PERFORM'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'END-READ'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -9567,7 +9567,7 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SCROLL*                AT LINE 24 COLUMN 1\n' Comment
 
@@ -9576,25 +9576,25 @@
 'GC0909'      Comment
 '             ' Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-PERFORM' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'CLOSE'       Keyword.Reserved
 ' '           Text.Whitespace
 'Cobc-Output' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'DISPLAY '    Keyword.Reserved
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SCROLL*            AT LINE 24 COLUMN 1\n' Comment
 
@@ -9603,13 +9603,13 @@
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'DISPLAY '    Keyword.Reserved
 "'Press ENTER to close:'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SCROLL*            AT LINE 24 COLUMN 1\n' Comment
 
@@ -9618,36 +9618,36 @@
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'ACCEPT'      Keyword.Reserved
 ' '           Text.Whitespace
 'Dummy'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'FROM'        Keyword.Pseudo
 ' '           Text.Whitespace
 'CONSOLE'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-ACCEPT'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'DISPLAY'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'Blank-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -9655,9 +9655,9 @@
 ' '           Text.Whitespace
 'END-IF\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -9665,7 +9665,7 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -9674,7 +9674,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Compile-Failed' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -9683,13 +9683,13 @@
 '900'         Literal.Number.Integer
 '-'           Operator
 'Terminate'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'END-IF\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -9701,7 +9701,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410*****************************************************************\n' Comment
 
@@ -9710,7 +9710,7 @@
 'GC0410*****************************************************************\n' Comment
 
 'GC0410'      Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 ' '           Text.Whitespace
@@ -9718,41 +9718,41 @@
 '-'           Operator
 'Init'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'MOVE '       Keyword.Reserved
 "' Generating cross-reference listing...'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '       '     Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'DISPLAY'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'Switches-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'CALL '       Keyword.Reserved
 '"CBL_DELETE_FILE"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
@@ -9769,12 +9769,12 @@
 ','           Punctuation
 '".lst"'      Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'END-CALL'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -9784,15 +9784,15 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'RETURN-CODE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 ' '           Text.Whitespace
@@ -9800,7 +9800,7 @@
 '-'           Operator
 'Run-OCXref'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -9811,50 +9811,50 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'CALL '       Keyword.Reserved
 "'LISTING'"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'USING'       Keyword.Pseudo
 ' '           Text.Whitespace
 'S-SOURCE'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '               ' Text.Whitespace
 'S-XREF'      Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '               ' Text.Whitespace
 'File-Name'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'ON'          Keyword.Pseudo
 ' '           Text.Whitespace
 'EXCEPTION'   Keyword.Pseudo
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
 'MOVE '       Keyword.Reserved
 "' LISTING module is not available'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -9864,12 +9864,12 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'RETURN-CODE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'END-CALL'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
@@ -9885,14 +9885,14 @@
 '         '   Text.Whitespace
 'MOVE '       Keyword.Reserved
 "' Listing generated'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '           ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
@@ -9903,7 +9903,7 @@
 'OR'          Operator.Word
 ' '           Text.Whitespace
 'OS-Cygwin'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -9914,17 +9914,17 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
 'STRING'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
 "'cmd /c '"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
@@ -9934,12 +9934,12 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
 "'.lst'"      Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
@@ -9950,18 +9950,18 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
 'CALL '       Keyword.Reserved
 "'SYSTEM'"    Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '                 ' Text.Whitespace
@@ -9973,22 +9973,22 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
 'END-CALL'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
@@ -9999,51 +9999,51 @@
 '='           Operator
 ' '           Text.Whitespace
 'SPACES'      Name.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
 'MOVE '       Keyword.Reserved
 "' Listing generation failed'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '               ' Text.Whitespace
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Output-Message' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'DISPLAY'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'Switches-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 'CALL '       Keyword.Reserved
 "'C$SLEEP'"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
@@ -10054,12 +10054,12 @@
 'GC0410'      Comment
 '     '       Text.Whitespace
 'END-CALL'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -10071,7 +10071,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -10079,7 +10079,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10087,7 +10087,7 @@
 '-'           Operator
 'Build-Command' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -10098,7 +10098,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -10108,7 +10108,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -10120,7 +10120,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -10132,7 +10132,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -10146,7 +10146,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                ' Text.Whitespace
@@ -10155,7 +10155,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -10171,7 +10171,7 @@
 '='           Operator
 ' '           Text.Whitespace
 'SPACES'      Name.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -10192,20 +10192,20 @@
 '='           Operator
 ' '           Text.Whitespace
 "':'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'STRING '     Keyword.Reserved
 "'/cygdrive/'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
@@ -10214,12 +10214,12 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -10235,14 +10235,14 @@
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
@@ -10251,12 +10251,12 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -10288,7 +10288,7 @@
 'Prog-Folder' Name.Variable
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
@@ -10305,20 +10305,20 @@
 '='           Operator
 ' '           Text.Whitespace
 "'\\'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                     ' Text.Whitespace
 'STRING '     Keyword.Reserved
 "'/'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                         ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                         ' Text.Whitespace
@@ -10327,17 +10327,17 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                     ' Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                     ' Text.Whitespace
@@ -10350,14 +10350,14 @@
 ':'           Punctuation
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                         ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                         ' Text.Whitespace
@@ -10366,27 +10366,27 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                     ' Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'END-PERFORM' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '             ' Text.Whitespace
@@ -10399,14 +10399,14 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
@@ -10415,31 +10415,31 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'STRING'      Keyword.Reserved
 ' '           Text.Whitespace
 'Dir-Char'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -10448,17 +10448,17 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'ELSE'        Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -10469,20 +10469,20 @@
 'OR'          Operator.Word
 ' '           Text.Whitespace
 'OS-UNIX'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'STRING '     Keyword.Reserved
 "'./'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '                 ' Text.Whitespace
@@ -10491,19 +10491,19 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-IF\n          ' Keyword.Reserved
 ' '           Text.Whitespace
 'END-IF'      Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -10515,14 +10515,14 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -10531,12 +10531,12 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'END-STRING'  Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -10547,7 +10547,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -10559,7 +10559,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
@@ -10573,7 +10573,7 @@
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                ' Text.Whitespace
@@ -10582,7 +10582,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -10598,7 +10598,7 @@
 '='           Operator
 ' '           Text.Whitespace
 'SPACES'      Name.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0809'      Comment
 '         '   Text.Whitespace
@@ -10611,14 +10611,14 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -10627,7 +10627,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -10642,20 +10642,20 @@
 'OR'          Operator.Word
 ' '           Text.Whitespace
 'OS-Windows'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '         '   Text.Whitespace
 'STRING '     Keyword.Reserved
 '\'"&&pause\'' Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -10664,7 +10664,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -10674,14 +10674,14 @@
 ' '           Text.Whitespace
 'STRING '     Keyword.Reserved
 '\';echo "Press ENTER to close...";read\'' Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'INTO'        Keyword.Pseudo
 ' '           Text.Whitespace
 'Cmd'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -10690,7 +10690,7 @@
 'POINTER'     Keyword.Pseudo
 ' '           Text.Whitespace
 'I'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -10698,9 +10698,9 @@
 ' '           Text.Whitespace
 'END-IF\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10708,17 +10708,17 @@
 '-'           Operator
 'Run-Program' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
 'DISPLAY'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'Blank-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -10726,7 +10726,7 @@
 ' '           Text.Whitespace
 'CALL '       Keyword.Reserved
 "'SYSTEM'"    Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -10738,7 +10738,7 @@
 ','           Punctuation
 'TRAILING'    Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -10749,14 +10749,14 @@
 '900'         Literal.Number.Integer
 '-'           Operator
 'Terminate'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10764,13 +10764,13 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'EXIT'        Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -10782,7 +10782,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -10790,7 +10790,7 @@
 
 '      *****************************************************************\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10798,7 +10798,7 @@
 '-'           Operator
 'Display-Message' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -10809,28 +10809,28 @@
 '>'           Operator
 ' '           Text.Whitespace
 'SPACES'      Name.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'DISPLAY'     Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
 'Switches-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-DISPLAY' Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '         '   Text.Whitespace
 'CALL '       Keyword.Reserved
 "'C$SLEEP'"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '             ' Text.Whitespace
@@ -10841,7 +10841,7 @@
 'GC0909'      Comment
 '         '   Text.Whitespace
 'END-CALL'    Keyword.Reserved
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0909'      Comment
 '     '       Text.Whitespace
@@ -10850,15 +10850,15 @@
 'DISPLAY\n              ' Keyword.Reserved
 ' '           Text.Whitespace
 'Blank-Screen' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'END-DISPLAY\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10866,15 +10866,15 @@
 '-'           Operator
 'Done'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'GOBACK\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10884,9 +10884,9 @@
 ' '           Text.Whitespace
 'OCic'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10894,7 +10894,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10903,7 +10903,7 @@
 '  '          Text.Whitespace
 'GETOSTYPE'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -10939,7 +10939,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10947,13 +10947,13 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 'REPOSITORY'  Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -10963,7 +10963,7 @@
 ' '           Text.Whitespace
 'INTRINSIC'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10971,7 +10971,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10979,7 +10979,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10988,7 +10988,7 @@
 '                    ' Text.Whitespace
 'PIC X(1024)' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -10999,7 +10999,7 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11007,7 +11007,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11017,7 +11017,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11025,7 +11025,7 @@
 '-'           Operator
 'Get-TEMP-Var' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11036,14 +11036,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Env-Path'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'ACCEPT'      Keyword.Reserved
 ' '           Text.Whitespace
 'Env-Path'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -11051,7 +11051,7 @@
 ' '           Text.Whitespace
 'ENVIRONMENT ' Keyword.Reserved
 '"PATH"'      Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -11065,7 +11065,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'RETURN-CODE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -11087,7 +11087,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'RETURN-CODE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11099,14 +11099,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Tally'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
 'INSPECT'     Keyword.Reserved
 ' '           Text.Whitespace
 'Env-Path'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -11118,7 +11118,7 @@
 ' '           Text.Whitespace
 'ALL '        Keyword.Pseudo
 '";"'         Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -11139,14 +11139,14 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Tally'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
 'INSPECT'     Keyword.Reserved
 ' '           Text.Whitespace
 'Env-Path'    Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -11158,7 +11158,7 @@
 ' '           Text.Whitespace
 'ALL '        Keyword.Pseudo
 '"/cygdrive/"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -11179,7 +11179,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'RETURN-CODE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -11194,7 +11194,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'RETURN-CODE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -11211,7 +11211,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'RETURN-CODE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -11221,7 +11221,7 @@
 ' '           Text.Whitespace
 'GOBACK\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11231,9 +11231,9 @@
 ' '           Text.Whitespace
 'GETOSTYPE'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11241,7 +11241,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11250,7 +11250,7 @@
 '  '          Text.Whitespace
 'CHECKSOURCE' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -11286,7 +11286,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11294,13 +11294,13 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 'REPOSITORY'  Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11310,7 +11310,7 @@
 ' '           Text.Whitespace
 'INTRINSIC'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11318,7 +11318,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11326,14 +11326,14 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Compressed-Src' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11347,16 +11347,16 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Flags'       Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11365,7 +11365,7 @@
 '            ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -11377,7 +11377,7 @@
 'VALUE '      Keyword.Pseudo
 "'Y'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -11389,9 +11389,9 @@
 'VALUE '      Keyword.Pseudo
 "'N'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11402,9 +11402,9 @@
 ' '           Text.Whitespace
 'BINARY-CHAR' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11415,7 +11415,7 @@
 ' '           Text.Whitespace
 'BINARY-CHAR' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11423,14 +11423,14 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Argument-1'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11444,9 +11444,9 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11455,7 +11455,7 @@
 '                  ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11467,7 +11467,7 @@
 'VALUE '      Keyword.Pseudo
 "'L'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11479,7 +11479,7 @@
 'VALUE '      Keyword.Pseudo
 "'I'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11491,7 +11491,7 @@
 'VALUE '      Keyword.Pseudo
 "' '"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11506,7 +11506,7 @@
 ' '           Text.Whitespace
 'Argument-2'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11516,9 +11516,9 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11526,7 +11526,7 @@
 '-'           Operator
 'Initialize'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11551,7 +11551,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "'*'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -11559,9 +11559,9 @@
 ' '           Text.Whitespace
 'END-IF\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11569,7 +11569,7 @@
 '-'           Operator
 'Compress-Multiple-SPACES' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11589,7 +11589,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'J'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11600,7 +11600,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Compressed-Src' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11640,7 +11640,7 @@
 '88'          Literal.Number.Integer
 '-'           Operator
 'Not-Skipping-SPACE' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -11650,7 +11650,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'J'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -11672,7 +11672,7 @@
 '('           Punctuation
 'J'           Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -11706,7 +11706,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'J'           Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -11725,7 +11725,7 @@
 '('           Punctuation
 'J'           Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '         '   Text.Whitespace
@@ -11733,9 +11733,9 @@
 ' '           Text.Whitespace
 'END-PERFORM\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11743,7 +11743,7 @@
 '-'           Operator
 'Scan-Compressed-Src' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -11781,7 +11781,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "'*'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -11800,7 +11800,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "'*>'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -11829,7 +11829,7 @@
 ' '           Text.Whitespace
 '66'          Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -11848,7 +11848,7 @@
 '='           Operator
 ' '           Text.Whitespace
 "'LINKAGE SECTION'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -11887,7 +11887,7 @@
 ' '           Text.Whitespace
 '58'          Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                 ' Text.Whitespace
@@ -11908,12 +11908,12 @@
 "'IDENTIFICATION '" Literal.String.Single
 ' '           Text.Whitespace
 '&'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                                 ' Text.Whitespace
 "'DIVISION'"  Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                     ' Text.Whitespace
@@ -11935,9 +11935,9 @@
 ' '           Text.Whitespace
 'END-PERFORM\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11945,13 +11945,13 @@
 '-'           Operator
 'Never-Found-Either-One' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'GOBACK\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11961,9 +11961,9 @@
 ' '           Text.Whitespace
 'CHECKSOURCE' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11971,7 +11971,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -11980,7 +11980,7 @@
 '  '          Text.Whitespace
 'LISTING'     Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -12060,7 +12060,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12068,13 +12068,13 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 'REPOSITORY'  Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12084,7 +12084,7 @@
 ' '           Text.Whitespace
 'INTRINSIC'   Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12092,13 +12092,13 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 'FILE-CONTROL' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12111,7 +12111,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Expanded-Src-Filename' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
@@ -12123,7 +12123,7 @@
 ' '           Text.Whitespace
 'SEQUENTIAL'  Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12136,7 +12136,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Report-Filename' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
@@ -12148,7 +12148,7 @@
 ' '           Text.Whitespace
 'SEQUENTIAL'  Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12162,7 +12162,7 @@
 ' '           Text.Whitespace
 'DISK'        Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12175,7 +12175,7 @@
 'TO'          Keyword.Pseudo
 ' '           Text.Whitespace
 'Src-Filename' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
@@ -12187,7 +12187,7 @@
 ' '           Text.Whitespace
 'SEQUENTIAL'  Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12195,7 +12195,7 @@
 ' '           Text.Whitespace
 'DIVISION'    Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12203,7 +12203,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12211,14 +12211,14 @@
 ' '           Text.Whitespace
 'Expand-Code' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Expand-Code-Rec' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12227,7 +12227,7 @@
 '                    ' Text.Whitespace
 'PIC X'       Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12236,14 +12236,14 @@
 '                ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Expand-Code-Rec-Alt' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12252,7 +12252,7 @@
 '                ' Text.Whitespace
 'PIC X(128)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12261,9 +12261,9 @@
 '              ' Text.Whitespace
 'PIC X(128)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12271,7 +12271,7 @@
 ' '           Text.Whitespace
 'Report-File' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12280,9 +12280,9 @@
 '                  ' Text.Whitespace
 'PIC X(135)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12290,14 +12290,14 @@
 ' '           Text.Whitespace
 'Sort-File'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Sort-Rec'    Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12306,7 +12306,7 @@
 '               ' Text.Whitespace
 'PIC X(15)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12315,7 +12315,7 @@
 '              ' Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12324,7 +12324,7 @@
 '                 ' Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12333,7 +12333,7 @@
 '               ' Text.Whitespace
 'PIC X(15)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12342,14 +12342,14 @@
 '           ' Text.Whitespace
 'PIC 9(6)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '05 '         Literal.Number.Integer
 'SR-Reference' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -12358,7 +12358,7 @@
 '        '    Text.Whitespace
 'PIC 9(6)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -12367,9 +12367,9 @@
 '           ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12377,21 +12377,21 @@
 ' '           Text.Whitespace
 'Source-Code' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Source-Code-Rec' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '     '       Text.Whitespace
 '05 '         Literal.Number.Integer
 'SCR-1-128'   Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '        '    Text.Whitespace
@@ -12400,7 +12400,7 @@
 ' '           Text.Whitespace
 'PIC X(6)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '        '    Text.Whitespace
@@ -12409,7 +12409,7 @@
 '                 ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0410'      Comment
 '        '    Text.Whitespace
@@ -12418,7 +12418,7 @@
 ' '           Text.Whitespace
 'PIC X(121)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12427,9 +12427,9 @@
 '              ' Text.Whitespace
 'PIC X(128)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12437,7 +12437,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12448,9 +12448,9 @@
 ' '           Text.Whitespace
 '8'           Literal.Number.Integer
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12459,9 +12459,9 @@
 '                         ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12470,16 +12470,16 @@
 '                       ' Text.Whitespace
 'PIC X(2)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Detail-Line-S' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12488,7 +12488,7 @@
 '              ' Text.Whitespace
 'PIC ZZZZZ9'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12497,7 +12497,7 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12506,16 +12506,16 @@
 '            ' Text.Whitespace
 'PIC X(128)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Detail-Line-X' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12524,7 +12524,7 @@
 '              ' Text.Whitespace
 'PIC X(15)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12533,7 +12533,7 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12542,7 +12542,7 @@
 '                ' Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12551,7 +12551,7 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12560,7 +12560,7 @@
 '          '  Text.Whitespace
 'PIC ZZZZZ9'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12569,7 +12569,7 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12578,7 +12578,7 @@
 '              ' Text.Whitespace
 'PIC X(15)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12587,7 +12587,7 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12600,7 +12600,7 @@
 ' '           Text.Whitespace
 'TIMES'       Keyword.Pseudo
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -12609,7 +12609,7 @@
 '       '     Text.Whitespace
 'PIC ZZZZZ9'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -12618,7 +12618,7 @@
 '          '  Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -12627,9 +12627,9 @@
 ' '           Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12638,9 +12638,9 @@
 '                       ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12649,9 +12649,9 @@
 '                    ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12660,9 +12660,9 @@
 '       '     Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12671,16 +12671,16 @@
 '                    ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Flags'       Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0710'      Comment
 '     '       Text.Whitespace
@@ -12689,7 +12689,7 @@
 '              ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12698,7 +12698,7 @@
 '           ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12707,7 +12707,7 @@
 '           ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -12717,7 +12717,7 @@
 'VALUE '      Keyword.Pseudo
 "'M'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -12727,7 +12727,7 @@
 'VALUE '      Keyword.Pseudo
 "'C'"         Literal.String.Single
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12736,7 +12736,7 @@
 '  '          Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12745,7 +12745,7 @@
 '     '       Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12754,7 +12754,7 @@
 '   '         Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0710'      Comment
 '     '       Text.Whitespace
@@ -12763,16 +12763,16 @@
 '    '        Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Group-Indicators' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12781,7 +12781,7 @@
 '               ' Text.Whitespace
 'PIC X(15)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12790,16 +12790,16 @@
 '                 ' Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Heading-1S'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12812,13 +12812,13 @@
 '"OpenCOBOL 1.1 06FEB2009 Source Listing - "' Literal.String.Double
 ' '           Text.Whitespace
 '&'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
 '"OCic Copyright (C) 2009-2010, Gary L. Cutler, GPL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12827,16 +12827,16 @@
 '                 ' Text.Whitespace
 'PIC 9999/99/99' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Heading-1X'  Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12849,13 +12849,13 @@
 '"OpenCOBOL 1.1 06FEB2009 Cross-Reference Listing - "' Literal.String.Double
 ' '           Text.Whitespace
 '&'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
 '"OCic Copyright (C) 2009-2010, Gary L. Cutler, GPL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -12864,9 +12864,9 @@
 '                 ' Text.Whitespace
 'PIC 9999/99/99' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12875,9 +12875,9 @@
 '                   ' Text.Whitespace
 'PIC X(135)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12889,9 +12889,9 @@
 'VALUE\n           ' Keyword.Pseudo
 '"Line   Statement"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12908,9 +12908,9 @@
 '    '        Text.Whitespace
 '"e Defined   References (* = Updated)"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12932,9 +12932,9 @@
 '    '        Text.Whitespace
 '"==============="' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12956,9 +12956,9 @@
 '    '        Text.Whitespace
 '"==============="' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12967,9 +12967,9 @@
 '              ' Text.Whitespace
 'PIC X(100)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12980,9 +12980,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -12993,9 +12993,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13006,9 +13006,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13019,9 +13019,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13030,9 +13030,9 @@
 '          '  Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13043,9 +13043,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13054,9 +13054,9 @@
 '                     ' Text.Whitespace
 'PIC X(10)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13065,9 +13065,9 @@
 '                     ' Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13076,9 +13076,9 @@
 '                    ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13087,9 +13087,9 @@
 '                ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -13098,16 +13098,16 @@
 '             ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Reserved-Words' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13119,7 +13119,7 @@
 'VALUE '      Keyword.Pseudo
 '"IABS"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13131,7 +13131,7 @@
 'VALUE '      Keyword.Pseudo
 '"VACCEPT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13143,7 +13143,7 @@
 'VALUE '      Keyword.Pseudo
 '" ACCESS"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13155,7 +13155,7 @@
 'VALUE '      Keyword.Pseudo
 '"IACOS"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13167,7 +13167,7 @@
 'VALUE '      Keyword.Pseudo
 '" ACTIVE-CLASS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13179,7 +13179,7 @@
 'VALUE '      Keyword.Pseudo
 '"VADD"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13191,7 +13191,7 @@
 'VALUE '      Keyword.Pseudo
 '" ADDRESS"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13203,7 +13203,7 @@
 'VALUE '      Keyword.Pseudo
 '" ADVANCING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13215,7 +13215,7 @@
 'VALUE '      Keyword.Pseudo
 '"KAFTER"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13227,7 +13227,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALIGNED"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13239,7 +13239,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALL"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13251,7 +13251,7 @@
 'VALUE '      Keyword.Pseudo
 '"VALLOCATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13263,7 +13263,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALPHABET"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13275,7 +13275,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALPHABETIC"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13287,7 +13287,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALPHABETIC-LOWER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13299,7 +13299,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALPHABETIC-UPPER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13311,7 +13311,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALPHANUMERIC"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13323,7 +13323,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALPHANUMERIC-EDITED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13335,7 +13335,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALSO"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13347,7 +13347,7 @@
 'VALUE '      Keyword.Pseudo
 '"VALTER"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13359,7 +13359,7 @@
 'VALUE '      Keyword.Pseudo
 '" ALTERNATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13371,7 +13371,7 @@
 'VALUE '      Keyword.Pseudo
 '" AND"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13383,7 +13383,7 @@
 'VALUE '      Keyword.Pseudo
 '"IANNUITY"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13395,7 +13395,7 @@
 'VALUE '      Keyword.Pseudo
 '" ANY"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13407,7 +13407,7 @@
 'VALUE '      Keyword.Pseudo
 '" ANYCASE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13419,7 +13419,7 @@
 'VALUE '      Keyword.Pseudo
 '" ARE"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13431,7 +13431,7 @@
 'VALUE '      Keyword.Pseudo
 '" AREA"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13443,7 +13443,7 @@
 'VALUE '      Keyword.Pseudo
 '" AREAS"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13455,7 +13455,7 @@
 'VALUE '      Keyword.Pseudo
 '" ARGUMENT-NUMBER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13467,7 +13467,7 @@
 'VALUE '      Keyword.Pseudo
 '" ARGUMENT-VALUE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13479,7 +13479,7 @@
 'VALUE '      Keyword.Pseudo
 '" AS"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13491,7 +13491,7 @@
 'VALUE '      Keyword.Pseudo
 '" ASCENDING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13503,7 +13503,7 @@
 'VALUE '      Keyword.Pseudo
 '"IASIN"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13515,7 +13515,7 @@
 'VALUE '      Keyword.Pseudo
 '" ASSIGN"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13527,7 +13527,7 @@
 'VALUE '      Keyword.Pseudo
 '" AT"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13539,7 +13539,7 @@
 'VALUE '      Keyword.Pseudo
 '"IATAN"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13551,7 +13551,7 @@
 'VALUE '      Keyword.Pseudo
 '" AUTHOR"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13563,7 +13563,7 @@
 'VALUE '      Keyword.Pseudo
 '" AUTO"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13575,7 +13575,7 @@
 'VALUE '      Keyword.Pseudo
 '" AUTO-SKIP"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13587,7 +13587,7 @@
 'VALUE '      Keyword.Pseudo
 '" AUTOMATIC"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13599,7 +13599,7 @@
 'VALUE '      Keyword.Pseudo
 '" AUTOTERMINATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13611,7 +13611,7 @@
 'VALUE '      Keyword.Pseudo
 '" BACKGROUND-COLOR"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13623,7 +13623,7 @@
 'VALUE '      Keyword.Pseudo
 '" BASED"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13635,7 +13635,7 @@
 'VALUE '      Keyword.Pseudo
 '" BEEP"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13647,7 +13647,7 @@
 'VALUE '      Keyword.Pseudo
 '" BEFORE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13659,7 +13659,7 @@
 'VALUE '      Keyword.Pseudo
 '" BELL"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13671,7 +13671,7 @@
 'VALUE '      Keyword.Pseudo
 '" BINARY"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13683,7 +13683,7 @@
 'VALUE '      Keyword.Pseudo
 '" BINARY-C-LONG"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13695,7 +13695,7 @@
 'VALUE '      Keyword.Pseudo
 '" BINARY-CHAR"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13707,7 +13707,7 @@
 'VALUE '      Keyword.Pseudo
 '" BINARY-DOUBLE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13719,7 +13719,7 @@
 'VALUE '      Keyword.Pseudo
 '" BINARY-LONG"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13731,7 +13731,7 @@
 'VALUE '      Keyword.Pseudo
 '" BINARY-SHORT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13743,7 +13743,7 @@
 'VALUE '      Keyword.Pseudo
 '" BIT"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13755,7 +13755,7 @@
 'VALUE '      Keyword.Pseudo
 '" BLANK"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13767,7 +13767,7 @@
 'VALUE '      Keyword.Pseudo
 '" BLINK"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13779,7 +13779,7 @@
 'VALUE '      Keyword.Pseudo
 '" BLOCK"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13791,7 +13791,7 @@
 'VALUE '      Keyword.Pseudo
 '" BOOLEAN"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13803,7 +13803,7 @@
 'VALUE '      Keyword.Pseudo
 '" BOTTOM"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13815,7 +13815,7 @@
 'VALUE '      Keyword.Pseudo
 '"YBY"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13827,7 +13827,7 @@
 'VALUE '      Keyword.Pseudo
 '"IBYTE-LENGTH"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13839,7 +13839,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC01"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13851,7 +13851,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC02"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13863,7 +13863,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC03"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13875,7 +13875,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC04"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13887,7 +13887,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC05"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13899,7 +13899,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC06"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13911,7 +13911,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC07"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13923,7 +13923,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC08"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13935,7 +13935,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC09"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13947,7 +13947,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC10"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13959,7 +13959,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC11"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13971,7 +13971,7 @@
 'VALUE '      Keyword.Pseudo
 '"MC12"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13983,7 +13983,7 @@
 'VALUE '      Keyword.Pseudo
 '"VCALL"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -13995,7 +13995,7 @@
 'VALUE '      Keyword.Pseudo
 '"VCANCEL"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14007,7 +14007,7 @@
 'VALUE '      Keyword.Pseudo
 '" CF"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14019,7 +14019,7 @@
 'VALUE '      Keyword.Pseudo
 '" CH"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14031,7 +14031,7 @@
 'VALUE '      Keyword.Pseudo
 '" CHAINING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14043,7 +14043,7 @@
 'VALUE '      Keyword.Pseudo
 '"ICHAR"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14055,7 +14055,7 @@
 'VALUE '      Keyword.Pseudo
 '" CHARACTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14067,7 +14067,7 @@
 'VALUE '      Keyword.Pseudo
 '" CHARACTERS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14079,7 +14079,7 @@
 'VALUE '      Keyword.Pseudo
 '" CLASS"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14091,7 +14091,7 @@
 'VALUE '      Keyword.Pseudo
 '" CLASS-ID"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14103,7 +14103,7 @@
 'VALUE '      Keyword.Pseudo
 '"VCLOSE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14115,7 +14115,7 @@
 'VALUE '      Keyword.Pseudo
 '"ICOB-CRT-STATUS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14127,7 +14127,7 @@
 'VALUE '      Keyword.Pseudo
 '" CODE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14139,7 +14139,7 @@
 'VALUE '      Keyword.Pseudo
 '" CODE-SET"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14151,7 +14151,7 @@
 'VALUE '      Keyword.Pseudo
 '" COL"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14163,7 +14163,7 @@
 'VALUE '      Keyword.Pseudo
 '" COLLATING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14175,7 +14175,7 @@
 'VALUE '      Keyword.Pseudo
 '" COLS"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14187,7 +14187,7 @@
 'VALUE '      Keyword.Pseudo
 '" COLUMN"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14199,7 +14199,7 @@
 'VALUE '      Keyword.Pseudo
 '" COLUMNS"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14211,7 +14211,7 @@
 'VALUE '      Keyword.Pseudo
 '"ICOMBINED-DATETIME"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14223,7 +14223,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMMA"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14235,7 +14235,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMMAND-LINE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14247,7 +14247,7 @@
 'VALUE '      Keyword.Pseudo
 '"VCOMMIT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14259,7 +14259,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMMON"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14271,7 +14271,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMP"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14283,7 +14283,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMP-1"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14295,7 +14295,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMP-2"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14307,7 +14307,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMP-3"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14319,7 +14319,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMP-4"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14331,7 +14331,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMP-5"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14343,7 +14343,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMP-X"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14355,7 +14355,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMPUTATIONAL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14367,7 +14367,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMPUTATIONAL-1"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14379,7 +14379,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMPUTATIONAL-2"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14391,7 +14391,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMPUTATIONAL-3"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14403,7 +14403,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMPUTATIONAL-4"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14415,7 +14415,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMPUTATIONAL-5"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14427,7 +14427,7 @@
 'VALUE '      Keyword.Pseudo
 '" COMPUTATIONAL-X"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14439,7 +14439,7 @@
 'VALUE '      Keyword.Pseudo
 '"VCOMPUTE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14451,7 +14451,7 @@
 'VALUE '      Keyword.Pseudo
 '"ICONCATENATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14463,7 +14463,7 @@
 'VALUE '      Keyword.Pseudo
 '" CONDITION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14475,7 +14475,7 @@
 'VALUE '      Keyword.Pseudo
 '"KCONFIGURATION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14487,7 +14487,7 @@
 'VALUE '      Keyword.Pseudo
 '"MCONSOLE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14499,7 +14499,7 @@
 'VALUE '      Keyword.Pseudo
 '" CONSTANT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14511,7 +14511,7 @@
 'VALUE '      Keyword.Pseudo
 '" CONTAINS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14523,7 +14523,7 @@
 'VALUE '      Keyword.Pseudo
 '" CONTENT"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14535,7 +14535,7 @@
 'VALUE '      Keyword.Pseudo
 '"VCONTINUE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14547,7 +14547,7 @@
 'VALUE '      Keyword.Pseudo
 '" CONTROL"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14559,7 +14559,7 @@
 'VALUE '      Keyword.Pseudo
 '" CONTROLS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14571,7 +14571,7 @@
 'VALUE '      Keyword.Pseudo
 '"KCONVERTING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14583,7 +14583,7 @@
 'VALUE '      Keyword.Pseudo
 '" COPY"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14595,7 +14595,7 @@
 'VALUE '      Keyword.Pseudo
 '" CORR"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14607,7 +14607,7 @@
 'VALUE '      Keyword.Pseudo
 '" CORRESPONDING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14619,7 +14619,7 @@
 'VALUE '      Keyword.Pseudo
 '"ICOS"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14631,7 +14631,7 @@
 'VALUE '      Keyword.Pseudo
 '"KCOUNT"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14643,7 +14643,7 @@
 'VALUE '      Keyword.Pseudo
 '" CRT"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14655,7 +14655,7 @@
 'VALUE '      Keyword.Pseudo
 '" CURRENCY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14667,7 +14667,7 @@
 'VALUE '      Keyword.Pseudo
 '"ICURRENT-DATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14679,7 +14679,7 @@
 'VALUE '      Keyword.Pseudo
 '" CURSOR"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14691,7 +14691,7 @@
 'VALUE '      Keyword.Pseudo
 '" CYCLE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14703,7 +14703,7 @@
 'VALUE '      Keyword.Pseudo
 '"KDATA"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14715,7 +14715,7 @@
 'VALUE '      Keyword.Pseudo
 '" DATA-POINTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14727,7 +14727,7 @@
 'VALUE '      Keyword.Pseudo
 '" DATE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14739,7 +14739,7 @@
 'VALUE '      Keyword.Pseudo
 '" DATE-COMPILED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14751,7 +14751,7 @@
 'VALUE '      Keyword.Pseudo
 '" DATE-MODIFIED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14763,7 +14763,7 @@
 'VALUE '      Keyword.Pseudo
 '"IDATE-OF-INTEGER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14775,7 +14775,7 @@
 'VALUE '      Keyword.Pseudo
 '"IDATE-TO-YYYYMMDD"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14787,7 +14787,7 @@
 'VALUE '      Keyword.Pseudo
 '" DATE-WRITTEN"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14799,7 +14799,7 @@
 'VALUE '      Keyword.Pseudo
 '" DAY"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14811,7 +14811,7 @@
 'VALUE '      Keyword.Pseudo
 '"IDAY-OF-INTEGER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14823,7 +14823,7 @@
 'VALUE '      Keyword.Pseudo
 '" DAY-OF-WEEK"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14835,7 +14835,7 @@
 'VALUE '      Keyword.Pseudo
 '"IDAY-TO-YYYYDDD"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14847,7 +14847,7 @@
 'VALUE '      Keyword.Pseudo
 '" DE"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14859,7 +14859,7 @@
 'VALUE '      Keyword.Pseudo
 '" DEBUGGING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14871,7 +14871,7 @@
 'VALUE '      Keyword.Pseudo
 '" DECIMAL-POINT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14883,7 +14883,7 @@
 'VALUE '      Keyword.Pseudo
 '" DECLARATIVES"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14895,7 +14895,7 @@
 'VALUE '      Keyword.Pseudo
 '" DEFAULT"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14907,7 +14907,7 @@
 'VALUE '      Keyword.Pseudo
 '"VDELETE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14919,7 +14919,7 @@
 'VALUE '      Keyword.Pseudo
 '" DELIMITED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14931,7 +14931,7 @@
 'VALUE '      Keyword.Pseudo
 '"KDELIMITER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14943,7 +14943,7 @@
 'VALUE '      Keyword.Pseudo
 '" DEPENDING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14955,7 +14955,7 @@
 'VALUE '      Keyword.Pseudo
 '" DESCENDING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14967,7 +14967,7 @@
 'VALUE '      Keyword.Pseudo
 '" DESTINATION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14979,7 +14979,7 @@
 'VALUE '      Keyword.Pseudo
 '" DETAIL"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -14991,7 +14991,7 @@
 'VALUE '      Keyword.Pseudo
 '" DISABLE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15003,7 +15003,7 @@
 'VALUE '      Keyword.Pseudo
 '" DISK"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15015,7 +15015,7 @@
 'VALUE '      Keyword.Pseudo
 '"VDISPLAY"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15027,7 +15027,7 @@
 'VALUE '      Keyword.Pseudo
 '"VDIVIDE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15039,7 +15039,7 @@
 'VALUE '      Keyword.Pseudo
 '"KDIVISION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15051,7 +15051,7 @@
 'VALUE '      Keyword.Pseudo
 '"KDOWN"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15063,7 +15063,7 @@
 'VALUE '      Keyword.Pseudo
 '" DUPLICATES"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15075,7 +15075,7 @@
 'VALUE '      Keyword.Pseudo
 '" DYNAMIC"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15087,7 +15087,7 @@
 'VALUE '      Keyword.Pseudo
 '"IE"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15099,7 +15099,7 @@
 'VALUE '      Keyword.Pseudo
 '" EBCDIC"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15111,7 +15111,7 @@
 'VALUE '      Keyword.Pseudo
 '" EC"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15123,7 +15123,7 @@
 'VALUE '      Keyword.Pseudo
 '"VELSE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0710'      Comment
 '     '       Text.Whitespace
@@ -15135,7 +15135,7 @@
 'VALUE '      Keyword.Pseudo
 '"KEND"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15147,7 +15147,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-ACCEPT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15159,7 +15159,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-ADD"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15171,7 +15171,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-CALL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15183,7 +15183,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-COMPUTE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15195,7 +15195,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-DELETE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15207,7 +15207,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-DISPLAY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15219,7 +15219,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-DIVIDE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15231,7 +15231,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-EVALUATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15243,7 +15243,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-IF"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15255,7 +15255,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-MULTIPLY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15267,7 +15267,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-OF-PAGE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15279,7 +15279,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-PERFORM"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15291,7 +15291,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-READ"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15303,7 +15303,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-RETURN"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15315,7 +15315,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-REWRITE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15327,7 +15327,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-SEARCH"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15339,7 +15339,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-START"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15351,7 +15351,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-STRING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15363,7 +15363,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-SUBTRACT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15375,7 +15375,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-UNSTRING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15387,7 +15387,7 @@
 'VALUE '      Keyword.Pseudo
 '" END-WRITE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15399,7 +15399,7 @@
 'VALUE '      Keyword.Pseudo
 '"VENTRY"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15411,7 +15411,7 @@
 'VALUE '      Keyword.Pseudo
 '"KENVIRONMENT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15423,7 +15423,7 @@
 'VALUE '      Keyword.Pseudo
 '" ENVIRONMENT-NAME"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15435,7 +15435,7 @@
 'VALUE '      Keyword.Pseudo
 '" ENVIRONMENT-VALUE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15447,7 +15447,7 @@
 'VALUE '      Keyword.Pseudo
 '" EO"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15459,7 +15459,7 @@
 'VALUE '      Keyword.Pseudo
 '" EOL"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15471,7 +15471,7 @@
 'VALUE '      Keyword.Pseudo
 '" EOP"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15483,7 +15483,7 @@
 'VALUE '      Keyword.Pseudo
 '" EOS"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15495,7 +15495,7 @@
 'VALUE '      Keyword.Pseudo
 '" EQUAL"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15507,7 +15507,7 @@
 'VALUE '      Keyword.Pseudo
 '"KEQUALS"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15519,7 +15519,7 @@
 'VALUE '      Keyword.Pseudo
 '" ERASE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15531,7 +15531,7 @@
 'VALUE '      Keyword.Pseudo
 '" ERROR"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15543,7 +15543,7 @@
 'VALUE '      Keyword.Pseudo
 '" ESCAPE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15555,7 +15555,7 @@
 'VALUE '      Keyword.Pseudo
 '"VEVALUATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15567,7 +15567,7 @@
 'VALUE '      Keyword.Pseudo
 '" EXCEPTION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15579,7 +15579,7 @@
 'VALUE '      Keyword.Pseudo
 '"IEXCEPTION-FILE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15591,7 +15591,7 @@
 'VALUE '      Keyword.Pseudo
 '"IEXCEPTION-LOCATION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15603,7 +15603,7 @@
 'VALUE '      Keyword.Pseudo
 '" EXCEPTION-OBJECT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15615,7 +15615,7 @@
 'VALUE '      Keyword.Pseudo
 '"IEXCEPTION-STATEMENT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15627,7 +15627,7 @@
 'VALUE '      Keyword.Pseudo
 '"IEXCEPTION-STATUS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15639,7 +15639,7 @@
 'VALUE '      Keyword.Pseudo
 '" EXCLUSIVE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15651,7 +15651,7 @@
 'VALUE '      Keyword.Pseudo
 '"VEXIT"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15663,7 +15663,7 @@
 'VALUE '      Keyword.Pseudo
 '"IEXP"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15675,7 +15675,7 @@
 'VALUE '      Keyword.Pseudo
 '"IEXP10"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15687,7 +15687,7 @@
 'VALUE '      Keyword.Pseudo
 '" EXTEND"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15699,7 +15699,7 @@
 'VALUE '      Keyword.Pseudo
 '" EXTERNAL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15711,7 +15711,7 @@
 'VALUE '      Keyword.Pseudo
 '"IFACTORIAL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15723,7 +15723,7 @@
 'VALUE '      Keyword.Pseudo
 '" FACTORY"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15735,7 +15735,7 @@
 'VALUE '      Keyword.Pseudo
 '" FALSE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15747,7 +15747,7 @@
 'VALUE '      Keyword.Pseudo
 '"KFD"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15759,7 +15759,7 @@
 'VALUE '      Keyword.Pseudo
 '"KFILE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15771,7 +15771,7 @@
 'VALUE '      Keyword.Pseudo
 '" FILE-CONTROL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15783,7 +15783,7 @@
 'VALUE '      Keyword.Pseudo
 '" FILE-ID"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15795,7 +15795,7 @@
 'VALUE '      Keyword.Pseudo
 '" FILLER"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15807,7 +15807,7 @@
 'VALUE '      Keyword.Pseudo
 '" FINAL"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15819,7 +15819,7 @@
 'VALUE '      Keyword.Pseudo
 '" FIRST"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15831,7 +15831,7 @@
 'VALUE '      Keyword.Pseudo
 '" FLOAT-BINARY-16"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15843,7 +15843,7 @@
 'VALUE '      Keyword.Pseudo
 '" FLOAT-BINARY-34"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15855,7 +15855,7 @@
 'VALUE '      Keyword.Pseudo
 '" FLOAT-BINARY-7"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15867,7 +15867,7 @@
 'VALUE '      Keyword.Pseudo
 '" FLOAT-DECIMAL-16"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15879,7 +15879,7 @@
 'VALUE '      Keyword.Pseudo
 '" FLOAT-DECIMAL-34"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15891,7 +15891,7 @@
 'VALUE '      Keyword.Pseudo
 '" FLOAT-EXTENDED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15903,7 +15903,7 @@
 'VALUE '      Keyword.Pseudo
 '" FLOAT-LONG"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15915,7 +15915,7 @@
 'VALUE '      Keyword.Pseudo
 '" FLOAT-SHORT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15927,7 +15927,7 @@
 'VALUE '      Keyword.Pseudo
 '" FOOTING"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15939,7 +15939,7 @@
 'VALUE '      Keyword.Pseudo
 '" FOR"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15951,7 +15951,7 @@
 'VALUE '      Keyword.Pseudo
 '" FOREGROUND-COLOR"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15963,7 +15963,7 @@
 'VALUE '      Keyword.Pseudo
 '" FOREVER"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15975,7 +15975,7 @@
 'VALUE '      Keyword.Pseudo
 '" FORMAT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15987,7 +15987,7 @@
 'VALUE '      Keyword.Pseudo
 '"MFORMFEED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -15999,7 +15999,7 @@
 'VALUE '      Keyword.Pseudo
 '"IFRACTION-PART"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16011,7 +16011,7 @@
 'VALUE '      Keyword.Pseudo
 '"VFREE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16023,7 +16023,7 @@
 'VALUE '      Keyword.Pseudo
 '" FROM"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16035,7 +16035,7 @@
 'VALUE '      Keyword.Pseudo
 '" FULL"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16047,7 +16047,7 @@
 'VALUE '      Keyword.Pseudo
 '" FUNCTION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16059,7 +16059,7 @@
 'VALUE '      Keyword.Pseudo
 '" FUNCTION-ID"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16071,7 +16071,7 @@
 'VALUE '      Keyword.Pseudo
 '" FUNCTION-POINTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16083,7 +16083,7 @@
 'VALUE '      Keyword.Pseudo
 '"VGENERATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16095,7 +16095,7 @@
 'VALUE '      Keyword.Pseudo
 '" GET"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16107,7 +16107,7 @@
 'VALUE '      Keyword.Pseudo
 '"KGIVING"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16119,7 +16119,7 @@
 'VALUE '      Keyword.Pseudo
 '" GLOBAL"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16131,7 +16131,7 @@
 'VALUE '      Keyword.Pseudo
 '"VGO"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16143,7 +16143,7 @@
 'VALUE '      Keyword.Pseudo
 '"VGOBACK"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16155,7 +16155,7 @@
 'VALUE '      Keyword.Pseudo
 '" GREATER"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16167,7 +16167,7 @@
 'VALUE '      Keyword.Pseudo
 '" GROUP"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16179,7 +16179,7 @@
 'VALUE '      Keyword.Pseudo
 '" GROUP-USAGE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16191,7 +16191,7 @@
 'VALUE '      Keyword.Pseudo
 '" HEADING"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16203,7 +16203,7 @@
 'VALUE '      Keyword.Pseudo
 '" HIGH-VALUE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16215,7 +16215,7 @@
 'VALUE '      Keyword.Pseudo
 '" HIGH-VALUES"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16227,7 +16227,7 @@
 'VALUE '      Keyword.Pseudo
 '" HIGHLIGHT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16239,7 +16239,7 @@
 'VALUE '      Keyword.Pseudo
 '" I-O"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16251,7 +16251,7 @@
 'VALUE '      Keyword.Pseudo
 '" I-O-CONTROL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16263,7 +16263,7 @@
 'VALUE '      Keyword.Pseudo
 '"KID"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16275,7 +16275,7 @@
 'VALUE '      Keyword.Pseudo
 '"KIDENTIFICATION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16287,7 +16287,7 @@
 'VALUE '      Keyword.Pseudo
 '"VIF"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16299,7 +16299,7 @@
 'VALUE '      Keyword.Pseudo
 '" IGNORE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16311,7 +16311,7 @@
 'VALUE '      Keyword.Pseudo
 '" IGNORING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16323,7 +16323,7 @@
 'VALUE '      Keyword.Pseudo
 '" IN"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16335,7 +16335,7 @@
 'VALUE '      Keyword.Pseudo
 '" INDEX"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16347,7 +16347,7 @@
 'VALUE '      Keyword.Pseudo
 '"KINDEXED"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16359,7 +16359,7 @@
 'VALUE '      Keyword.Pseudo
 '" INDICATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16371,7 +16371,7 @@
 'VALUE '      Keyword.Pseudo
 '" INFINITY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16383,7 +16383,7 @@
 'VALUE '      Keyword.Pseudo
 '" INHERITS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16395,7 +16395,7 @@
 'VALUE '      Keyword.Pseudo
 '" INITIAL"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16407,7 +16407,7 @@
 'VALUE '      Keyword.Pseudo
 '" INITIALISED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16419,7 +16419,7 @@
 'VALUE '      Keyword.Pseudo
 '"VINITIALIZE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16431,7 +16431,7 @@
 'VALUE '      Keyword.Pseudo
 '" INITIALIZED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16443,7 +16443,7 @@
 'VALUE '      Keyword.Pseudo
 '"VINITIATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16455,7 +16455,7 @@
 'VALUE '      Keyword.Pseudo
 '" INPUT"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16467,7 +16467,7 @@
 'VALUE '      Keyword.Pseudo
 '"KINPUT-OUTPUT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16479,7 +16479,7 @@
 'VALUE '      Keyword.Pseudo
 '"VINSPECT"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16491,7 +16491,7 @@
 'VALUE '      Keyword.Pseudo
 '" INSTALLATION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16503,7 +16503,7 @@
 'VALUE '      Keyword.Pseudo
 '"IINTEGER"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16515,7 +16515,7 @@
 'VALUE '      Keyword.Pseudo
 '"IINTEGER-OF-DATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16527,7 +16527,7 @@
 'VALUE '      Keyword.Pseudo
 '"IINTEGER-OF-DAY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16539,7 +16539,7 @@
 'VALUE '      Keyword.Pseudo
 '"IINTEGER-PART"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16551,7 +16551,7 @@
 'VALUE '      Keyword.Pseudo
 '" INTERFACE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16563,7 +16563,7 @@
 'VALUE '      Keyword.Pseudo
 '" INTERFACE-ID"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16575,7 +16575,7 @@
 'VALUE '      Keyword.Pseudo
 '"KINTO"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16587,7 +16587,7 @@
 'VALUE '      Keyword.Pseudo
 '" INTRINSIC"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16599,7 +16599,7 @@
 'VALUE '      Keyword.Pseudo
 '" INVALID"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16611,7 +16611,7 @@
 'VALUE '      Keyword.Pseudo
 '" INVOKE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16623,7 +16623,7 @@
 'VALUE '      Keyword.Pseudo
 '" IS"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16635,7 +16635,7 @@
 'VALUE '      Keyword.Pseudo
 '" JUST"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16647,7 +16647,7 @@
 'VALUE '      Keyword.Pseudo
 '" JUSTIFIED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16659,7 +16659,7 @@
 'VALUE '      Keyword.Pseudo
 '" KEY"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16671,7 +16671,7 @@
 'VALUE '      Keyword.Pseudo
 '" LABEL"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16683,7 +16683,7 @@
 'VALUE '      Keyword.Pseudo
 '" LAST"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16695,7 +16695,7 @@
 'VALUE '      Keyword.Pseudo
 '" LEADING"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16707,7 +16707,7 @@
 'VALUE '      Keyword.Pseudo
 '" LEFT"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16719,7 +16719,7 @@
 'VALUE '      Keyword.Pseudo
 '" LEFT-JUSTIFY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16731,7 +16731,7 @@
 'VALUE '      Keyword.Pseudo
 '"ILENGTH"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16743,7 +16743,7 @@
 'VALUE '      Keyword.Pseudo
 '" LESS"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16755,7 +16755,7 @@
 'VALUE '      Keyword.Pseudo
 '" LIMIT"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16767,7 +16767,7 @@
 'VALUE '      Keyword.Pseudo
 '" LIMITS"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16779,7 +16779,7 @@
 'VALUE '      Keyword.Pseudo
 '" LINAGE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16791,7 +16791,7 @@
 'VALUE '      Keyword.Pseudo
 '"ILINAGE-COUNTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16803,7 +16803,7 @@
 'VALUE '      Keyword.Pseudo
 '" LINE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16815,7 +16815,7 @@
 'VALUE '      Keyword.Pseudo
 '" LINE-COUNTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16827,7 +16827,7 @@
 'VALUE '      Keyword.Pseudo
 '" LINES"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16839,7 +16839,7 @@
 'VALUE '      Keyword.Pseudo
 '"KLINKAGE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16851,7 +16851,7 @@
 'VALUE '      Keyword.Pseudo
 '"KLOCAL-STORAGE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16863,7 +16863,7 @@
 'VALUE '      Keyword.Pseudo
 '" LOCALE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16875,7 +16875,7 @@
 'VALUE '      Keyword.Pseudo
 '"ILOCALE-DATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16887,7 +16887,7 @@
 'VALUE '      Keyword.Pseudo
 '"ILOCALE-TIME"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16899,7 +16899,7 @@
 'VALUE '      Keyword.Pseudo
 '"ILOCALE-TIME-FROM-SECONDS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16911,7 +16911,7 @@
 'VALUE '      Keyword.Pseudo
 '" LOCK"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16923,7 +16923,7 @@
 'VALUE '      Keyword.Pseudo
 '"ILOG"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16935,7 +16935,7 @@
 'VALUE '      Keyword.Pseudo
 '"ILOG10"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16947,7 +16947,7 @@
 'VALUE '      Keyword.Pseudo
 '" LOW-VALUE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16959,7 +16959,7 @@
 'VALUE '      Keyword.Pseudo
 '" LOW-VALUES"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16971,7 +16971,7 @@
 'VALUE '      Keyword.Pseudo
 '" LOWER"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16983,7 +16983,7 @@
 'VALUE '      Keyword.Pseudo
 '"ILOWER-CASE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -16995,7 +16995,7 @@
 'VALUE '      Keyword.Pseudo
 '" LOWLIGHT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17007,7 +17007,7 @@
 'VALUE '      Keyword.Pseudo
 '" MANUAL"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17019,7 +17019,7 @@
 'VALUE '      Keyword.Pseudo
 '"IMAX"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17031,7 +17031,7 @@
 'VALUE '      Keyword.Pseudo
 '"IMEAN"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17043,7 +17043,7 @@
 'VALUE '      Keyword.Pseudo
 '"IMEDIAN"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17055,7 +17055,7 @@
 'VALUE '      Keyword.Pseudo
 '" MEMORY"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17067,7 +17067,7 @@
 'VALUE '      Keyword.Pseudo
 '"VMERGE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17079,7 +17079,7 @@
 'VALUE '      Keyword.Pseudo
 '" METHOD"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17091,7 +17091,7 @@
 'VALUE '      Keyword.Pseudo
 '" METHOD-ID"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17103,7 +17103,7 @@
 'VALUE '      Keyword.Pseudo
 '"IMIDRANGE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17115,7 +17115,7 @@
 'VALUE '      Keyword.Pseudo
 '"IMIN"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17127,7 +17127,7 @@
 'VALUE '      Keyword.Pseudo
 '" MINUS"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17139,7 +17139,7 @@
 'VALUE '      Keyword.Pseudo
 '"IMOD"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17151,7 +17151,7 @@
 'VALUE '      Keyword.Pseudo
 '" MODE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17163,7 +17163,7 @@
 'VALUE '      Keyword.Pseudo
 '"VMOVE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17175,7 +17175,7 @@
 'VALUE '      Keyword.Pseudo
 '" MULTIPLE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17187,7 +17187,7 @@
 'VALUE '      Keyword.Pseudo
 '"VMULTIPLY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17199,7 +17199,7 @@
 'VALUE '      Keyword.Pseudo
 '" NATIONAL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17211,7 +17211,7 @@
 'VALUE '      Keyword.Pseudo
 '" NATIONAL-EDITED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17223,7 +17223,7 @@
 'VALUE '      Keyword.Pseudo
 '" NATIVE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17235,7 +17235,7 @@
 'VALUE '      Keyword.Pseudo
 '" NEGATIVE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17247,7 +17247,7 @@
 'VALUE '      Keyword.Pseudo
 '" NESTED"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17259,7 +17259,7 @@
 'VALUE '      Keyword.Pseudo
 '"VNEXT"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17271,7 +17271,7 @@
 'VALUE '      Keyword.Pseudo
 '" NO"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17283,7 +17283,7 @@
 'VALUE '      Keyword.Pseudo
 '" NOT"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17295,7 +17295,7 @@
 'VALUE '      Keyword.Pseudo
 '" NULL"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17307,7 +17307,7 @@
 'VALUE '      Keyword.Pseudo
 '" NULLS"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17319,7 +17319,7 @@
 'VALUE '      Keyword.Pseudo
 '" NUMBER"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17331,7 +17331,7 @@
 'VALUE '      Keyword.Pseudo
 '"INUMBER-OF-CALL-PARAMETERS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17343,7 +17343,7 @@
 'VALUE '      Keyword.Pseudo
 '" NUMBERS"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17355,7 +17355,7 @@
 'VALUE '      Keyword.Pseudo
 '" NUMERIC"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17367,7 +17367,7 @@
 'VALUE '      Keyword.Pseudo
 '" NUMERIC-EDITED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17379,7 +17379,7 @@
 'VALUE '      Keyword.Pseudo
 '"INUMVAL"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17391,7 +17391,7 @@
 'VALUE '      Keyword.Pseudo
 '"INUMVAL-C"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17403,7 +17403,7 @@
 'VALUE '      Keyword.Pseudo
 '" OBJECT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17415,7 +17415,7 @@
 'VALUE '      Keyword.Pseudo
 '" OBJECT-COMPUTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17427,7 +17427,7 @@
 'VALUE '      Keyword.Pseudo
 '" OBJECT-REFERENCE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17439,7 +17439,7 @@
 'VALUE '      Keyword.Pseudo
 '" OCCURS"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17451,7 +17451,7 @@
 'VALUE '      Keyword.Pseudo
 '" OF"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17463,7 +17463,7 @@
 'VALUE '      Keyword.Pseudo
 '" OFF"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17475,7 +17475,7 @@
 'VALUE '      Keyword.Pseudo
 '" OMITTED"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17487,7 +17487,7 @@
 'VALUE '      Keyword.Pseudo
 '" ON"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17499,7 +17499,7 @@
 'VALUE '      Keyword.Pseudo
 '" ONLY"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17511,7 +17511,7 @@
 'VALUE '      Keyword.Pseudo
 '"VOPEN"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17523,7 +17523,7 @@
 'VALUE '      Keyword.Pseudo
 '" OPTIONAL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17535,7 +17535,7 @@
 'VALUE '      Keyword.Pseudo
 '" OPTIONS"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17547,7 +17547,7 @@
 'VALUE '      Keyword.Pseudo
 '" OR"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17559,7 +17559,7 @@
 'VALUE '      Keyword.Pseudo
 '"IORD"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17571,7 +17571,7 @@
 'VALUE '      Keyword.Pseudo
 '"IORD-MAX"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17583,7 +17583,7 @@
 'VALUE '      Keyword.Pseudo
 '"IORD-MIN"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17595,7 +17595,7 @@
 'VALUE '      Keyword.Pseudo
 '" ORDER"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17607,7 +17607,7 @@
 'VALUE '      Keyword.Pseudo
 '" ORGANIZATION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17619,7 +17619,7 @@
 'VALUE '      Keyword.Pseudo
 '" OTHER"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17631,7 +17631,7 @@
 'VALUE '      Keyword.Pseudo
 '" OUTPUT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17643,7 +17643,7 @@
 'VALUE '      Keyword.Pseudo
 '" OVERFLOW"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17655,7 +17655,7 @@
 'VALUE '      Keyword.Pseudo
 '" OVERLINE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17667,7 +17667,7 @@
 'VALUE '      Keyword.Pseudo
 '" OVERRIDE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17679,7 +17679,7 @@
 'VALUE '      Keyword.Pseudo
 '" PACKED-DECIMAL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17691,7 +17691,7 @@
 'VALUE '      Keyword.Pseudo
 '" PADDING"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17703,7 +17703,7 @@
 'VALUE '      Keyword.Pseudo
 '" PAGE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17715,7 +17715,7 @@
 'VALUE '      Keyword.Pseudo
 '" PAGE-COUNTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17727,7 +17727,7 @@
 'VALUE '      Keyword.Pseudo
 '" PARAGRAPH"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17739,7 +17739,7 @@
 'VALUE '      Keyword.Pseudo
 '"VPERFORM"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17751,7 +17751,7 @@
 'VALUE '      Keyword.Pseudo
 '" PF"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17763,7 +17763,7 @@
 'VALUE '      Keyword.Pseudo
 '" PH"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17775,7 +17775,7 @@
 'VALUE '      Keyword.Pseudo
 '"IPI"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17787,7 +17787,7 @@
 'VALUE '      Keyword.Pseudo
 '"KPIC"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17799,7 +17799,7 @@
 'VALUE '      Keyword.Pseudo
 '"KPICTURE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17811,7 +17811,7 @@
 'VALUE '      Keyword.Pseudo
 '" PLUS"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17823,7 +17823,7 @@
 'VALUE '      Keyword.Pseudo
 '"KPOINTER"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17835,7 +17835,7 @@
 'VALUE '      Keyword.Pseudo
 '" POSITION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17847,7 +17847,7 @@
 'VALUE '      Keyword.Pseudo
 '" POSITIVE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17859,7 +17859,7 @@
 'VALUE '      Keyword.Pseudo
 '" PRESENT"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17871,7 +17871,7 @@
 'VALUE '      Keyword.Pseudo
 '"IPRESENT-VALUE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17883,7 +17883,7 @@
 'VALUE '      Keyword.Pseudo
 '" PREVIOUS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17895,7 +17895,7 @@
 'VALUE '      Keyword.Pseudo
 '"MPRINTER"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17907,7 +17907,7 @@
 'VALUE '      Keyword.Pseudo
 '" PRINTING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17919,7 +17919,7 @@
 'VALUE '      Keyword.Pseudo
 '"KPROCEDURE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17931,7 +17931,7 @@
 'VALUE '      Keyword.Pseudo
 '" PROCEDURE-POINTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17943,7 +17943,7 @@
 'VALUE '      Keyword.Pseudo
 '" PROCEDURES"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17955,7 +17955,7 @@
 'VALUE '      Keyword.Pseudo
 '" PROCEED"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17967,7 +17967,7 @@
 'VALUE '      Keyword.Pseudo
 '" PROGRAM"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17979,7 +17979,7 @@
 'VALUE '      Keyword.Pseudo
 '"KPROGRAM-ID"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -17991,7 +17991,7 @@
 'VALUE '      Keyword.Pseudo
 '" PROGRAM-POINTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18003,7 +18003,7 @@
 'VALUE '      Keyword.Pseudo
 '" PROMPT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18015,7 +18015,7 @@
 'VALUE '      Keyword.Pseudo
 '" PROPERTY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18027,7 +18027,7 @@
 'VALUE '      Keyword.Pseudo
 '" PROTOTYPE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18039,7 +18039,7 @@
 'VALUE '      Keyword.Pseudo
 '" QUOTE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18051,7 +18051,7 @@
 'VALUE '      Keyword.Pseudo
 '" QUOTES"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18063,7 +18063,7 @@
 'VALUE '      Keyword.Pseudo
 '" RAISE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18075,7 +18075,7 @@
 'VALUE '      Keyword.Pseudo
 '" RAISING"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18087,7 +18087,7 @@
 'VALUE '      Keyword.Pseudo
 '"IRANDOM"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18099,7 +18099,7 @@
 'VALUE '      Keyword.Pseudo
 '"IRANGE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18111,7 +18111,7 @@
 'VALUE '      Keyword.Pseudo
 '" RD"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18123,7 +18123,7 @@
 'VALUE '      Keyword.Pseudo
 '"VREAD"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18135,7 +18135,7 @@
 'VALUE '      Keyword.Pseudo
 '"VREADY"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18147,7 +18147,7 @@
 'VALUE '      Keyword.Pseudo
 '" RECORD"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18159,7 +18159,7 @@
 'VALUE '      Keyword.Pseudo
 '" RECORDING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18171,7 +18171,7 @@
 'VALUE '      Keyword.Pseudo
 '" RECORDS"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18183,7 +18183,7 @@
 'VALUE '      Keyword.Pseudo
 '" RECURSIVE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18195,7 +18195,7 @@
 'VALUE '      Keyword.Pseudo
 '"KREDEFINES"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18207,7 +18207,7 @@
 'VALUE '      Keyword.Pseudo
 '" REEL"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18219,7 +18219,7 @@
 'VALUE '      Keyword.Pseudo
 '" REFERENCE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18231,7 +18231,7 @@
 'VALUE '      Keyword.Pseudo
 '" RELATIVE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18243,7 +18243,7 @@
 'VALUE '      Keyword.Pseudo
 '"VRELEASE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18255,7 +18255,7 @@
 'VALUE '      Keyword.Pseudo
 '"IREM"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18267,7 +18267,7 @@
 'VALUE '      Keyword.Pseudo
 '" REMAINDER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18279,7 +18279,7 @@
 'VALUE '      Keyword.Pseudo
 '" REMARKS"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18291,7 +18291,7 @@
 'VALUE '      Keyword.Pseudo
 '" REMOVAL"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18303,7 +18303,7 @@
 'VALUE '      Keyword.Pseudo
 '"KRENAMES"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18315,7 +18315,7 @@
 'VALUE '      Keyword.Pseudo
 '"KREPLACING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18327,7 +18327,7 @@
 'VALUE '      Keyword.Pseudo
 '"KREPORT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18339,7 +18339,7 @@
 'VALUE '      Keyword.Pseudo
 '" REPORTING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18351,7 +18351,7 @@
 'VALUE '      Keyword.Pseudo
 '" REPORTS"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18363,7 +18363,7 @@
 'VALUE '      Keyword.Pseudo
 '" REPOSITORY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18375,7 +18375,7 @@
 'VALUE '      Keyword.Pseudo
 '" REPRESENTS-NOT-A-NUMBER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18387,7 +18387,7 @@
 'VALUE '      Keyword.Pseudo
 '" REQUIRED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18399,7 +18399,7 @@
 'VALUE '      Keyword.Pseudo
 '" RESERVE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18411,7 +18411,7 @@
 'VALUE '      Keyword.Pseudo
 '" RESUME"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18423,7 +18423,7 @@
 'VALUE '      Keyword.Pseudo
 '" RETRY"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18435,7 +18435,7 @@
 'VALUE '      Keyword.Pseudo
 '"VRETURN"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18447,7 +18447,7 @@
 'VALUE '      Keyword.Pseudo
 '"IRETURN-CODE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18459,7 +18459,7 @@
 'VALUE '      Keyword.Pseudo
 '"KRETURNING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18471,7 +18471,7 @@
 'VALUE '      Keyword.Pseudo
 '"IREVERSE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18483,7 +18483,7 @@
 'VALUE '      Keyword.Pseudo
 '" REVERSE-VIDEO"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18495,7 +18495,7 @@
 'VALUE '      Keyword.Pseudo
 '" REWIND"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18507,7 +18507,7 @@
 'VALUE '      Keyword.Pseudo
 '"VREWRITE"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18519,7 +18519,7 @@
 'VALUE '      Keyword.Pseudo
 '" RF"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18531,7 +18531,7 @@
 'VALUE '      Keyword.Pseudo
 '" RH"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18543,7 +18543,7 @@
 'VALUE '      Keyword.Pseudo
 '" RIGHT"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18555,7 +18555,7 @@
 'VALUE '      Keyword.Pseudo
 '" RIGHT-JUSTIFY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18567,7 +18567,7 @@
 'VALUE '      Keyword.Pseudo
 '"VROLLBACK"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18579,7 +18579,7 @@
 'VALUE '      Keyword.Pseudo
 '" ROUNDED"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18591,7 +18591,7 @@
 'VALUE '      Keyword.Pseudo
 '" RUN"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18603,7 +18603,7 @@
 'VALUE '      Keyword.Pseudo
 '" SAME"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18615,7 +18615,7 @@
 'VALUE '      Keyword.Pseudo
 '"KSCREEN"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18627,7 +18627,7 @@
 'VALUE '      Keyword.Pseudo
 '" SCROLL"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18639,7 +18639,7 @@
 'VALUE '      Keyword.Pseudo
 '"KSD"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18651,7 +18651,7 @@
 'VALUE '      Keyword.Pseudo
 '"VSEARCH"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18663,7 +18663,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISECONDS-FROM-FORMATTED-TIME"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18675,7 +18675,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISECONDS-PAST-MIDNIGHT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18687,7 +18687,7 @@
 'VALUE '      Keyword.Pseudo
 '"KSECTION"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18699,7 +18699,7 @@
 'VALUE '      Keyword.Pseudo
 '" SECURE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18711,7 +18711,7 @@
 'VALUE '      Keyword.Pseudo
 '" SECURITY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18723,7 +18723,7 @@
 'VALUE '      Keyword.Pseudo
 '" SEGMENT-LIMIT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18735,7 +18735,7 @@
 'VALUE '      Keyword.Pseudo
 '" SELECT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18747,7 +18747,7 @@
 'VALUE '      Keyword.Pseudo
 '" SELF"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18759,7 +18759,7 @@
 'VALUE '      Keyword.Pseudo
 '" SENTENCE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18771,7 +18771,7 @@
 'VALUE '      Keyword.Pseudo
 '" SEPARATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18783,7 +18783,7 @@
 'VALUE '      Keyword.Pseudo
 '" SEQUENCE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18795,7 +18795,7 @@
 'VALUE '      Keyword.Pseudo
 '" SEQUENTIAL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18807,7 +18807,7 @@
 'VALUE '      Keyword.Pseudo
 '"VSET"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18819,7 +18819,7 @@
 'VALUE '      Keyword.Pseudo
 '" SHARING"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18831,7 +18831,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISIGN"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18843,7 +18843,7 @@
 'VALUE '      Keyword.Pseudo
 '" SIGNED"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18855,7 +18855,7 @@
 'VALUE '      Keyword.Pseudo
 '" SIGNED-INT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18867,7 +18867,7 @@
 'VALUE '      Keyword.Pseudo
 '" SIGNED-LONG"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18879,7 +18879,7 @@
 'VALUE '      Keyword.Pseudo
 '" SIGNED-SHORT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18891,7 +18891,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISIN"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18903,7 +18903,7 @@
 'VALUE '      Keyword.Pseudo
 '" SIZE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18915,7 +18915,7 @@
 'VALUE '      Keyword.Pseudo
 '"VSORT"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18927,7 +18927,7 @@
 'VALUE '      Keyword.Pseudo
 '" SORT-MERGE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18939,7 +18939,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISORT-RETURN"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18951,7 +18951,7 @@
 'VALUE '      Keyword.Pseudo
 '" SOURCE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18963,7 +18963,7 @@
 'VALUE '      Keyword.Pseudo
 '" SOURCE-COMPUTER"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18975,7 +18975,7 @@
 'VALUE '      Keyword.Pseudo
 '" SOURCES"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18987,7 +18987,7 @@
 'VALUE '      Keyword.Pseudo
 '" SPACE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -18999,7 +18999,7 @@
 'VALUE '      Keyword.Pseudo
 '" SPACE-FILL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19011,7 +19011,7 @@
 'VALUE '      Keyword.Pseudo
 '" SPACES"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19023,7 +19023,7 @@
 'VALUE '      Keyword.Pseudo
 '" SPECIAL-NAMES"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19035,7 +19035,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISQRT"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19047,7 +19047,7 @@
 'VALUE '      Keyword.Pseudo
 '" STANDARD"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19059,7 +19059,7 @@
 'VALUE '      Keyword.Pseudo
 '" STANDARD-1"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19071,7 +19071,7 @@
 'VALUE '      Keyword.Pseudo
 '" STANDARD-2"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19083,7 +19083,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISTANDARD-DEVIATION"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19095,7 +19095,7 @@
 'VALUE '      Keyword.Pseudo
 '"VSTART"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19107,7 +19107,7 @@
 'VALUE '      Keyword.Pseudo
 '" STATUS"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19119,7 +19119,7 @@
 'VALUE '      Keyword.Pseudo
 '"VSTOP"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19131,7 +19131,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISTORED-CHAR-LENGTH"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19143,7 +19143,7 @@
 'VALUE '      Keyword.Pseudo
 '"VSTRING"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19155,7 +19155,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISUBSTITUTE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19167,7 +19167,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISUBSTITUTE-CASE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19179,7 +19179,7 @@
 'VALUE '      Keyword.Pseudo
 '"VSUBTRACT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19191,7 +19191,7 @@
 'VALUE '      Keyword.Pseudo
 '"ISUM"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19203,7 +19203,7 @@
 'VALUE '      Keyword.Pseudo
 '" SUPER"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19215,7 +19215,7 @@
 'VALUE '      Keyword.Pseudo
 '"VSUPPRESS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19227,7 +19227,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSWITCH-1"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19239,7 +19239,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSWITCH-2"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19251,7 +19251,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSWITCH-3"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19263,7 +19263,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSWITCH-4"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19275,7 +19275,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSWITCH-5"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19287,7 +19287,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSWITCH-6"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19299,7 +19299,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSWITCH-7"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19311,7 +19311,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSWITCH-8"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19323,7 +19323,7 @@
 'VALUE '      Keyword.Pseudo
 '" SYMBOLIC"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19335,7 +19335,7 @@
 'VALUE '      Keyword.Pseudo
 '" SYNC"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19347,7 +19347,7 @@
 'VALUE '      Keyword.Pseudo
 '" SYNCHRONIZED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19359,7 +19359,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSYSERR"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19371,7 +19371,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSYSIN"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19383,7 +19383,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSYSIPT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19395,7 +19395,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSYSLIST"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19407,7 +19407,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSYSLST"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19419,7 +19419,7 @@
 'VALUE '      Keyword.Pseudo
 '"MSYSOUT"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19431,7 +19431,7 @@
 'VALUE '      Keyword.Pseudo
 '" SYSTEM-DEFAULT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19443,7 +19443,7 @@
 'VALUE '      Keyword.Pseudo
 '" TABLE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19455,7 +19455,7 @@
 'VALUE '      Keyword.Pseudo
 '"KTALLYING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19467,7 +19467,7 @@
 'VALUE '      Keyword.Pseudo
 '"ITAN"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19479,7 +19479,7 @@
 'VALUE '      Keyword.Pseudo
 '" TAPE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19491,7 +19491,7 @@
 'VALUE '      Keyword.Pseudo
 '"VTERMINATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19503,7 +19503,7 @@
 'VALUE '      Keyword.Pseudo
 '" TEST"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19515,7 +19515,7 @@
 'VALUE '      Keyword.Pseudo
 '"ITEST-DATE-YYYYMMDD"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19527,7 +19527,7 @@
 'VALUE '      Keyword.Pseudo
 '"ITEST-DAY-YYYYDDD"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19539,7 +19539,7 @@
 'VALUE '      Keyword.Pseudo
 '" THAN"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19551,7 +19551,7 @@
 'VALUE '      Keyword.Pseudo
 '" THEN"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19563,7 +19563,7 @@
 'VALUE '      Keyword.Pseudo
 '" THROUGH"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19575,7 +19575,7 @@
 'VALUE '      Keyword.Pseudo
 '" THRU"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19587,7 +19587,7 @@
 'VALUE '      Keyword.Pseudo
 '" TIME"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19599,7 +19599,7 @@
 'VALUE '      Keyword.Pseudo
 '" TIMES"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19611,7 +19611,7 @@
 'VALUE '      Keyword.Pseudo
 '"KTO"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19623,7 +19623,7 @@
 'VALUE '      Keyword.Pseudo
 '" TOP"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19635,7 +19635,7 @@
 'VALUE '      Keyword.Pseudo
 '" TRAILING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19647,7 +19647,7 @@
 'VALUE '      Keyword.Pseudo
 '" TRAILING-SIGN"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19659,7 +19659,7 @@
 'VALUE '      Keyword.Pseudo
 '"VTRANSFORM"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19671,7 +19671,7 @@
 'VALUE '      Keyword.Pseudo
 '"ITRIM"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19683,7 +19683,7 @@
 'VALUE '      Keyword.Pseudo
 '" TRUE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19695,7 +19695,7 @@
 'VALUE '      Keyword.Pseudo
 '" TYPE"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19707,7 +19707,7 @@
 'VALUE '      Keyword.Pseudo
 '" TYPEDEF"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19719,7 +19719,7 @@
 'VALUE '      Keyword.Pseudo
 '" UNDERLINE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19731,7 +19731,7 @@
 'VALUE '      Keyword.Pseudo
 '" UNIT"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19743,7 +19743,7 @@
 'VALUE '      Keyword.Pseudo
 '" UNIVERSAL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19755,7 +19755,7 @@
 'VALUE '      Keyword.Pseudo
 '"VUNLOCK"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19767,7 +19767,7 @@
 'VALUE '      Keyword.Pseudo
 '" UNSIGNED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19779,7 +19779,7 @@
 'VALUE '      Keyword.Pseudo
 '" UNSIGNED-INT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19791,7 +19791,7 @@
 'VALUE '      Keyword.Pseudo
 '" UNSIGNED-LONG"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19803,7 +19803,7 @@
 'VALUE '      Keyword.Pseudo
 '" UNSIGNED-SHORT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19815,7 +19815,7 @@
 'VALUE '      Keyword.Pseudo
 '"VUNSTRING"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19827,7 +19827,7 @@
 'VALUE '      Keyword.Pseudo
 '" UNTIL"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19839,7 +19839,7 @@
 'VALUE '      Keyword.Pseudo
 '"KUP"'       Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19851,7 +19851,7 @@
 'VALUE '      Keyword.Pseudo
 '" UPDATE"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19863,7 +19863,7 @@
 'VALUE '      Keyword.Pseudo
 '" UPON"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19875,7 +19875,7 @@
 'VALUE '      Keyword.Pseudo
 '" UPPER"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19887,7 +19887,7 @@
 'VALUE '      Keyword.Pseudo
 '"IUPPER-CASE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19899,7 +19899,7 @@
 'VALUE '      Keyword.Pseudo
 '" USAGE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19911,7 +19911,7 @@
 'VALUE '      Keyword.Pseudo
 '"VUSE"'      Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19923,7 +19923,7 @@
 'VALUE '      Keyword.Pseudo
 '" USER-DEFAULT"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19935,7 +19935,7 @@
 'VALUE '      Keyword.Pseudo
 '"KUSING"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19947,7 +19947,7 @@
 'VALUE '      Keyword.Pseudo
 '" VAL-STATUS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19959,7 +19959,7 @@
 'VALUE '      Keyword.Pseudo
 '" VALID"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19971,7 +19971,7 @@
 'VALUE '      Keyword.Pseudo
 '" VALIDATE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19983,7 +19983,7 @@
 'VALUE '      Keyword.Pseudo
 '" VALIDATE-STATUS"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -19995,7 +19995,7 @@
 'VALUE '      Keyword.Pseudo
 '" VALUE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20007,7 +20007,7 @@
 'VALUE '      Keyword.Pseudo
 '" VALUES"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20019,7 +20019,7 @@
 'VALUE '      Keyword.Pseudo
 '"IVARIANCE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20031,7 +20031,7 @@
 'VALUE '      Keyword.Pseudo
 '"KVARYING"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20043,7 +20043,7 @@
 'VALUE '      Keyword.Pseudo
 '" WAIT"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20055,7 +20055,7 @@
 'VALUE '      Keyword.Pseudo
 '"VWHEN"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20067,7 +20067,7 @@
 'VALUE '      Keyword.Pseudo
 '"IWHEN-COMPILED"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20079,7 +20079,7 @@
 'VALUE '      Keyword.Pseudo
 '" WITH"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20091,7 +20091,7 @@
 'VALUE '      Keyword.Pseudo
 '" WORDS"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20103,7 +20103,7 @@
 'VALUE '      Keyword.Pseudo
 '"KWORKING-STORAGE"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20115,7 +20115,7 @@
 'VALUE '      Keyword.Pseudo
 '"VWRITE"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20127,7 +20127,7 @@
 'VALUE '      Keyword.Pseudo
 '"IYEAR-TO-YYYY"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20139,7 +20139,7 @@
 'VALUE '      Keyword.Pseudo
 '" YYYYDDD"'  Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20151,7 +20151,7 @@
 'VALUE '      Keyword.Pseudo
 '" YYYYMMDD"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20163,7 +20163,7 @@
 'VALUE '      Keyword.Pseudo
 '" ZERO"'     Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20175,7 +20175,7 @@
 'VALUE '      Keyword.Pseudo
 '" ZERO-FILL"' Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20187,7 +20187,7 @@
 'VALUE '      Keyword.Pseudo
 '" ZEROES"'   Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20199,7 +20199,7 @@
 'VALUE '      Keyword.Pseudo
 '" ZEROS"'    Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20210,7 +20210,7 @@
 ' '           Text.Whitespace
 'Reserved-Words' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20227,7 +20227,7 @@
 'KEY'         Keyword.Pseudo
 ' '           Text.Whitespace
 'RW-Word'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                 ' Text.Whitespace
@@ -20235,7 +20235,7 @@
 ' '           Text.Whitespace
 'RW-Idx'      Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20244,7 +20244,7 @@
 '               ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20253,9 +20253,9 @@
 '               ' Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20264,9 +20264,9 @@
 '               ' Text.Whitespace
 'PIC X(15)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20275,9 +20275,9 @@
 '                ' Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20286,9 +20286,9 @@
 '              ' Text.Whitespace
 'PIC 9(6)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20299,16 +20299,16 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
 '01  '        Literal.Number.Integer
 'Syntax-Parsing-Items' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20317,7 +20317,7 @@
 '         '   Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20339,7 +20339,7 @@
 ' '           Text.Whitespace
 '"/"'         Literal.String.Double
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                       ' Text.Whitespace
@@ -20357,13 +20357,13 @@
 ' '           Text.Whitespace
 '">"'         Literal.String.Double
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                                       ' Text.Whitespace
 '":"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20376,7 +20376,7 @@
 ' '           Text.Whitespace
 '"\'"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20389,7 +20389,7 @@
 ' '           Text.Whitespace
 '"X"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20402,7 +20402,7 @@
 ' '           Text.Whitespace
 '"Z"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20411,7 +20411,7 @@
 '     '       Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20424,7 +20424,7 @@
 ' '           Text.Whitespace
 '"?"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20434,7 +20434,7 @@
 'VALUE '      Keyword.Pseudo
 '"E"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20444,7 +20444,7 @@
 'VALUE '      Keyword.Pseudo
 '"D"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20454,7 +20454,7 @@
 'VALUE '      Keyword.Pseudo
 '"P"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20463,14 +20463,14 @@
 '      '      Text.Whitespace
 'PIC 9(6)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '05 '         Literal.Number.Integer
 'SPI-Current-Program-ID' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20479,7 +20479,7 @@
 ' '           Text.Whitespace
 'PIC X(12)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20488,14 +20488,14 @@
 '          '  Text.Whitespace
 'PIC X(3)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 '05 '         Literal.Number.Integer
 'SPI-Current-Section' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20504,14 +20504,14 @@
 '              ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
 '10 '         Literal.Number.Integer
 'SPI-CS-2-14' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '           ' Text.Whitespace
@@ -20520,7 +20520,7 @@
 ' '           Text.Whitespace
 'PIC X(10)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '           ' Text.Whitespace
@@ -20529,7 +20529,7 @@
 '       '     Text.Whitespace
 'PIC X(3)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20538,7 +20538,7 @@
 '             ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20547,7 +20547,7 @@
 '        '    Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20556,7 +20556,7 @@
 '     '       Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20565,7 +20565,7 @@
 '         '   Text.Whitespace
 'PIC X(12)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20574,7 +20574,7 @@
 '            ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20587,7 +20587,7 @@
 ' '           Text.Whitespace
 '"\'"'        Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20596,7 +20596,7 @@
 '          '  Text.Whitespace
 'PIC X(32)'   Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20605,7 +20605,7 @@
 '           ' Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20616,7 +20616,7 @@
 ' '           Text.Whitespace
 'HIGH-VALUES' Name.Constant
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20626,7 +20626,7 @@
 'VALUE '      Keyword.Pseudo
 '"I"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20639,7 +20639,7 @@
 ' '           Text.Whitespace
 '"V"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20649,7 +20649,7 @@
 'VALUE '      Keyword.Pseudo
 '"L"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20659,7 +20659,7 @@
 'VALUE '      Keyword.Pseudo
 '"N"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '        '    Text.Whitespace
@@ -20669,7 +20669,7 @@
 'VALUE '      Keyword.Pseudo
 '"V"'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GC0710'      Comment
 '        '    Text.Whitespace
@@ -20679,9 +20679,9 @@
 'VALUE '      Keyword.Pseudo
 '" "'         Literal.String.Double
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20692,9 +20692,9 @@
 ' '           Text.Whitespace
 'BINARY-LONG' Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20703,9 +20703,9 @@
 '                 ' Text.Whitespace
 'PIC 9(8)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20713,7 +20713,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20722,7 +20722,7 @@
 '      '      Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20731,7 +20731,7 @@
 '        '    Text.Whitespace
 'PIC X(1)'    Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20740,7 +20740,7 @@
 '                ' Text.Whitespace
 'PIC X(256)'  Keyword.Type
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -20753,18 +20753,18 @@
 'USING'       Keyword.Pseudo
 ' '           Text.Whitespace
 'Produce-Source-Listing' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                          ' Text.Whitespace
 'Produce-Xref-Listing' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                          ' Text.Whitespace
 'Src-Filename' Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20774,7 +20774,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 ' '           Text.Whitespace
@@ -20782,7 +20782,7 @@
 '-'           Operator
 'Init'        Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20791,7 +20791,7 @@
 '100'         Literal.Number.Integer
 '-'           Operator
 'Initialization' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20800,7 +20800,7 @@
 '200'         Literal.Number.Integer
 '-'           Operator
 'Execute-cobc' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20809,7 +20809,7 @@
 'OUTPUT'      Keyword.Pseudo
 ' '           Text.Whitespace
 'Report-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20827,7 +20827,7 @@
 '500'         Literal.Number.Integer
 '-'           Operator
 'Produce-Source-Listing' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20845,7 +20845,7 @@
 'SORT'        Keyword.Reserved
 ' '           Text.Whitespace
 'Sort-File'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -20854,17 +20854,17 @@
 'KEY   '      Keyword.Pseudo
 ' '           Text.Whitespace
 'SR-Prog-ID'  Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                              ' Text.Whitespace
 'SR-Token-UC' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '                              ' Text.Whitespace
 'SR-Line-No-Ref' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -20875,7 +20875,7 @@
 '300'         Literal.Number.Integer
 '-'           Operator
 'Tokenize-Source' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '             ' Text.Whitespace
@@ -20886,7 +20886,7 @@
 '400'         Literal.Number.Integer
 '-'           Operator
 'Produce-Xref-Listing' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
@@ -20895,13 +20895,13 @@
 'CLOSE'       Keyword.Reserved
 ' '           Text.Whitespace
 'Report-File' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Comment
 '     '       Text.Whitespace
 'GOBACK\n           ' Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      /\n'   Comment
 
@@ -20913,7 +20913,7 @@
 ' '           Text.Whitespace
 'SECTION'     Keyword.Reserved
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      *****************************************************************\n' Comment
 
@@ -20929,4 +20929,4 @@
 ' '           Text.Whitespace
 'LISTING'     Name.Variable
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/console/example.sh-session.output b/tests/examplefiles/console/example.sh-session.output
index c31fc19389..c74f19ef1e 100644
--- a/tests/examplefiles/console/example.sh-session.output
+++ b/tests/examplefiles/console/example.sh-session.output
@@ -1,20 +1,20 @@
 'user@host:~/path$ ' Generic.Prompt
 'ls'          Text
-' '           Text
+' '           Text.Whitespace
 '-a'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.  ..  a  b  c\n' Generic.Output
 
 'user@host:~/path$ ' Generic.Prompt
 'diff'        Text
-' '           Text
+' '           Text.Whitespace
 '-u'          Text
-' '           Text
+' '           Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 'b'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '--- a   2008-07-26 17:10:07.000000000 -0700\n' Generic.Output
 
@@ -32,18 +32,18 @@
 
 'user@host:~/path$ ' Generic.Prompt
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '> '          Generic.Prompt
 'a'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a\n'         Generic.Output
 
 'user@host:~/path$ ' Generic.Prompt
 'su'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'root@host:~#\n' Generic.Prompt
 
@@ -56,6 +56,6 @@
 '(virtualenv-name)' Generic.Prompt.VirtualEnv
 'user@host:~$ ' Generic.Prompt
 'ls'          Text
-' '           Text
+' '           Text.Whitespace
 '-a'          Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/console/example.shell-session.output b/tests/examplefiles/console/example.shell-session.output
index b778132b1d..738c7e8f7e 100644
--- a/tests/examplefiles/console/example.shell-session.output
+++ b/tests/examplefiles/console/example.shell-session.output
@@ -1,12 +1,12 @@
 '[user@linuxbox imx-bootlets-src-10.05.02]$ ' Generic.Prompt
 'make'        Text
-' '           Text
+' '           Text.Whitespace
 'CROSS_COMPILE' Name.Variable
 '='           Operator
 'arm-none-eabi-' Text
-'  '          Text
+'  '          Text.Whitespace
 'clean'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'rm -rf *.sb\n' Generic.Output
 
@@ -26,11 +26,11 @@
 
 '[user@linuxbox imx-bootlets-src-10.05.02]$ ' Generic.Prompt
 'make'        Text
-' '           Text
+' '           Text.Whitespace
 'CROSS_COMPILE' Name.Variable
 '='           Operator
 'arm-none-eabi-' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "make[1]: Entering directory `/home/...'\n" Generic.Output
 
@@ -38,23 +38,23 @@
 
 '#'           Generic.Prompt
 '@echo'       Text
-' '           Text
+' '           Text.Whitespace
 '"generating U-Boot boot stream image"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Generic.Prompt
 'elftosb2'    Text
-' '           Text
+' '           Text.Whitespace
 '-z'          Text
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 './uboot_prebuilt.db' Text
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 'imx23_uboot.sb' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo "generating kernel bootstream file sd_mmc_bootstream.raw"\n' Generic.Output
 
@@ -62,43 +62,43 @@
 
 '#'           Generic.Prompt
 'Please'      Text
-' '           Text
+' '           Text.Whitespace
 'use'         Text
-' '           Text
+' '           Text.Whitespace
 'cfimager'    Text
-' '           Text
+' '           Text.Whitespace
 'to'          Text
-' '           Text
+' '           Text.Whitespace
 'burn'        Text
-' '           Text
+' '           Text.Whitespace
 'xxx_linux.sb.' Text
-' '           Text
+' '           Text.Whitespace
 'The'         Text
-' '           Text
+' '           Text.Whitespace
 'below'       Text
-' '           Text
+' '           Text.Whitespace
 'way'         Text
-' '           Text
+' '           Text.Whitespace
 'will'        Text
-' '           Text
+' '           Text.Whitespace
 'no'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Generic.Prompt
 'work'        Text
-' '           Text
+' '           Text.Whitespace
 'at'          Text
-' '           Text
+' '           Text.Whitespace
 'imx28'       Text
-' '           Text
+' '           Text.Whitespace
 'platform.'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '> test\n'    Generic.Output
 
 '$ '          Generic.Prompt
 'test'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'rm -f sd_mmc_bootstream.raw\n' Generic.Output
 
@@ -106,43 +106,43 @@
 
 'pi@raspberrypi ~ $ ' Generic.Prompt
 'sudo'        Text
-' '           Text
+' '           Text.Whitespace
 'sh'          Text
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '"echo 17 > /sys/class/gpio/export"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pi@raspberrypi ~ $ ' Generic.Prompt
 'sudo'        Text
-' '           Text
+' '           Text.Whitespace
 'sh'          Text
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '"echo out > /sys/class/gpio/gpio17/direction"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pi@raspberrypi ~ $ ' Generic.Prompt
 'sudo'        Text
-' '           Text
+' '           Text.Whitespace
 'sh'          Text
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '"echo 1 > /sys/class/gpio/gpio17/value"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pi@raspberrypi ~ $ ' Generic.Prompt
 'sudo'        Text
-' '           Text
+' '           Text.Whitespace
 'sh'          Text
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '"echo 0 > /sys/class/gpio/gpio17/value"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pi@raspberrypi ~ $\n' Generic.Prompt
 
@@ -151,69 +151,69 @@
 
 'root@imx233-olinuxino-micro:~# ' Generic.Prompt
 'lsmod'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  Not tainted\n' Generic.Output
 
 '[user@linuxbox ~]$ ' Generic.Prompt
 'tail'        Text
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '/mnt/rpi/etc/inittab' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Generic.Prompt
 'Spawn'       Text
-' '           Text
+' '           Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 'getty'       Text
-' '           Text
+' '           Text.Whitespace
 'on'          Text
-' '           Text
+' '           Text.Whitespace
 'Raspberry'   Text
-' '           Text
+' '           Text.Whitespace
 'Pi'          Text
-' '           Text
+' '           Text.Whitespace
 'serial'      Text
-' '           Text
+' '           Text.Whitespace
 'line'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'T0:23:respawn:/sbin/getty -L ttyAMA0 115200 vt100\n' Generic.Output
 
 'pi@raspberrypi:~/Adafruit-WebIDE$ ' Generic.Prompt
 'mkdir'       Text
-' '           Text
+' '           Text.Whitespace
 'tmp'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pi@raspberrypi:~/Adafruit-WebIDE$ ' Generic.Prompt
 'npm'         Text
-' '           Text
+' '           Text.Whitespace
 'config'      Text
-' '           Text
+' '           Text.Whitespace
 'set'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'tmp'         Text
-' '           Text
+' '           Text.Whitespace
 'tmp'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pi@raspberrypi:~/Adafruit-WebIDE$ ' Generic.Prompt
 'npm'         Text
-' '           Text
+' '           Text.Whitespace
 'install'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pi@raspberrypi ~/Adafruit-WebIDE $ ' Generic.Prompt
 'ifconfig'    Text
-' '           Text
+' '           Text.Whitespace
 'eth0'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'eth0      Link encap:Ethernet  HWaddr b5:33:ff:33:ee:aq\n' Generic.Output
 
diff --git a/tests/examplefiles/control/control.output b/tests/examplefiles/control/control.output
index df5a2dd457..01c59ef77d 100644
--- a/tests/examplefiles/control/control.output
+++ b/tests/examplefiles/control/control.output
@@ -1,29 +1,29 @@
 'Source'      Keyword
 ': '          Text.Whitespace
 'foo'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Section'     Keyword
 ': '          Text.Whitespace
 'misc'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Priority'    Keyword
 ': '          Text.Whitespace
 'optional'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Maintainer'  Keyword
 ': '          Text
 'Debian Python Team ' Text
 '<team+python@domain.tld>' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Uploaders'   Keyword
 ': '          Text
 'Alice '      Text
 '<alice@domain.tld>' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Build-Depends' Keyword
 ': '          Text
@@ -65,39 +65,39 @@
 'Rules-Requires-Root' Keyword
 ': '          Text.Whitespace
 'no'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Standards-Version' Keyword
 ': '          Text.Whitespace
 '4.5.1'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Vcs-Git'     Keyword
 ': '          Text.Whitespace
 'https://salsa.domain.tld/python-team/packages/foo.git' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Vcs-Browser' Keyword
 ': '          Text.Whitespace
 'https://salsa.domain.tld/python-team/packages/foo' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Homepage'    Keyword
 ': '          Text.Whitespace
 'https://domain.tld/owner/foo' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Package'     Keyword
 ': '          Text.Whitespace
 'foo'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Architecture' Keyword
 ': '          Text.Whitespace
 'all'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Pre-Depends' Keyword
 ':\n '        Text
@@ -135,7 +135,7 @@
 'Provides'    Keyword
 ': '          Text.Whitespace
 'x-terminal-emulator' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Recommends'  Keyword
 ':\n '        Text
diff --git a/tests/examplefiles/cpp/functions.cpp b/tests/examplefiles/cpp/functions.cpp
index ef359fe041..25b232b93d 100644
--- a/tests/examplefiles/cpp/functions.cpp
+++ b/tests/examplefiles/cpp/functions.cpp
@@ -87,4 +87,20 @@ class raz {
 // Make sure these are not functions:
 else if(flag && func_call()) {}
 new T();
-const operator int() const {} // so int is lexed as type and not function.name
\ No newline at end of file
+const operator int() const {} // so int is lexed as type and not function.name
+
+class foo bar : public raz
+{
+  Q_OBJECT
+  /// \cond INCLUDE_QPROPERTIES
+  Q_PROPERTY(arg1 arg2)
+  /// \endcond
+
+public:
+  /*!
+    Lorem ipsum core vanditi.
+  */
+  enum duck { dog, // Comment.
+              cat  // Comment (see \ref replot).
+  };
+};
diff --git a/tests/examplefiles/cpp/functions.cpp.output b/tests/examplefiles/cpp/functions.cpp.output
index 619b3fdd31..13ccaf8933 100644
--- a/tests/examplefiles/cpp/functions.cpp.output
+++ b/tests/examplefiles/cpp/functions.cpp.output
@@ -1427,3 +1427,76 @@
 '}'           Punctuation
 ' '           Text.Whitespace
 '// so int is lexed as type and not function.name\n' Comment.Single
+
+'\n'          Text.Whitespace
+
+'class'       Keyword
+' '           Text.Whitespace
+'foo'         Name.Class
+' '           Text.Whitespace
+'bar'         Name
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'public'      Keyword
+' '           Text.Whitespace
+'raz'         Name
+'\n'          Text.Whitespace
+
+'{'           Punctuation
+'\n'          Text.Whitespace
+
+'  '          Text.Whitespace
+'Q_OBJECT'    Name
+'\n'          Text.Whitespace
+
+'  '          Text.Whitespace
+'/// \\cond INCLUDE_QPROPERTIES\n' Comment.Single
+
+'  '          Text.Whitespace
+'Q_PROPERTY'  Name
+'('           Punctuation
+'arg1'        Name
+' '           Text.Whitespace
+'arg2'        Name
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'  '          Text.Whitespace
+'/// \\endcond\n' Comment.Single
+
+'\n'          Text.Whitespace
+
+'public'      Keyword
+':'           Operator
+'\n'          Text.Whitespace
+
+'  '          Text.Whitespace
+'/*!\n    Lorem ipsum core vanditi.\n  */' Comment.Multiline
+'\n'          Text.Whitespace
+
+'  '          Text.Whitespace
+'enum'        Keyword
+' '           Text.Whitespace
+'duck'        Name.Class
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'dog'         Name
+','           Punctuation
+' '           Text.Whitespace
+'// Comment.\n' Comment.Single
+
+'              ' Text.Whitespace
+'cat'         Name
+'  '          Text.Whitespace
+'// Comment (see \\ref replot).\n' Comment.Single
+
+'  '          Text.Whitespace
+'}'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/csharp/test.cs.output b/tests/examplefiles/csharp/test.cs.output
index f17fc29d5b..cb1c5e4eb9 100644
--- a/tests/examplefiles/csharp/test.cs.output
+++ b/tests/examplefiles/csharp/test.cs.output
@@ -212,7 +212,7 @@
 '                                ' Text.Whitespace
 'Container'   Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'container'   Name
 ';'           Punctuation
@@ -221,7 +221,7 @@
 '                                ' Text.Whitespace
 'Depends'     Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'container'   Name
 '.'           Punctuation
@@ -237,7 +237,7 @@
 '                                ' Text.Whitespace
 'SystemType'  Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'container'   Name
 '.'           Punctuation
@@ -248,7 +248,7 @@
 '                                ' Text.Whitespace
 'RefId'       Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'container'   Name
 '.'           Punctuation
@@ -339,8 +339,7 @@
 '.'           Punctuation
 'Length'      Name
 ' '           Text.Whitespace
-'='           Punctuation
-'='           Punctuation
+'=='          Operator
 ' '           Text.Whitespace
 '0'           Literal.Number
 ')'           Punctuation
@@ -374,7 +373,7 @@
 'if'          Keyword
 ' '           Text.Whitespace
 '('           Punctuation
-'!'           Punctuation
+'!'           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'provider'    Name
@@ -502,9 +501,9 @@
 '                ' Text.Whitespace
 'List'        Name
 ' '           Text.Whitespace
-'<'           Punctuation
+'<'           Operator
 'ObjectInfo'  Name
-'>'           Punctuation
+'>'           Operator
 ' '           Text.Whitespace
 'objectsList' Name
 ';'           Punctuation
@@ -532,12 +531,12 @@
 '                ' Text.Whitespace
 'Dictionary'  Name
 ' '           Text.Whitespace
-'<'           Punctuation
+'<'           Operator
 'int'         Keyword.Type
 ','           Punctuation
 ' '           Text.Whitespace
 'object'      Keyword.Type
-'>'           Punctuation
+'>'           Operator
 ' '           Text.Whitespace
 'idToObject'  Name
 ';'           Punctuation
@@ -547,12 +546,12 @@
 '                ' Text.Whitespace
 'Dictionary'  Name
 ' '           Text.Whitespace
-'<'           Punctuation
+'<'           Operator
 'object'      Keyword.Type
 ','           Punctuation
 ' '           Text.Whitespace
 'int'         Keyword.Type
-'>'           Punctuation
+'>'           Operator
 ' '           Text.Whitespace
 'objectToId'  Name
 ';'           Punctuation
@@ -566,7 +565,7 @@
 ' '           Text.Whitespace
 'projectName' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'String'      Name
 '.'           Punctuation
@@ -579,7 +578,7 @@
 ' '           Text.Whitespace
 'projectDirectory' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'String'      Name
 '.'           Punctuation
@@ -988,7 +987,7 @@
 '.'           Punctuation
 'fileName'    Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'fileName'    Name
 ';'           Punctuation
@@ -999,7 +998,7 @@
 ' '           Text.Whitespace
 'verbatimString' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '@"c:\\test\\"' Literal.String
 ';'           Punctuation
@@ -1012,7 +1011,7 @@
 ' '           Text.Whitespace
 'verbatimStringWithNewline' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '@"test \\\\ \\n \\t \\r\na\nb\nc"' Literal.String
 ';'           Punctuation
@@ -1023,7 +1022,7 @@
 ' '           Text.Whitespace
 'verbatimStringWithEscapedQuotes' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '@"He said\n""she says \\"" is not an escaped character in verbatimstrings""\n"' Literal.String
 ';'           Punctuation
@@ -1038,7 +1037,7 @@
 ' '           Text.Whitespace
 'numbers'     Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '{'           Punctuation
 ' '           Text.Whitespace
@@ -1071,7 +1070,7 @@
 ' '           Text.Whitespace
 'linqExample' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'from'        Keyword
 ' '           Text.Whitespace
@@ -1087,7 +1086,7 @@
 ' '           Text.Whitespace
 'n'           Name
 ' '           Text.Whitespace
-'>'           Punctuation
+'>'           Operator
 ' '           Text.Whitespace
 '5'           Literal.Number
 '\n'          Text.Whitespace
@@ -1106,7 +1105,7 @@
 ' '           Text.Whitespace
 'anotherlinqExample' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'from'        Keyword
 ' '           Text.Whitespace
@@ -1141,7 +1140,7 @@
 ' '           Text.Whitespace
 'someMoreNumbers' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '{'           Punctuation
 ' '           Text.Whitespace
@@ -1149,11 +1148,9 @@
 ','           Punctuation
 '2'           Literal.Number
 ','           Punctuation
-'1'           Literal.Number
-'7'           Literal.Number
+'17'          Literal.Number
 ','           Punctuation
-'3'           Literal.Number
-'4'           Literal.Number
+'34'          Literal.Number
 ','           Punctuation
 '8'           Literal.Number
 ','           Punctuation
@@ -1182,7 +1179,7 @@
 ' '           Text.Whitespace
 'moreLinq'    Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'from'        Keyword
 ' '           Text.Whitespace
@@ -1210,7 +1207,7 @@
 ' '           Text.Whitespace
 'mn'          Name
 ' '           Text.Whitespace
-'+'           Punctuation
+'+'           Operator
 ' '           Text.Whitespace
 '2'           Literal.Number
 '\n'          Text.Whitespace
@@ -1256,18 +1253,18 @@
 '                        ' Text.Whitespace
 'objectToId'  Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'new'         Keyword
 ' '           Text.Whitespace
 'Dictionary'  Name
 ' '           Text.Whitespace
-'<'           Punctuation
+'<'           Operator
 'object'      Keyword.Type
 ','           Punctuation
 ' '           Text.Whitespace
 'int'         Keyword.Type
-'>'           Punctuation
+'>'           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
@@ -1277,18 +1274,18 @@
 '                        ' Text.Whitespace
 'idToObject'  Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'new'         Keyword
 ' '           Text.Whitespace
 'Dictionary'  Name
 ' '           Text.Whitespace
-'<'           Punctuation
+'<'           Operator
 'int'         Keyword.Type
 ','           Punctuation
 ' '           Text.Whitespace
 'object'      Keyword.Type
-'>'           Punctuation
+'>'           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
@@ -1301,7 +1298,7 @@
 '                        ' Text.Whitespace
 'xmlDocument' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'null'        Keyword
 ';'           Punctuation
@@ -1316,7 +1313,7 @@
 '                        ' Text.Whitespace
 'currentStep' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'OpenerTaskStep' Name
 '.'           Punctuation
@@ -1485,7 +1482,7 @@
 ' '           Text.Whitespace
 'cont'        Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'true'        Keyword
 ';'           Punctuation
@@ -1522,15 +1519,15 @@
 '                                        ' Text.Whitespace
 'objectsList' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'new'         Keyword
 ' '           Text.Whitespace
 'List'        Name
 ' '           Text.Whitespace
-'<'           Punctuation
+'<'           Operator
 'ObjectInfo'  Name
-'>'           Punctuation
+'>'           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
@@ -1540,7 +1537,7 @@
 '                                        ' Text.Whitespace
 'xmlDocument' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'new'         Keyword
 ' '           Text.Whitespace
@@ -1565,7 +1562,7 @@
 '                                        ' Text.Whitespace
 'currentStep' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'OpenerTaskStep' Name
 '.'           Punctuation
@@ -1596,7 +1593,7 @@
 '                                        ' Text.Whitespace
 'currentStep' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'OpenerTaskStep' Name
 '.'           Punctuation
@@ -1646,8 +1643,7 @@
 '.'           Punctuation
 'Name'        Name
 ' '           Text.Whitespace
-'='           Punctuation
-'='           Punctuation
+'=='          Operator
 ' '           Text.Whitespace
 '"projectinfo"' Literal.String
 ')'           Punctuation
@@ -1671,7 +1667,7 @@
 '                                        ' Text.Whitespace
 'currentStep' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'OpenerTaskStep' Name
 '.'           Punctuation
@@ -1722,8 +1718,7 @@
 '.'           Punctuation
 'Name'        Name
 ' '           Text.Whitespace
-'='           Punctuation
-'='           Punctuation
+'=='          Operator
 ' '           Text.Whitespace
 '"objectlist"' Literal.String
 ')'           Punctuation
@@ -1733,7 +1728,7 @@
 '                                                        ' Text.Whitespace
 'objectListContainer' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'ObjectListContainer' Name
@@ -1764,8 +1759,7 @@
 '('           Punctuation
 'objectListContainer' Name
 ' '           Text.Whitespace
-'='           Punctuation
-'='           Punctuation
+'=='          Operator
 ' '           Text.Whitespace
 'null'        Keyword
 ')'           Punctuation
@@ -1789,7 +1783,7 @@
 '                                        ' Text.Whitespace
 'currentStep' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'OpenerTaskStep' Name
 '.'           Punctuation
@@ -1818,7 +1812,7 @@
 ' '           Text.Whitespace
 'flush'       Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'EnumerateSomeObjects' Name
 ' '           Text.Whitespace
@@ -1838,7 +1832,7 @@
 '                                                ' Text.Whitespace
 'currentStep' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'OpenerTaskStep' Name
 '.'           Punctuation
@@ -1867,7 +1861,7 @@
 ' '           Text.Whitespace
 'done'        Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'UnBoilSomeObjects' Name
 ' '           Text.Whitespace
@@ -1887,7 +1881,7 @@
 '                                                ' Text.Whitespace
 'currentStep' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'OpenerTaskStep' Name
 '.'           Punctuation
@@ -1918,7 +1912,7 @@
 '                                        ' Text.Whitespace
 'projectTrackList' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'TrackList'   Name
@@ -1935,7 +1929,7 @@
 '                                        ' Text.Whitespace
 'projectTagList' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'TagList'     Name
@@ -1952,7 +1946,7 @@
 '                                        ' Text.Whitespace
 'projectStuffList' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'StuffList'   Name
@@ -1969,7 +1963,7 @@
 '                                        ' Text.Whitespace
 'projectClipList' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'ClipList'    Name
@@ -1986,7 +1980,7 @@
 '                                        ' Text.Whitespace
 'projectMediaItemList' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'MediaItemList' Name
@@ -2003,7 +1997,7 @@
 '                                        ' Text.Whitespace
 'projectPipeline' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'Gdv'         Name
@@ -2022,7 +2016,7 @@
 '                                        ' Text.Whitespace
 'projectCommander' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'Commander'   Name
@@ -2039,7 +2033,7 @@
 '                                        ' Text.Whitespace
 'projectFormat' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'Gdv'         Name
@@ -2061,7 +2055,7 @@
 '                                        ' Text.Whitespace
 'currentStep' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'OpenerTaskStep' Name
 '.'           Punctuation
@@ -2089,7 +2083,7 @@
 '                                        ' Text.Whitespace
 'cont'        Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'false'       Keyword
 ';'           Punctuation
@@ -2226,7 +2220,7 @@
 '                                                ' Text.Whitespace
 'projectName' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'childNode'   Name
 '.'           Punctuation
@@ -2254,7 +2248,7 @@
 '                                                ' Text.Whitespace
 'projectDirectory' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'childNode'   Name
 '.'           Punctuation
@@ -2308,8 +2302,7 @@
 '('           Punctuation
 'objectsEnumerator' Name
 ' '           Text.Whitespace
-'='           Punctuation
-'='           Punctuation
+'=='          Operator
 ' '           Text.Whitespace
 'null'        Keyword
 ')'           Punctuation
@@ -2318,7 +2311,7 @@
 '                                ' Text.Whitespace
 'objectsEnumerator' Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'objectListContainer' Name
 '.'           Punctuation
@@ -2345,22 +2338,20 @@
 ' '           Text.Whitespace
 'i'           Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '0'           Literal.Number
 ';'           Punctuation
 ' '           Text.Whitespace
 'i'           Name
 ' '           Text.Whitespace
-'<'           Punctuation
+'<'           Operator
 ' '           Text.Whitespace
-'1'           Literal.Number
-'0'           Literal.Number
+'10'          Literal.Number
 ';'           Punctuation
 ' '           Text.Whitespace
 'i'           Name
-'+'           Punctuation
-'+'           Punctuation
+'++'          Operator
 ')'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -2377,8 +2368,7 @@
 '('           Punctuation
 ')'           Punctuation
 ' '           Text.Whitespace
-'='           Punctuation
-'='           Punctuation
+'=='          Operator
 ' '           Text.Whitespace
 'false'       Keyword
 ')'           Punctuation
@@ -2398,7 +2388,7 @@
 ' '           Text.Whitespace
 'container'   Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '('           Punctuation
 'ObjectContainer' Name
@@ -2420,7 +2410,7 @@
 ' '           Text.Whitespace
 'newInfo'     Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'new'         Keyword
 ' '           Text.Whitespace
@@ -2555,21 +2545,20 @@
 ' '           Text.Whitespace
 'i'           Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 '0'           Literal.Number
 ';'           Punctuation
 ' '           Text.Whitespace
 'i'           Name
 ' '           Text.Whitespace
-'<'           Punctuation
+'<'           Operator
 ' '           Text.Whitespace
 '5'           Literal.Number
 ';'           Punctuation
 ' '           Text.Whitespace
 'i'           Name
-'+'           Punctuation
-'+'           Punctuation
+'++'          Operator
 ')'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -2586,8 +2575,7 @@
 '.'           Punctuation
 'Count'       Name
 ' '           Text.Whitespace
-'='           Punctuation
-'='           Punctuation
+'=='          Operator
 ' '           Text.Whitespace
 '0'           Literal.Number
 ')'           Punctuation
@@ -2608,7 +2596,7 @@
 ' '           Text.Whitespace
 'objInfo'     Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'GetNextCandidate' Name
 ' '           Text.Whitespace
@@ -2624,7 +2612,7 @@
 ' '           Text.Whitespace
 'o'           Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'BoilFactory' Name
 '.'           Punctuation
@@ -2666,7 +2654,7 @@
 'RefId'       Name
 ']'           Punctuation
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'o'           Name
 ';'           Punctuation
@@ -2679,7 +2667,7 @@
 'o'           Name
 ']'           Punctuation
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'objInfo'     Name
 '.'           Punctuation
@@ -2730,7 +2718,7 @@
 ' '           Text.Whitespace
 'container'   Name
 ' '           Text.Whitespace
-'='           Punctuation
+'='           Operator
 ' '           Text.Whitespace
 'objectListContainer' Name
 '.'           Punctuation
diff --git a/tests/examplefiles/csound/test.orc.output b/tests/examplefiles/csound/test.orc.output
index 9fe8a1e373..646d206501 100644
--- a/tests/examplefiles/csound/test.orc.output
+++ b/tests/examplefiles/csound/test.orc.output
@@ -374,10 +374,10 @@
 'pyrun'       Name.Builtin
 ' '           Text.Whitespace
 '{{'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Python'    Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}}'          Literal.String
 '\n'          Text.Whitespace
diff --git a/tests/examplefiles/css+mozpreproc/demo.css.in.output b/tests/examplefiles/css+mozpreproc/demo.css.in.output
index 13aac1dbb2..0a4b5c1280 100644
--- a/tests/examplefiles/css+mozpreproc/demo.css.in.output
+++ b/tests/examplefiles/css+mozpreproc/demo.css.in.output
@@ -11,7 +11,7 @@
 'cls'         Name.Class
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'color'       Keyword
@@ -19,10 +19,10 @@
 ' '           Text.Whitespace
 '#fff'        Literal.Number.Hex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%'           Comment.Preproc
 'endif'       Comment.Preproc
@@ -31,4 +31,4 @@
 '%'           Comment.Preproc
 'literal'     Comment.Preproc
 ' %foo'       Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/delphi/example.pas.output b/tests/examplefiles/delphi/example.pas.output
index 71956db5d2..2d9118bc82 100644
--- a/tests/examplefiles/delphi/example.pas.output
+++ b/tests/examplefiles/delphi/example.pas.output
@@ -1,137 +1,137 @@
 '// vim:ft=pascal' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'unit'        Keyword
-' '           Text
+' '           Text.Whitespace
 'YTools'      Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{===============================================================================\n\n   cYcnus.YTools 1.0.3 Beta for Delphi 4+\n   by licenser and Murphy\n\n   ©2000-2003 by cYcnus\n   visit www.cYcnus.de\n\n   licenser@cYcnus.de (Heinz N. Gies)\n   murphy@cYcnus.de (Kornelius Kalnbach)\n   \n   this unit is published under the terms of the GPL\n\n===============================================================================}' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'interface'   Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'uses'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Windows'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SysUtils'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Classes'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'YTypes'      Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'BackSpace'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '#8'          Literal.String.Char
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Tab'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '#9'          Literal.String.Char
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'LF'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '#10'         Literal.String.Char
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 '//Line Feed' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'CR'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '#13'         Literal.String.Char
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 '//Carriage Return' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Space'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '#32'         Literal.String.Char
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EOLChars'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'CR'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'LF'          Name
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$IFNDEF VER140}' Comment.Multiline
-'\n  '        Text
+'\n  '        Text.Whitespace
 'sLineBreak'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '#13'         Literal.String.Char
 '#10'         Literal.String.Char
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SwitchChars' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 '/'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '-'           Literal.String
 "'"           Literal.String
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$ENDIF}'    Comment.Multiline
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EOL'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sLineBreak'  Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxCard'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Cardinal'    Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'AllChars'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 '#0'          Literal.String.Char
 '.'           Operator
@@ -139,11 +139,11 @@
 '#255'        Literal.String.Char
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Alphabetical' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 'A'           Literal.String
@@ -154,7 +154,7 @@
 'Z'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'a'           Literal.String
 "'"           Literal.String
@@ -165,11 +165,11 @@
 "'"           Literal.String
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'DecimalChars' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 '0'           Literal.String
@@ -181,56 +181,56 @@
 "'"           Literal.String
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'AlphaNumerical' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Alphabetical' Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'DecimalChars' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'StrangeChars' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 '#0'          Literal.String.Char
 '.'           Operator
 '.'           Operator
 '#31'         Literal.String.Char
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '#127'        Literal.String.Char
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '#129'        Literal.String.Char
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '#141'        Literal.String.Char
 '.'           Operator
 '.'           Operator
 '#144'        Literal.String.Char
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '#157'        Literal.String.Char
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '#158'        Literal.String.Char
 ']'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'HexadecimalChars' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'DecimalChars' Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 'A'           Literal.String
@@ -241,7 +241,7 @@
 'F'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'a'           Literal.String
 "'"           Literal.String
@@ -252,11 +252,11 @@
 "'"           Literal.String
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'OctalChars'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 '0'           Literal.String
@@ -268,111 +268,111 @@
 "'"           Literal.String
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'BinaryChars' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '1'           Literal.String
 "'"           Literal.String
 ']'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'QuoteChars'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 "''"          Literal.String.Escape
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '"'           Literal.String
 "'"           Literal.String
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'WildCards'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 '*'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '?'           Literal.String
 "'"           Literal.String
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileNameEnemies' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'WildCards'   Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '/'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ':'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '<'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '>'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '|'           Literal.String
 "'"           Literal.String
 ']'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'HexChar'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
 '['           Punctuation
 'THex'        Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
@@ -438,23 +438,23 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'LowerHexChar' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
 '['           Punctuation
 'THex'        Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
@@ -520,23 +520,23 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'BaseNChar'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
 '['           Punctuation
 'TBaseN'      Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
@@ -609,7 +609,7 @@
 'H'           Literal.String
 "'"           Literal.String
 ','           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'I'           Literal.String
 "'"           Literal.String
@@ -683,4177 +683,4177 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'cYcnusOverlayColor' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$050001'     Literal.Number.Hex
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'faFindEveryFile' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'faReadOnly'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'faHidden'    Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'faSysFile'   Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'faArchive'   Name
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'platWin9x'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'VER_PLATFORM_WIN32s' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'VER_PLATFORM_WIN32_WINDOWS' Name
 ']'           Punctuation
 ';'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '{ Debugging }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'ClearReport' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ReportName'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Report'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ReportName'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'ReportFmt'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ReportName'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Fmt'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Args'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
 ')'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Params }'  Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'GetParams'   Name.Function
 '('           Punctuation
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ')'           Punctuation
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetParams'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ParamNum'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ParamPrefixNum' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Param'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ParamPrefix' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Switch'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Switch'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'PrefixChars' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SwitchChars' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreCase'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetParam'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Default'     Keyword.Pseudo
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Dirs & UserName}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetMyDir'    Name.Function
 '('           Punctuation
 'FullPath'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'WinDir'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SysDir'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UserName'    Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Strings & Chars}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FirstChar'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'LastChar'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharPosR'    Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'PosExText'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'PosExAnsiText' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UntilChar'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UntilChar'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UntilLastChar' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreNoBrake' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FromChar'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FromChar'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FromLastChar' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreNoBrake' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BetweenChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Start'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Finish'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Inclusive'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UntilStr'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FromStr'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StringWrap'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Width'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'LineEnd'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'EOL'         Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Splitting & Combining }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Split'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'IgnoreMultiSep' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MinCount'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Split'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreMultiSep' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Split'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separators'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreMultiSep' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'TileStr'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'BrakeStart'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'BrakeEnd'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'Left'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Right'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Join'        Name.Function
 '('           Punctuation
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Join'        Name.Function
 '('           Punctuation
 'StrA'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'MulStr'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Strings ausrichten }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'AlignR'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Width'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Filler'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'MaxStr'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxLen'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Stringing }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TrimAll'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ControlChar' Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FriendlyChar' Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FriendlyStr' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FriendlyStr' Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Quote'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Quoter'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '"'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UnQuote'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DeQuote'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrNumerus'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Value'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Singular'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Plural'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Zero'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'MakeStr'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Items'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'ShowText'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Items'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Delete }'  Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Find }'    Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharCount'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharIn'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharIn'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrAtPos'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pos'         Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Str'         Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrAtBegin'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Str'         Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIn'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIn'       Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIn'       Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIndex'    Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIndex'    Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextAtPos'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pos'         Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextAtBegin' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIn'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIn'      Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIn'      Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIndex'   Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIndex'   Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Replace }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ReplaceChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Old'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'New'         Keyword
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ReplaceChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Old'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'New'         Keyword
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Replace'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Old'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'New'         Keyword
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ TStrings }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SLOfFile'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStringList' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ContainsEmptyLines' Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteEmptyLines' Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteCommentLines' Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'CommentSign' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '//'          Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'WriteSL'     Name.Function
 '('           Punctuation
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Suffix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FindLine'    Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'QuickSortSL' Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStringList' Name
 ')'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ TStrA }'   Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IncStrA'     Name.Function
 '('           Punctuation
 'StrA'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ TByteA }'  Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrOfByteA'  Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ByteAOfStr'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ByteAOfInt'  Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IntOfByteA'  Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ByteAOfHex'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SameByteA'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Reverse'     Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SaveByteA'   Name.Function
 '('           Punctuation
 'Data'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Overwrite'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'LoadByteA'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Endian'      Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Files }'   Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SizeOfFile'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FileEx'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'AllowFolders' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'LWPSolve'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Dir'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'LWPSlash'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Dir'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractDrive' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractPath' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractPrefix' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractSuffix' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IsValidFileName' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'MakeValidFileName' Name.Function
 '('           Punctuation
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Default'     Keyword.Pseudo
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'File'        Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Converting }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IsValidInteger' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IsValidCardinal' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrOfBool'   Name.Function
 '('           Punctuation
 'flag'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TrueStr'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'True'        Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FalseStr'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'False'       Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrOfInt'    Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CardOfStr'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOrd'      Name.Function
 '('           Punctuation
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THex'        Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ByteOfHex'   Name.Function
 '('           Punctuation
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THexByteStr' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DecOfHex'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOfByte'   Name.Function
 '('           Punctuation
 'b'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THexByteStr' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOfCard'   Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOfCard'   Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Digits'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'PascalHexArray' Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Name'        Keyword.Pseudo
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOfByteA'  Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Blocks'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Splitter'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BinOfByteA'  Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Blocks'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Splitter'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CardOfHex'   Name.Function
 '('           Punctuation
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IntOfBin'    Name.Function
 '('           Punctuation
 'Bin'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BinOfIntFill' Name.Function
 '('           Punctuation
 'n'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'cardinal'    Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BinOfInt'    Name.Function
 '('           Punctuation
 'n'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'cardinal'    Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BaseNOfInt'  Name.Function
 '('           Punctuation
 'I'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TBaseN'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IntOfBaseN'  Name.Function
 '('           Punctuation
 'V'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TBaseN'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Ranges }'  Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'KeepIn'      Name.Function
 '('           Punctuation
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Variant'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Variant'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'InRange'     Name.Function
 '('           Punctuation
 'Value'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Variant'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'InStrictRange' Name.Function
 '('           Punctuation
 'Value'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Variant'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Min'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Min'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TIntA'       Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Max'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Max'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TIntA'       Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'RangesSeparator' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ','           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'RangeInnerSeparator' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '-'           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'RangeInfinite' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '*'           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'RangeSpecialChars' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'RangesSeparator' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'RangeInnerSeparator' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'RangeInfinite' Name
 ']'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'RangesOfStr' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TRanges'     Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'InRanges'    Name.Function
 '('           Punctuation
 'Ranges'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TRanges'     Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'TestValue'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Success'     Name.Function
 '('           Punctuation
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'ResultOnSuccess' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ERROR_SUCCESS' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Failure'     Name.Function
 '('           Punctuation
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'ResultOnSuccess' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ERROR_SUCCESS' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExpandString' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Files }'   Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteFiles' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Mask'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'ScanSubDirs' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Attributes'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'faFindEveryFile' Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'FileNew'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DateTimeOfFileTime' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileTime'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TFileTime'   Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TDateTime'   Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ FileNames }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetFileNew'  Name.Function
 '('           Punctuation
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'NoFloppyDrives' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Finding Files }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FindAll'     Name.Function
 '('           Punctuation
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Mask'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ScanSubDirs' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Attributes'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'faFindEveryFile' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileReturn'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TFileNameFunc' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FindAllFirst' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Mask'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'ScanSubDirs' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Attributes'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'faFindEveryFile' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FullOSInfo'  Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Win32PlatformStr' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Win9x'       Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'WinNT'       Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Win2000'     Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'WinXP'       Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MyDir'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'LastSuccessRes' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
 '{ Backward compatibility }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$IFNDEF VER130}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SameText'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S1'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S2'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$ENDIF}'    Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'implementation' Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$IFNDEF VER140}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'uses'        Keyword
-' '           Text
+' '           Text.Whitespace
 'FileCtrl'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$ENDIF}'    Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{$IFNDEF VER130}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SameText'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S1'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S2'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CompareText' Name.Builtin
 '('           Punctuation
 'S1'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S2'          Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$ENDIF}'    Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Report'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ReportName'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'F'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TextFile'    Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MyDir'       Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'ReportName'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.rep'        Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Assign'      Name
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'try'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'FileExists'  Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Rewrite'     Name.Builtin
 '('           Punctuation
 'F'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Append'      Name.Builtin
 '('           Punctuation
 'F'           Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'WriteLn'     Name.Builtin
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'finally'     Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Close'       Name.Builtin
 '('           Punctuation
 'F'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'ClearReport' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ReportName'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MyDir'       Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'ReportName'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.rep'        Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'DeleteFile'  Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'ReportFmt'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ReportName'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Fmt'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Args'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Report'      Name
 '('           Punctuation
 'ReportName'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Format'      Name.Builtin
 '('           Punctuation
 'Fmt'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Args'        Name
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'GetParams'   Name.Function
 '('           Punctuation
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'P'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Param'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetParamStr' Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'P'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Param'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Quoted'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Param'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'repeat'      Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'P'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '#0'          Literal.String.Char
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'P'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'P'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'Quoted'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'P'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '#0'          Literal.String.Char
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'P'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '"'           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Quoted'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Quoted'      Name
 ';'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'P'           Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Continue'    Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'P'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Quoted'      Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Break'       Keyword
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Param'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Param'       Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'P'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'P'           Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'until'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Param'       Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'P'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '#0'          Literal.String.Char
 ')'           Punctuation
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Param'       Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'Clear'       Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'P'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'GetCommandLine' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetParamStr' Name
 '('           Punctuation
 'P'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Param'       Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'GetParamStr' Name
 '('           Punctuation
 'P'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Param'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'Add'         Name
@@ -4861,246 +4861,246 @@
 'Param'       Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetParams'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStringList' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SL'          Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TStringList' Name
 '.'           Operator
 'Create'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetParams'   Name
 '('           Punctuation
 'SL'          Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Join'        Name
 '('           Punctuation
 'SL'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Free'        Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Switch'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Switch'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'PrefixChars' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SwitchChars' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreCase'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//= SysUtils.FindCmdLineSwitch' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 's'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ParamCount'  Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 's'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ParamStr'    Name.Builtin
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 's'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 's'           Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'PrefixChars' Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 "//i know that always s <> '', but this is saver" Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 's'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 's'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxInt'      Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 's'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Switch'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'IgnoreCase'  Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '0'           Literal.Number.Integer
 '='           Operator
@@ -5108,70 +5108,70 @@
 '('           Punctuation
 's'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Switch'      Name
 ')))'         Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ParamNum'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ParamCount'  Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '='           Operator
 'AnsiCompareText' Name.Builtin
@@ -5181,84 +5181,84 @@
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ParamPrefixNum' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Prefix'      Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ParamCount'  Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '='           Operator
 'AnsiCompareText' Name.Builtin
@@ -5270,223 +5270,223 @@
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Param'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ParamNum'    Name
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ParamPrefix' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ParamPrefixNum' Name
 '('           Punctuation
 'Prefix'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetParam'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Default'     Keyword.Pseudo
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Default'     Keyword.Pseudo
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ParamStr'    Name.Builtin
 '('           Punctuation
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ParamPrefixNum' Name
 '('           Punctuation
 'Prefix'      Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'ParamStr'    Name.Builtin
@@ -5494,50 +5494,50 @@
 'i'           Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Prefix'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxInt'      Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetMyDir'    Name.Function
 '('           Punctuation
 'FullPath'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Buffer'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
 '['           Punctuation
 '0'           Literal.Number.Integer
@@ -5545,413 +5545,413 @@
 '.'           Operator
 '260'         Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SetString'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'GetModuleFileName' Name.Builtin
 '('           Punctuation
 '0'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SizeOf'      Name.Builtin
 '('           Punctuation
 'Buffer'      Name
 ')))'         Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FullPath'    Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'GetFileNew'  Name
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExtractPath' Name
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'WinDir'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetMem'      Name.Builtin
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_PATH'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetWindowsDirectory' Name
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_PATH'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FreeMem'     Name.Builtin
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_PATH'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SysDir'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetMem'      Name.Builtin
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_PATH'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetSystemDirectory' Name
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_PATH'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FreeMem'     Name.Builtin
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_PATH'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UserName'    Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetMem'      Name.Builtin
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_PATH'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_PATH'    Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetUserName' Name
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Res'         Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FreeMem'     Name.Builtin
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_PATH'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FirstChar'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 's'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '#0'          Literal.String.Char
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 's'           Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'LastChar'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 's'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '#0'          Literal.String.Char
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 's'           Name
 '['           Punctuation
 'Length'      Name.Builtin
@@ -5959,814 +5959,814 @@
 's'           Name
 ')]'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'C'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharPosR'    Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Dec'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'LenSubStr'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'SubStr'      Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
 ')'           Punctuation
-'\n       '   Text
+'\n       '   Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 '['           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'PosExText'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SameChar'    Name.Function
 '('           Punctuation
 'a'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'UpCase'      Name.Builtin
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'UpCase'      Name.Builtin
 '('           Punctuation
 'b'           Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'LenSubStr'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'SubStr'      Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SameChar'    Name
 '('           Punctuation
 'S'           Name
@@ -6774,181 +6774,181 @@
 'Result'      Name.Builtin.Pseudo
 ']'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
 ')'           Punctuation
-'\n       '   Text
+'\n       '   Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'SameChar'    Name
 '('           Punctuation
 'S'           Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ']'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 '['           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']))'         Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'PosExAnsiText' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SameChar'    Name.Function
 '('           Punctuation
 'a'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharLower'   Name
 '('           Punctuation
 'PChar'       Keyword.Type
 '('           Punctuation
 'a'           Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharLower'   Name
 '('           Punctuation
 'PChar'       Keyword.Type
@@ -6956,112 +6956,112 @@
 'b'           Name
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'LenSubStr'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'SubStr'      Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxPosToSearch' Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SameChar'    Name
 '('           Punctuation
 'S'           Name
@@ -7069,1767 +7069,1767 @@
 'Result'      Name.Builtin.Pseudo
 ']'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
 ')'           Punctuation
-'\n       '   Text
+'\n       '   Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'SameChar'    Name
 '('           Punctuation
 'S'           Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ']'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 '['           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']))'         Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'LenSubStr'   Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UntilChar'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 'Brake'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UntilChar'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 'Brake'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UntilLastChar' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreNoBrake' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPosR'    Name
 '('           Punctuation
 'Brake'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IgnoreNoBrake' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FromChar'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 'Brake'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FromChar'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 'Brake'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FromLastChar' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreNoBrake' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPosR'    Name
 '('           Punctuation
 'Brake'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IgnoreNoBrake' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BetweenChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Start'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Finish'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Inclusive'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 'Start'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 'Finish'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Inclusive'   Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'p'           Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Dec'         Name.Builtin
 '('           Punctuation
 'fin'         Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UntilStr'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Brake'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'UntilChar'   Name
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 '])'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name
 '('           Punctuation
 'Brake'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FromStr'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Brake'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FromChar'    Name
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Brake'       Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 '])'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name
 '('           Punctuation
 'Brake'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 's'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Brake'       Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StringWrap'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Width'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'LineEnd'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'EOL'         Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Width'       Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Width'       Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Width'       Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'LineEnd'     Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Split'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'IgnoreMultiSep' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MinCount'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SepLen'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Add'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IgnoreMultiSep' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'High'        Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')]'          Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SepLen'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Separator'   Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name
 '('           Punctuation
 'Separator'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'SepLen'      Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name
 '('           Punctuation
 'Separator'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 '))'          Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Split'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreMultiSep' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ';'           Operator
-' \n'         Text
+' \n'         Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SepLen'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Add'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IgnoreMultiSep' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'Add'         Name
@@ -8837,914 +8837,914 @@
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'BeginUpdate' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SepLen'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Separator'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name
 '('           Punctuation
 'Separator'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'SepLen'      Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name
 '('           Punctuation
 'Separator'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'EndUpdate'   Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Split'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separators'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'IgnoreMultiSep' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Add'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IgnoreMultiSep' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'High'        Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')]'          Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 'Separators'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fin'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 'Separators'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 '))'          Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'TileStr'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'BrakeStart'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'BrakeEnd'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'Left'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Right'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Left'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'BrakeStart'  Name
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Right'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'BrakeEnd'    Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxInt'      Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Join'        Name.Function
 '('           Punctuation
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'imax'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'imax'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'Count'       Name
 '-'           Operator
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'imax'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Strings'     Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'imax'        Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Join'        Name.Function
 '('           Punctuation
 'StrA'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'overload'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'StrA'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'StrA'        Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'StrA'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'MulStr'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'P'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'P'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'Pointer'     Keyword.Type
@@ -9753,462 +9753,462 @@
 ')'           Punctuation
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'P'           Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'P'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'AlignR'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Width'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Filler'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MulStr'      Name
 '('           Punctuation
 'Filler'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Width'       Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'MaxStr'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxLen'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxLen'      Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxLen'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '...'         Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TrimAll'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '#32'         Literal.String.Char
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ControlChar' Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'StrangeChars' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FriendlyChar' Name.Function
 '('           Punctuation
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'C'           Name
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '#0'          Literal.String.Char
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '#1'          Literal.String.Char
 '.'           Operator
 '.'           Operator
 '#31'         Literal.String.Char
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '?'           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '#255'        Literal.String.Char
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '#'           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FriendlyStr' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FriendlyChar' Name
 '('           Punctuation
 'S'           Name
@@ -10216,79 +10216,79 @@
 'i'           Name
 '])'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FriendlyStr' Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'a'           Name
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FriendlyChar' Name
 '('           Punctuation
 'Char'        Keyword.Type
@@ -10298,688 +10298,688 @@
 'i'           Name
 ']))'         Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Quote'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Quoter'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '"'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FirstChar'   Name
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Quoter'      Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Quoter'      Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'LastChar'    Name
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Quoter'      Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Quoter'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DeQuote'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'UnQuote'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Start'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Start'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '(['          Punctuation
 '#0'          Literal.String.Char
 '.'           Operator
 '.'           Operator
 '#32'         Literal.String.Char
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'QuoteChars'  Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'LastChar'    Name
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Dec'         Name.Builtin
 '('           Punctuation
 'Len'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Start'       Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Start'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Start'       Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrNumerus'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Value'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Singular'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Plural'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Zero'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Abs'         Name.Builtin
 '('           Punctuation
 'Value'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'IntToStr'    Name.Builtin
 '('           Punctuation
 'Value'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Singular'    Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Value'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Zero'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Plural'      Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'IntToStr'    Name.Builtin
 '('           Punctuation
 'Value'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Plural'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'MakeStr'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Items'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'BoolStrings' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
 '['           Punctuation
 'Boolean'     Keyword.Type
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 "'"           Literal.String
 'False'       Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'True'        Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrOfP'      Name.Function
 '('           Punctuation
 'P'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'P'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '[nil]'       Literal.String
 "'"           Literal.String
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '['           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'IntToStr'    Name.Builtin
 '('           Punctuation
 'Cardinal'    Keyword.Type
 '('           Punctuation
 'P'           Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ']'           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Add'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 's'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Items'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'with'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Items'       Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'VType'       Name
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtString'    Name
 ':'           Operator
-'     '       Text
+'     '       Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'VString'     Name
 '^'           Operator
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtInteger'   Name
 ':'           Operator
-'    '        Text
+'    '        Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'IntToStr'    Name.Builtin
@@ -10987,10 +10987,10 @@
 'VInteger'    Name
 '))'          Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtBoolean'   Name
 ':'           Operator
-'    '        Text
+'    '        Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'BoolStrings' Name
@@ -10998,28 +10998,28 @@
 'VBoolean'    Name
 '])'          Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtChar'      Name
 ':'           Operator
-'       '     Text
+'       '     Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'VChar'       Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtPChar'     Name
 ':'           Operator
-'      '      Text
+'      '      Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'VPChar'      Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtExtended'  Name
 ':'           Operator
-'   '         Text
+'   '         Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'FloatToStr'  Name.Builtin
@@ -11028,20 +11028,20 @@
 '^'           Operator
 '))'          Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtObject'    Name
 ':'           Operator
-'     '       Text
+'     '       Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'VObject'     Name
-' '           Text
+' '           Text.Whitespace
 'is'          Keyword
-' '           Text
+' '           Text.Whitespace
 'TComponent'  Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'TComponent'  Name
@@ -11051,9 +11051,9 @@
 '.'           Operator
 'Name'        Name
 ')'           Punctuation
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 'else'        Keyword
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'VObject'     Name
@@ -11061,10 +11061,10 @@
 'ClassName'   Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtClass'     Name
 ':'           Operator
-'      '      Text
+'      '      Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'VClass'      Name
@@ -11072,10 +11072,10 @@
 'ClassName'   Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtAnsiString' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'string'      Keyword
@@ -11083,10 +11083,10 @@
 'VAnsiString' Name
 '))'          Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtCurrency'  Name
 ':'           Operator
-'   '         Text
+'   '         Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'CurrToStr'   Name.Builtin
@@ -11095,10 +11095,10 @@
 '^'           Operator
 '))'          Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtInt64'     Name
 ':'           Operator
-'      '      Text
+'      '      Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'IntToStr'    Name.Builtin
@@ -11107,10 +11107,10 @@
 '^'           Operator
 '))'          Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtVariant'   Name
 ':'           Operator
-'    '        Text
+'    '        Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'string'      Keyword
@@ -11119,28 +11119,28 @@
 '^'           Operator
 '))'          Punctuation
 ';'           Operator
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'vtWideChar'  Name
 ':'           Operator
-'   '         Text
+'   '         Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'VWideChar'   Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtPWideChar' Name
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'VPWideChar'  Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtInterface' Name
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'StrOfP'      Name
@@ -11148,10 +11148,10 @@
 'VInterface'  Name
 '))'          Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtPointer'   Name
 ':'           Operator
-'    '        Text
+'    '        Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'StrOfP'      Name
@@ -11159,10 +11159,10 @@
 'VPointer'    Name
 '))'          Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'vtWideString' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'WideString'  Keyword.Type
@@ -11170,2108 +11170,2108 @@
 'VWideString' Name
 '))'          Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Separator'   Name
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'ShowText'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Items'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Text'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MakeStr'     Name
 '('           Punctuation
 'Items'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Separator'   Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'MessageBox'  Name
 '('           Punctuation
 '0'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 '('           Punctuation
 'Text'        Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'Info'        Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MB_OK'       Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'MB_APPLMODAL' Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'C'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharCount'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrAtPos'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pos'         Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Str'         Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Str'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Str'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Pos'         Name.Builtin
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Str'         Name.Builtin
 ')))'         Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextAtPos'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pos'         Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Text'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'SameText'    Name.Builtin
 '('           Punctuation
 'Text'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Pos'         Name.Builtin
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Text'        Name
 ')))'         Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrAtBegin'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Str'         Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'StrAtPos'    Name
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Str'         Name.Builtin
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextAtBegin' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TextAtPos'   Name
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharIn'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CharIn'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'C'           Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIn'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SubStr'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name
 '('           Punctuation
 'SubStr'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIn'       Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'i'           Name
 '])'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIn'       Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Low'         Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 'i'           Name
 '])'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIn'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PosExText'   Name
 '('           Punctuation
 'Text'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIn'      Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SameText'    Name.Builtin
 '('           Punctuation
 'Text'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'i'           Name
 '])'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIn'      Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Low'         Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SameText'    Name.Builtin
 '('           Punctuation
 'Text'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 'i'           Name
 '])'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIndex'    Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrIndex'    Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Low'         Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIndex'   Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SameText'    Name.Builtin
 '('           Punctuation
 'Text'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TextIndex'   Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Text'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Low'         Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SameText'    Name.Builtin
 '('           Punctuation
 'Text'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 'Result'      Name.Builtin.Pseudo
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ReplaceChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Old'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'New'         Keyword
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Old'         Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'New'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ReplaceChars' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Old'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCharSet'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'New'         Keyword
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Old'         Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'New'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Replace'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Old'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'New'         Keyword
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'oldp'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'ps'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ps'          Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'oldp'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ps'          Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ps'          Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PosEx'       Name
 '('           Punctuation
 'Old'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'oldp'        Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ps'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'oldp'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'oldp'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'oldp'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'ps'          Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'oldp'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'New'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'ps'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Old'         Name
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SLOfFile'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStringList' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TStringList' Name
 '.'           Operator
 'Create'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FileExists'  Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '.'           Operator
 'LoadFromFile' Name
@@ -13279,206 +13279,206 @@
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ContainsEmptyLines' Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'StrIn'       Name
 '('           Punctuation
 'SL'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteEmptyLines' Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Delete'      Name
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteCommentLines' Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'CommentSign' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '//'          Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'SL'          Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'StrAtBegin'  Name
 '('           Punctuation
@@ -13489,81 +13489,81 @@
 'i'           Name
 '])'          Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'CommentSign' Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Delete'      Name
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FindLine'    Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'TextAtBegin' Name
 '('           Punctuation
 'SL'          Name
@@ -13571,284 +13571,284 @@
 'Result'      Name.Builtin.Pseudo
 ']'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'QuickSortSL' Name.Function
 '('           Punctuation
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStringList' Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Sort'        Name.Function
 '('           Punctuation
 'l'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'r'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'i'           Name
 ','           Operator
 'j'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'z'           Name
 ','           Operator
 'x'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'l'           Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'j'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'r'           Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '[('          Punctuation
 'j'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'div'         Keyword
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'repeat'      Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'j'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Dec'         Name.Builtin
 '('           Punctuation
 'j'           Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'j'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'z'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'j'           Name
 ']'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'j'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'z'           Name
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Dec'         Name.Builtin
 '('           Punctuation
 'j'           Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'until'       Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'j'           Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'j'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'l'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Sort'        Name
 '('           Punctuation
 'l'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'j'           Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'r'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Sort'        Name
 '('           Punctuation
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'r'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Sort'        Name
 '('           Punctuation
 '0'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
@@ -13856,225 +13856,225 @@
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IncStrA'     Name.Function
 '('           Punctuation
 'StrA'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrA'       Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'StrA'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'StrA'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'StrA'        Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrOfByteA'  Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 '('           Punctuation
 'Copy'        Name.Builtin
 '('           Punctuation
 'a'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'a'           Name
 ')))'         Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ByteAOfStr'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 '('           Punctuation
 'Copy'        Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 's'           Name
 ')))'         Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ByteAOfInt'  Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SizeOf'      Name.Builtin
 '('           Punctuation
 'Integer'     Keyword.Type
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SizeOf'      Name.Builtin
 '('           Punctuation
 'Integer'     Keyword.Type
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IntOfByteA'  Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'Pointer'     Keyword.Type
@@ -14083,10 +14083,10 @@
 ')'           Punctuation
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Min'         Name.Builtin
 '('           Punctuation
 'Length'      Name.Builtin
@@ -14094,313 +14094,313 @@
 'A'           Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SizeOf'      Name.Builtin
 '('           Punctuation
 'Integer'     Keyword.Type
 ')))'         Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ByteAOfHex'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'h'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExtractChars' Name
 '('           Punctuation
 'Hex'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'HexadecimalChars' Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'h'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'div'         Keyword
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ByteOfHex'   Name
 '('           Punctuation
 'Copy'        Name.Builtin
 '('           Punctuation
 'h'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'shl'         Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SizeOfFile'  Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'F'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'file'        Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'AssignFile'  Name.Builtin
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '{$I-}'       Comment.Multiline
 'Reset'       Name.Builtin
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
 '{$I+}'       Comment.Multiline
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IOResult'    Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FileSize'    Name.Builtin
 '('           Punctuation
 'F'           Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CloseFile'   Name.Builtin
 '('           Punctuation
 'F'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FileEx'      Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'AllowFolders' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FindData'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TWin32FindData' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'AllowFolders' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'DirectoryExists' Name.Builtin
 '('           Punctuation
 'FileName'    Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '('           Punctuation
 'FindFirstFile' Name
 '('           Punctuation
@@ -14409,105 +14409,105 @@
 'FileName'    Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FindData'    Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'INVALID_HANDLE_VALUE' Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'CharIn'      Name
 '('           Punctuation
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'WildCards'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'AllowFolders' Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'or'          Keyword
-' '           Text
+' '           Text.Whitespace
 '(('          Punctuation
 'FindData'    Name
 '.'           Operator
 'dwFileAttributes' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'FILE_ATTRIBUTE_DIRECTORY' Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'LWPSolve'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Dir'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Dir'         Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Dir'         Name
 '['           Punctuation
@@ -14515,92 +14515,92 @@
 '('           Punctuation
 'Dir'         Name
 ')]'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'Dir'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Dir'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Dir'         Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'LWPSlash'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Dir'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Dir'         Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Dir'         Name
 '['           Punctuation
@@ -14608,253 +14608,253 @@
 '('           Punctuation
 'Dir'         Name
 ')]'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'Dir'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Dir'         Name
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Dir'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractDrive' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Length'      Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'FileName'    Name
 '['           Punctuation
 '2'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ':'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'UpperCase'   Name.Builtin
 '('           Punctuation
 'FileName'    Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ':\\'         Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractPath' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPosR'    Name
 '('           Punctuation
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'P'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractPrefix' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'UntilLastChar' Name
 '('           Punctuation
 'ExtractFileName' Name.Builtin
@@ -14862,42 +14862,42 @@
 'FileName'    Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExtractSuffix' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FromLastChar' Name
 '('           Punctuation
 'ExtractFileName' Name.Builtin
@@ -14905,193 +14905,193 @@
 'FileName'    Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SameByteA'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'A'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Keyword
-' '           Text
+' '           Text.Whitespace
 '(('          Punctuation
 'Length'      Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'B'           Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'CompareMem'  Name.Builtin
 '('           Punctuation
 'A'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'A'           Name
 ')))'         Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Reverse'     Name.Function
 '('           Punctuation
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'A'           Name
 '))'          Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'High'        Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Endian'      Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'type'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EndianArray' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'packed'      Keyword
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
 '['           Punctuation
 '0'           Literal.Number.Integer
@@ -15099,450 +15099,450 @@
 '.'           Operator
 '3'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'a'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'EndianArray' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'EndianArray' Name
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'b'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Punctuation
 '3'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'b'           Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Punctuation
 '2'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'b'           Name
 '['           Punctuation
 '2'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'b'           Name
 '['           Punctuation
 '3'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 '('           Punctuation
 'b'           Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'SaveByteA'   Name.Function
 '('           Punctuation
 'Data'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Overwrite'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'F'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'file'        Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FileExists'  Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Overwrite'   Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'AssignFile'  Name.Builtin
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '{$I-}'       Comment.Multiline
 'Rewrite'     Name.Builtin
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
 '{$I+}'       Comment.Multiline
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IOResult'    Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Data'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'BlockWrite'  Name.Builtin
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Data'        Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Data'        Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CloseFile'   Name.Builtin
 '('           Punctuation
 'F'           Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'LoadByteA'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'F'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'file'        Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'AssignFile'  Name.Builtin
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '{$I-}'       Comment.Multiline
 'Reset'       Name.Builtin
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
 '{$I+}'       Comment.Multiline
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IOResult'    Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileSize'    Name.Builtin
 '('           Punctuation
 'F'           Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'BlockRead'   Name.Builtin
 '('           Punctuation
 'F'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileSize'    Name.Builtin
 '('           Punctuation
 'F'           Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CloseFile'   Name.Builtin
 '('           Punctuation
 'F'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IsValidFileName' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'CharIn'      Name
 '('           Punctuation
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileNameEnemies' Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'CharIn'      Name
 '('           Punctuation
 'Trim'        Name.Builtin
@@ -15550,109 +15550,109 @@
 'FileName'    Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'AllChars'    Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 '])'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'MakeValidFileName' Name.Function
 '('           Punctuation
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Default'     Keyword.Pseudo
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'File'        Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Default'     Keyword.Pseudo
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'CharIn'      Name
 '('           Punctuation
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileNameEnemies' Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ReplaceChars' Name
 '('           Punctuation
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileNameEnemies' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '_'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'CharIn'      Name
 '('           Punctuation
 'Trim'        Name.Builtin
@@ -15660,436 +15660,436 @@
 'FileName'    Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'AllChars'    Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Default'     Keyword.Pseudo
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IsValidInteger' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 "{const\n  LowInt = '2147483648';\n  HighInt = '2147483647';\nvar\n  len, RealLen, i, o: Integer;\n  c: Char;\nbegin\n  Result := False;\n  if S = '' then\n    Exit;\n\n  len := Length(S);\n  o := 1;\n  \n  if S[1] = '-' then begin\n    if len = 1 then\n      Exit;\n    Inc(o);\n    while (o <= len) and (S[o] = '0') do\n      Inc(o);\n    if o > len then\n      Exit;\n    if o < len then begin\n      RealLen := len - o + 1;\n      if RealLen > Length(LowInt) then\n        Exit\n      else if RealLen = Length(LowInt) then begin\n        for i := 1 to Length(LowInt) do begin\n          c := S[i + o - 1];\n          if (c < '0') or (c > LowInt[i]) then\n            Exit;\n          if c in ['0'..Char((Byte(LowInt[i])-1))] then\n            Break;\n        end;\n        Inc(o, i);\n      end;\n    end;\n  end else begin\n    while (o <= len) and (S[o] = '0') do\n      Inc(o);\n    if o <= len then begin\n      RealLen := len - o + 1;\n      if RealLen > Length(HighInt) then\n        Exit\n      else if RealLen = Length(HighInt) then begin\n        for i := 1 to Length(HighInt) do begin\n          c := S[i + o - 1];\n          if (c < '0') or (c > HighInt[i]) then\n            Exit;\n          if c in ['0'..Char((Byte(HighInt[i])-1))] then\n            Break;\n        end;\n        Inc(o, i);\n      end;\n    end;\n  end;\n\n  for i := o to len do\n    if not (S[i] in ['0'..'9']) then\n      Exit;\n\n  Result := True;  }" Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Int64'       Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'StrToInt64Def' Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Int64'       Keyword.Type
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Low'         Name.Builtin
 '('           Punctuation
 'Integer'     Keyword.Type
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Integer'     Keyword.Type
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IsValidCardinal' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 "{const\n  HighCard = '4294967295';\nvar\n  len, RealLen, i, o: Integer;\nbegin\n  Result := False;\n  if S = '' then\n    Exit;\n\n  len := Length(S);\n  o := 1;\n  \n  while (o <= len) and (S[o] = '0') do\n    Inc(o);\n  if o <= len then begin\n    RealLen := len - o + 1;\n    if RealLen > Length(HighCard) then\n      Exit\n    else if RealLen = Length(HighCard) then begin\n      for i := 1 to Length(HighCard) do begin\n        if S[i + o - 1] > HighCard[i] then\n          Exit;\n        if S[i + o - 1] in ['0'..Char((Byte(HighCard[i])-1))] then\n          Break;\n      end;\n      Inc(o, i);\n    end;\n  end;\n\n  for i := o to len do\n    if not (S[i] in ['0'..'9']) then\n      Exit;\n\n  Result := True;  }" Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Int64'       Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'StrToInt64Def' Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Cardinal'    Keyword.Type
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrOfBool'   Name.Function
 '('           Punctuation
 'flag'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TrueStr'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'True'        Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FalseStr'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'False'       Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Flag'        Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TrueStr'     Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FalseStr'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'StrOfInt'    Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 "{  if i = 0 then begin\n    Result := '0';\n  Exit end;\n\n  while i > 0 do begin\n    Result := Char(Byte('0') + (i mod 10)) + Result;\n    i := i div 10;\n  end;}" Comment.Multiline
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'IntToStr'    Name.Builtin
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CardOfStr'   Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Int64'       Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'StrToInt64Def' Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Cardinal'    Keyword.Type
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Cardinal'    Keyword.Type
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 '('           Punctuation
 'Res'         Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOrd'      Name.Function
 '('           Punctuation
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THex'        Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Hex'         Name
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
@@ -16099,22 +16099,22 @@
 '9'           Literal.String
 "'"           Literal.String
 ':'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 '('           Punctuation
 'Hex'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '48'          Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'A'           Literal.String
 "'"           Literal.String
@@ -16124,22 +16124,22 @@
 'F'           Literal.String
 "'"           Literal.String
 ':'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 '('           Punctuation
 'Hex'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '55'          Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'a'           Literal.String
 "'"           Literal.String
@@ -16149,62 +16149,62 @@
 'f'           Literal.String
 "'"           Literal.String
 ':'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 '('           Punctuation
 'Hex'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '87'          Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ByteOfHex'   Name.Function
 '('           Punctuation
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THexByteStr' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'HexOrd'      Name
 '('           Punctuation
@@ -16212,14 +16212,14 @@
 '['           Punctuation
 '1'           Literal.Number.Integer
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'shl'         Keyword
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'HexOrd'      Name
 '('           Punctuation
 'Hex'         Name
@@ -16227,36 +16227,36 @@
 '2'           Literal.Number.Integer
 '])'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DecOfHex'    Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'IntToStr'    Name.Builtin
 '('           Punctuation
 'CardOfHex'   Name
@@ -16264,455 +16264,455 @@
 'Hex'         Name
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOfByte'   Name.Function
 '('           Punctuation
 'b'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THexByteStr' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'HexChar'     Name
 '[('          Punctuation
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$F0'         Literal.Number.Hex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shr'         Keyword
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ']'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'HexChar'     Name
 '['           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$0F'         Literal.Number.Hex
-'       '     Text
+'       '     Text.Whitespace
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "{function HexOfCard2(c: Cardinal): string;\nvar\n  Data: array[0..(1 shl 4) - 1] of Char;\n  i: Integer;\nbegin\n  for i := 0 to (1 shl 4) - 1 do\n    if i < 10 then\n      Data[i] := Char(Ord('0') + i)\n    else\n      Data[i] := Char(Ord('A') + i - 10);\n\n  Result := Data[(c and (((1 shl (1 shl 2)) - 1) shl (7 shl 2))) shr (7 shl 2)]\n          + Data[(c and (((1 shl (1 shl 2)) - 1) shl (6 shl 2))) shr (6 shl 2)]\n          + Data[(c and (((1 shl (1 shl 2)) - 1) shl (5 shl 2))) shr (5 shl 2)]\n          + Data[(c and (((1 shl (1 shl 2)) - 1) shl (4 shl 2))) shr (4 shl 2)]\n          + Data[(c and (((1 shl (1 shl 2)) - 1) shl (3 shl 2))) shr (3 shl 2)]\n          + Data[(c and (((1 shl (1 shl 2)) - 1) shl (2 shl 2))) shr (2 shl 2)]\n          + Data[(c and (((1 shl (1 shl 2)) - 1) shl (1 shl 2))) shr (1 shl 2)]\n          + Data[(c and (((1 shl (1 shl 2)) - 1) shl (0 shl 2))) shr (0 shl 2)];\nend; }" Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOfCard'   Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$F'          Literal.Number.Hex
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'HexChar'     Name
 '['           Punctuation
 'a'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'shr'         Keyword
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOfCard'   Name.Function
 '('           Punctuation
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Digits'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$F'          Literal.Number.Hex
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'HexChar'     Name
 '['           Punctuation
 'a'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'shr'         Keyword
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MulStr'      Name
 '('           Punctuation
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Digits'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'PascalHexArray' Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Name'        Keyword.Pseudo
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'len'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'const'       Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'EOL'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 '  '          Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ': array[0..' Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'IntToStr'    Name.Builtin
 '('           Punctuation
 'High'        Name.Builtin
 '('           Punctuation
 'a'           Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '] of Byte = (' Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'len'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'len'         Name
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'mod'         Keyword
-' '           Text
+' '           Text.Whitespace
 '19'          Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'EOL'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '  '          Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '  '          Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '$'           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'HexOfByte'   Name
 '('           Punctuation
 'a'           Name
@@ -16720,157 +16720,157 @@
 'i'           Name
 '])'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'len'         Name
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ','           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'EOL'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '  );'        Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'HexOfByteA'  Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Blocks'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Splitter'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Blocks'      Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'HexOfByte'   Name
 '('           Punctuation
 'a'           Name
@@ -16878,82 +16878,82 @@
 'i'           Name
 '])'          Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '(('          Punctuation
 'i'           Name
 '+'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'mod'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Blocks'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Splitter'    Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'HexOfByte'   Name
 '('           Punctuation
 'a'           Name
@@ -16961,167 +16961,167 @@
 'i'           Name
 '])'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BinOfByteA'  Name.Function
 '('           Punctuation
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TByteA'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Blocks'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Splitter'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 ' '           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'max'         Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Bit'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Blocks'      Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'max'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'High'        Name.Builtin
 '('           Punctuation
 'a'           Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '7'           Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'max'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Bit'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '7'           Literal.Number.Integer
 '-'           Operator
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'mod'         Keyword
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'TBitSet'     Name
 '('           Punctuation
 'a'           Name
 '['           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'div'         Keyword
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
 '])'          Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 '('           Punctuation
 'Byte'        Keyword.Type
@@ -17130,90 +17130,90 @@
 '0'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 '('           Punctuation
 'Bit'         Name
 '))'          Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'max'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '(('          Punctuation
 'i'           Name
 '+'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'mod'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Blocks'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Splitter'    Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 '('           Punctuation
 'Byte'        Keyword.Type
@@ -17222,811 +17222,811 @@
 '0'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shr'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CardOfHex'   Name.Function
 '('           Punctuation
 'Hex'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Hex'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'ExtractChars' Name
 '('           Punctuation
 'Hex'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'HexadecimalChars' Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Hex'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Hex'         Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'HexOrd'      Name
 '('           Punctuation
 'Hex'         Name
 '['           Punctuation
 'i'           Name
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'shl'         Keyword
-' '           Text
+' '           Text.Whitespace
 '(('          Punctuation
 'Length'      Name.Builtin
 '('           Punctuation
 'Hex'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shl'         Keyword
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IntOfBin'    Name.Function
 '('           Punctuation
 'Bin'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Bin'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'ExtractChars' Name
 '('           Punctuation
 'Bin'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'BinaryChars' Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '32'          Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Bin'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'downto'      Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Bin'         Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '1'           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'shl'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Length'      Name.Builtin
 '('           Punctuation
 'Bin'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 '))'          Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BinOfInt'    Name.Function
 '('           Punctuation
 'n'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 '('           Punctuation
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 '('           Punctuation
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 'shr'         Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BinOfIntFill' Name.Function
 '('           Punctuation
 'n'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MulStr'      Name
 '('           Punctuation
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 '('           Punctuation
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 '('           Punctuation
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 'shr'         Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MulStr'      Name
 '('           Punctuation
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MinCount'    Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BaseNOfInt'  Name.Function
 '('           Punctuation
 'I'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TBaseN'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'a'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'B'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'mod'         Keyword
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'BaseNChar'   Name
 '['           Punctuation
 'a'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'div'         Keyword
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IntOfBaseN'  Name.Function
 '('           Punctuation
 'V'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TBaseN'      Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'F'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'c'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'V'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TrimAll'     Name
 '('           Punctuation
 'V'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'F'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'V'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'downto'      Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 '('           Punctuation
 'UpCase'      Name.Builtin
@@ -18036,16 +18036,16 @@
 'i'           Name
 ']))'         Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 '('           Punctuation
 'c'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 "'"           Literal.String
 '0'           Literal.String
 "'"           Literal.String
@@ -18055,19 +18055,19 @@
 '9'           Literal.String
 "'"           Literal.String
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '48'          Literal.Number.Integer
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 "'"           Literal.String
 'A'           Literal.String
 "'"           Literal.String
@@ -18077,1632 +18077,1632 @@
 'Z'           Literal.String
 "'"           Literal.String
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '55'          Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 '('           Punctuation
 'c'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'F'           Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'F'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'F'           Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'KeepIn'      Name.Function
 '('           Punctuation
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Variant'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Variant'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'InRange'     Name.Function
 '('           Punctuation
 'Value'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Variant'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Value'       Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Value'       Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'InStrictRange' Name.Function
 '('           Punctuation
 'Value'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Variant'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Value'       Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Value'       Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Min'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Min'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TIntA'       Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Max'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Max'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TIntA'       Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'A'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'A'           Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'RangesOfStr' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TRanges'     Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SL'          Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStringList' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'r'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 't'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TryStrToCard' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'Value'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'E'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Val'         Name.Builtin
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Value'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'E'           Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'E'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SL'          Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TStringList' Name
 '.'           Operator
 'Create'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'try'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Split'       Name
 '('           Punctuation
 'S'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'RangesSeparator' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SetLength'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'r'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'with'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 'RangeInnerSeparator' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'r'           Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Simple'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 "// no '-' found" Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Simple'      Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'r'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'RangeInfinite' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-' '           Text
+' '           Text.Whitespace
 '// * --> *-*' Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 'Simple'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'Bottom'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Low'         Name.Builtin
 '('           Punctuation
 'Bottom'      Name
 ')'           Punctuation
 ';'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'Top'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Top'         Name
 ')'           Punctuation
 ';'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'TryStrToCard' Name
 '('           Punctuation
 'r'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Value'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'Break'       Keyword
 ';'           Operator
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'TileStr'     Name
 '('           Punctuation
 'r'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 't'           Name
 ')'           Punctuation
 ';'           Operator
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'RangeInfinite' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'Bottom'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Low'         Name.Builtin
 '('           Punctuation
 'Bottom'      Name
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'TryStrToCard' Name
 '('           Punctuation
 'b'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'Break'       Keyword
 ';'           Operator
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 't'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'RangeInfinite' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'Top'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Top'         Name
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'TryStrToCard' Name
 '('           Punctuation
 't'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'Break'       Keyword
 ';'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'p'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ';'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'finally'     Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SL'          Name
 '.'           Operator
 'Free'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'InRanges'    Name.Function
 '('           Punctuation
 'Ranges'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TRanges'     Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'TestValue'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'High'        Name.Builtin
 '('           Punctuation
 'Ranges'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'with'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Ranges'      Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Simple'      Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'TestValue'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Value'       Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'InRange'     Name.Builtin
 '('           Punctuation
 'TestValue'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Bottom'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Top'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'WriteSL'     Name.Function
 '('           Punctuation
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Prefix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Suffix'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'Count'       Name
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'WriteLn'     Name.Builtin
 '('           Punctuation
 'Prefix'      Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Strings'     Name
 '['           Punctuation
 'i'           Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Suffix'      Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Success'     Name.Function
 '('           Punctuation
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'ResultOnSuccess' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ERROR_SUCCESS' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ResultOnSuccess' Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'LastSuccessRes' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Res'         Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Failure'     Name.Function
 '('           Punctuation
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'ResultOnSuccess' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ERROR_SUCCESS' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Success'     Name
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'ResultOnSuccess' Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ExpandString' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'P'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'P'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 '('           Punctuation
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExpandEnvironmentStrings' Name
 '('           Punctuation
 'P'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'GetMem'      Name.Builtin
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ExpandEnvironmentStrings' Name
 '('           Punctuation
 'P'           Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Res'         Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FreeMem'     Name.Builtin
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FindAll'     Name.Function
 '('           Punctuation
 'Strings'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStrings'    Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Mask'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ScanSubDirs' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Attributes'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'faFindEveryFile' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileReturn'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TFileNameFunc' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Path'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'ScanDir'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Path'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PSR'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TSearchRec'  Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Add'         Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'Add'         Name
@@ -19710,1641 +19710,1641 @@
 'S'           Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindFirst'   Name.Builtin
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Attributes'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Success'     Name
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Assigned'    Name.Builtin
 '('           Punctuation
 'FileReturn'  Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'FileReturn'  Name
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
 '))'          Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'else'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Add'         Name
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindNext'    Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FindClose'   Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ScanSubDirs' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindFirst'   Name.Builtin
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '*'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'faDirectory' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Success'     Name
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PSR'         Name
 '.'           Operator
 'Attr'        Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'faDirectory' Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n       '   Text
+'\n       '   Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '..'          Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'ScanDir'     Name
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindNext'    Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FindClose'   Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'Clear'       Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExtractPath' Name
 '('           Punctuation
 'Mask'        Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExtractFileName' Name.Builtin
 '('           Punctuation
 'Mask'        Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ScanDir'     Name
 '('           Punctuation
 'Path'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Strings'     Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FindAllFirst' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Mask'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'ScanSubDirs' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Attributes'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'faFindEveryFile' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Path'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'ScanDir'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Path'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PSR'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TSearchRec'  Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Success'     Name
 '('           Punctuation
 'FindFirst'   Name.Builtin
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Attributes'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FindAllFirst' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FindClose'   Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ScanSubDirs' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindFirst'   Name.Builtin
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '*'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'faDirectory' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Success'     Name
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PSR'         Name
 '.'           Operator
 'Attr'        Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'faDirectory' Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n       '   Text
+'\n       '   Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '..'          Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ScanDir'     Name
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindNext'    Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FindClose'   Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExtractPath' Name
 '('           Punctuation
 'Mask'        Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExtractFileName' Name.Builtin
 '('           Punctuation
 'Mask'        Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ScanDir'     Name
 '('           Punctuation
 'Path'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'DeleteFiles' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Mask'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'ScanSubDirs' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Attributes'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'faFindEveryFile' Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Path'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'ScanDir'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Path'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PSR'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TSearchRec'  Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'TryDeleteFile' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'try'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'DeleteFile'  Name.Builtin
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'except'      Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindFirst'   Name.Builtin
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Attributes'  Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Success'     Name
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'TryDeleteFile' Name
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindNext'    Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FindClose'   Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ScanSubDirs' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindFirst'   Name.Builtin
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '*'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'faDirectory' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Success'     Name
 '('           Punctuation
 'Res'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PSR'         Name
 '.'           Operator
 'Attr'        Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'faDirectory' Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n       '   Text
+'\n       '   Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '..'          Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'ScanDir'     Name
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'TryDeleteFile' Name
 '('           Punctuation
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindNext'    Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FindClose'   Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Path'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExtractPath' Name
 '('           Punctuation
 'Mask'        Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExtractFileName' Name.Builtin
 '('           Punctuation
 'Mask'        Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ScanDir'     Name
 '('           Punctuation
 'Path'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetFileNew'  Name.Function
 '('           Punctuation
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'NoFloppyDrives' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Drive'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'pf'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'pd'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PSR'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TSearchRec'  Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileName'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Trim'        Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Drive'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ExtractDrive' Name
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'DirectoryExists' Name.Builtin
 '('           Punctuation
 'Drive'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'NoFloppyDrives' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Drive'       Name
 '['           Punctuation
 '1'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String
 'A'           Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'B'           Literal.String
 "'"           Literal.String
 '])'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Drive'       Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'pf'          Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Length'      Name.Builtin
 '('           Punctuation
 'Drive'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'pf'          Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Len'         Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 '['           Punctuation
 'pf'          Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'pf'          Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Continue'    Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'pd'          Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CharPos'     Name
 '('           Punctuation
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'pf'          Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'pd'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '='           Operator
 'FindFirst'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'pf'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxInt'      Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'faFindEveryFile' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Break'       Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'FindClose'   Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '='           Operator
 'FindFirst'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'pf'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'MaxInt'      Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'faDirectory' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'FindClose'   Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Break'       Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '='           Operator
 'FindFirst'   Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Copy'        Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'pf'          Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'pd'          Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'pf'          Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'faDirectory' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'PSR'         Name
 '.'           Operator
 'Name'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FindClose'   Name.Builtin
 '('           Punctuation
 'PSR'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Break'       Keyword
 ';'           Operator
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'pf'          Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pd'          Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'FileEx'      Name
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DateTimeOfFileTime' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileTime'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TFileTime'   Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TDateTime'   Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'LocalFileTime' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TFileTime'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Res'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'FileTimeToLocalFileTime' Name
 '('           Punctuation
 'FileTime'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'LocalFileTime' Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'FileTimeToDosDateTime' Name
 '('           Punctuation
 'LocalFileTime' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'LongRec'     Name
 '('           Punctuation
 'Res'         Name
@@ -21352,7 +21352,7 @@
 '.'           Operator
 'Hi'          Name
 ','           Operator
-'\n   '       Text
+'\n   '       Text.Whitespace
 'LongRec'     Name
 '('           Punctuation
 'Res'         Name
@@ -21360,128 +21360,128 @@
 '.'           Operator
 'Lo'          Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Res'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'try'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FileDateToDateTime' Name.Builtin
 '('           Punctuation
 'Res'         Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'except'      Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'FileNew'     Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FileName'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Handle'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Handle'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FileCreate'  Name.Builtin
 '('           Punctuation
 'FileName'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileClose'   Name.Builtin
 '('           Punctuation
 'Handle'      Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Win32PlatformStr' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PlatformStrings' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
 '['           Punctuation
 'VER_PLATFORM_WIN32s' Name
@@ -21489,560 +21489,560 @@
 '.'           Operator
 'VER_PLATFORM_WIN32_NT' Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '('           Punctuation
 "'"           Literal.String
 'VER_PLATFORM_WIN32s' Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'VER_PLATFORM_WIN32_WINDOWS' Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'VER_PLATFORM_WIN32_NT' Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PlatformStrings' Name
 '['           Punctuation
 'Win32Platform' Name
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'FullOSInfo'  Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Format'      Name.Builtin
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'Platform: %s' Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'EOL'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'Version: %d.%d Build %d' Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'EOL'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'CSD: %s'     Literal.String
 "'"           Literal.String
 ','           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '['           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Win32PlatformStr' Name
 ','           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Win32MajorVersion' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Win32MinorVersion' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Win32BuildNumber' Name
 ','           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Win32CSDVersion' Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 ']'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Win9x'       Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Win32Platform' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'VER_PLATFORM_WIN32_WINDOWS' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'WinNT'       Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Win32Platform' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'VER_PLATFORM_WIN32_NT' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Win2000'     Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Win32Platform' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'VER_PLATFORM_WIN32_NT' Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Win32MajorVersion' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'WinXP'       Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Win32MajorVersion' Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'initialization' Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MyDir'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'GetMyDir'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'end'         Keyword
 '.'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'unit'        Keyword
-' '           Text
+' '           Text.Whitespace
 'FifoStream'  Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'interface'   Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'uses'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Classes'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'windows'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Dialogs'     Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'DefaultChunksize' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '32768'       Literal.Number.Integer
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 '// 32kb per chunk as default.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'type'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PMemChunk'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '^'           Operator
 'TMemChunk'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TMemChunk'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'record'      Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Filled'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longword'    Keyword.Type
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Read'        Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longword'    Keyword.Type
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Data'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'TFifo'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'class'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'private'     Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FBuffers'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TList'       Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FChunksize'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longword'    Keyword.Type
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FCritSect'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TRTLCriticalSection' Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FIsWinNT'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'boolean'     Keyword.Type
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FBytesInFifo' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'protected'   Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetBytesInFifo' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'public'      Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'constructor' Keyword
-' '           Text
+' '           Text.Whitespace
 'Create'      Name.Function
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'destructor'  Keyword
-' '           Text
+' '           Text.Whitespace
 'Destroy'     Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'override'    Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Write'       Name.Function
 '('           Punctuation
 'Data'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Read'        Name.Function
 '('           Punctuation
 'Buff'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'PeekData'    Name.Function
 '('           Punctuation
 'Buff'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'published'   Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'property'    Keyword
-' '           Text
+' '           Text.Whitespace
 'BytesInFifo' Name.Property
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
-' '           Text
+' '           Text.Whitespace
 'read'        Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'FBytesInFifo' Name.Function
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'implementation' Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'constructor' Keyword
-' '           Text
+' '           Text.Whitespace
 'TFifo'       Name.Class
 '.'           Operator
 'Create'      Name.Function
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'inherited'   Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FBuffers'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TList'       Name
 '.'           Operator
 'Create'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '// set default chunksize...' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FChunksize'  Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'DefaultChunksize' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'InitializeCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'destructor'  Keyword
-' '           Text
+' '           Text.Whitespace
 'TFifo'       Name.Class
 '.'           Operator
 'Destroy'     Name.Function
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'I'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EnterCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'I'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FBuffers'    Name
 '.'           Operator
 'count'       Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FreeMem'     Name.Builtin
 '('           Punctuation
 'PMemChunk'   Name
@@ -22055,7 +22055,7 @@
 'Data'        Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Dispose'     Keyword
 '('           Punctuation
 'PMemChunk'   Name
@@ -22065,122 +22065,122 @@
 'I'           Name
 ']))'         Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FBuffers'    Name
 '.'           Operator
 'Clear'       Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FBuffers'    Name
 '.'           Operator
 'Free'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'LeaveCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'DeleteCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'inherited'   Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TFifo'       Name.Class
 '.'           Operator
 'GetBytesInFifo' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FBuffers'    Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FBuffers'    Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'FBuffers'    Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunkSize'  Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PMemChunk'   Name
 '('           Punctuation
 'FBuffers'    Name
@@ -22188,21 +22188,21 @@
 'Fbuffers'    Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 '])'          Punctuation
 '.'           Operator
 'Filled'      Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Dec'         Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PMemChunk'   Name
 '('           Punctuation
 'FBuffers'    Name
@@ -22213,129 +22213,129 @@
 'Read'        Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'TFifo'       Name.Class
 '.'           Operator
 'Write'       Name.Function
 '('           Punctuation
 'Data'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Privpointer' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PrivSize'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Chunk'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PMemChunk'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PosInChunk'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 '('           Punctuation
 'Data'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '// null pointer? somebody is trying to fool us, get out...' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EnterCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PrivPointer' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Data'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PrivSize'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '// are already buffers there?' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FBuffers'    Name
 '.'           Operator
 'count'       Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '// is the last one of them not completely filled?' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'PMemChunk'   Name
 '('           Punctuation
 'FBuffers'    Name
@@ -22343,29 +22343,29 @@
 'FBuffers'    Name
 '.'           Operator
 'count'       Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 '])'          Punctuation
 '.'           Operator
 'filled'      Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '// not completely filled, so fill up the buffer.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Chunk'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PMemChunk'   Name
 '('           Punctuation
 'FBuffers'    Name
@@ -22373,27 +22373,27 @@
 'FBuffers'    Name
 '.'           Operator
 'count'       Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 '])'          Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '// fetch chunkdata.' Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'PosInChunk'  Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Data'        Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '// move to current fill pos...' Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'LongWord'    Keyword.Type
@@ -22401,70 +22401,70 @@
 'PosInChunk'  Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '// can we fill the chunk completely?' Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '// yes we can.' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'PrivPointer' Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PosInChunk'  Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'PrivSize'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'LongWord'    Keyword.Type
@@ -22472,159 +22472,159 @@
 'PrivPointer' Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunkSize'  Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'else'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '// we have to less data for filling the chunk completely,' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '// just put everything in.' Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'PrivPointer' Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'PosInChunk'  Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'PrivSize'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '// as long as we have remaining stuff put it into new chunks.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'PrivSize'    Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'new'         Keyword
 '('           Punctuation
 'Chunk'       Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'GetMem'      Name.Builtin
 '('           Punctuation
 'Chunk'       Name
 '.'           Operator
 'Data'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Read'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '// can we fill an entire chunk with the remaining data?' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Privsize'    Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 '// yes we can, so put the stuff in.' Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'Privpointer' Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Data'        Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'LongWord'    Keyword.Type
@@ -22632,88 +22632,88 @@
 'PrivPointer' Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'PrivSize'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FChunksize'  Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '// we have to less data to fill the entire chunk, just put the remaining stuff in.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'Privpointer' Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Data'        Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Privsize'    Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Privsize'    Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'PrivSize'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Privsize'    Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Fbuffers'    Name
 '.'           Operator
 'Add'         Name
@@ -22721,21 +22721,21 @@
 'Chunk'       Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Privsize'    Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Showmessage' Name
 '('           Punctuation
 "'"           Literal.String
@@ -22743,141 +22743,141 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FBytesInFifo' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'GetBytesInFifo' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'LeaveCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'TFifo'       Name.Class
 '.'           Operator
 'Read'        Name.Function
 '('           Punctuation
 'Buff'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PrivSize'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Privpos'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Chunk'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PMemChunk'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ChunkPos'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 '('           Punctuation
 'Buff'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '// null pointer? somebody is trying to fool us, get out...' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EnterCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PrivSize'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Privpos'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Buff'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FBuffers'    Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Chunk'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PMemChunk'   Name
 '('           Punctuation
 'FBuffers'    Name
@@ -22885,17 +22885,17 @@
 '0'           Literal.Number.Integer
 '])'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ChunkPos'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'data'        Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'LongWord'    Keyword.Type
@@ -22903,82 +22903,82 @@
 'ChunkPos'    Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Read'        Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '// does the remaining part of the chunk fit into the buffer?' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'PrivSize'    Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'read'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-' '           Text
+' '           Text.Whitespace
 '// yep, it fits' Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'ChunkPos'    Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Privpos'     Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'read'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'PrivSize'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'read'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FreeMem'     Name.Builtin
 '('           Punctuation
 'Chunk'       Name
@@ -22986,13 +22986,13 @@
 'Data'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Dispose'     Keyword
 '('           Punctuation
 'Chunk'       Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FBuffers'    Name
 '.'           Operator
 'Delete'      Name
@@ -23000,233 +23000,233 @@
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 "// remaining part didn't fit, get as much as we can and increment the" Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 '// read attribute.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'ChunkPos'    Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Privpos'     Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'PrivSize'    Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'Chunk'       Name
 '.'           Operator
 'read'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'PrivSize'    Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'PrivSize'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'PrivSize'    Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 "// as we filled the buffer, we'll have to break here." Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'break'       Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FBytesInFifo' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'GetBytesInFifo' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'LeaveCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ReqSize'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PrivSize'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '// read Data from Stream without removing it from the Stream...' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'TFifo'       Name.Class
 '.'           Operator
 'PeekData'    Name.Function
 '('           Punctuation
 'Buff'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PrivSize'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Privpos'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Chunk'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PMemChunk'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ChunkPos'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pointer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ChunkNr'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'LongWord'    Keyword.Type
 '('           Punctuation
 'Buff'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '// null pointer? somebody is trying to fool us, get out...' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EnterCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PrivSize'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Privpos'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Buff'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ChunkNr'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FBuffers'    Name
 '.'           Operator
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'ChunkNr'     Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Chunk'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PMemChunk'   Name
 '('           Punctuation
 'FBuffers'    Name
@@ -23234,17 +23234,17 @@
 'ChunkNr'     Name
 '])'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ChunkPos'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'data'        Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'LongWord'    Keyword.Type
@@ -23252,159 +23252,159 @@
 'ChunkPos'    Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Read'        Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '// does the remaining part of the chunk fit into the buffer?' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'PrivSize'    Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'read'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-' '           Text
+' '           Text.Whitespace
 '// yep, it fits' Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'ChunkPos'    Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Privpos'     Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'read'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'PrivSize'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'Filled'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Chunk'       Name
 '.'           Operator
 'read'        Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'ChunkNr'     Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 "// remaining part didn't fit, get as much as we can and increment the" Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 '// read attribute.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'ChunkPos'    Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Privpos'     Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'PrivSize'    Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'PrivSize'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'ReqSize'     Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'PrivSize'    Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 "// as we filled the buffer, we'll have to break here." Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'break'       Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'LeaveCriticalSection' Name
 '('           Punctuation
 'FCritSect'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ReqSize'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PrivSize'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'end'         Keyword
 '.'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/delphi/test.pas.output b/tests/examplefiles/delphi/test.pas.output
index 3749066ae6..8410124396 100644
--- a/tests/examplefiles/delphi/test.pas.output
+++ b/tests/examplefiles/delphi/test.pas.output
@@ -1,348 +1,348 @@
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '// Sourcecode from http://www.delphi-library.de/topic_47880.html' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'uses'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Windows'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Messages'    Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FFM_INIT'    Name
-'               ' Text
+'               ' Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'WM_USER'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1976'        Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FFM_ONFILEFOUND' Name
-'        '    Text
+'        '    Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'WM_USER'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1974'        Literal.Number.Integer
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 '// wParam: not used, lParam: Filename' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FFM_ONDIRFOUND' Name
-'         '   Text
+'         '   Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'WM_USER'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1975'        Literal.Number.Integer
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 '// wParam: NumFolder, lParam: Directory' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'CntFolders'  Name
-'             ' Text
+'             ' Text.Whitespace
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'NumFolder'   Name
-'              ' Text
+'              ' Text.Whitespace
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Cardinal'    Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '////////////////////////////////////////////////////////////////////////////////' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//  FindAllFilesInit' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'FindAllFilesInit' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'label'       Keyword
-' '           Text
+' '           Text.Whitespace
 'foo'         Name.Label
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'CntFolders'  Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'NumFolder'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name.Label
 ':'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Blub'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'goto'        Keyword
-' '           Text
+' '           Text.Whitespace
 'foo'         Name.Label
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '////////////////////////////////////////////////////////////////////////////////' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//  CountFolders' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'CountFolders' Name.Function
 '('           Punctuation
 'Handle'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THandle'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'RootFolder'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Recurse'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'hFindFile'   Name
-'              ' Text
+'              ' Text.Whitespace
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THandle'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'wfd'         Name
-'                    ' Text
+'                    ' Text.Whitespace
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TWin32FindData' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SendMessage' Name
 '('           Punctuation
 'Handle'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FFM_INIT'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'RootFolder'  Name
 '['           Punctuation
 'length'      Name.Builtin
 '('           Punctuation
 'RootFolder'  Name
 ')]'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ZeroMemory'  Name
 '('           Punctuation
 '@'           Operator
 'wfd'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'wfd'         Name
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'wfd'         Name
 '.'           Operator
 'dwFileAttributes' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FILE_ATTRIBUTE_NORMAL' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Recurse'     Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'hFindFile'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindFirstFile' Name
 '('           Punctuation
 'pointer'     Keyword.Type
 '('           Punctuation
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '*.*'         Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'hFindFile'   Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'try'         Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'repeat'      Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 '.'           Operator
 'dwFileAttributes' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'FILE_ATTRIBUTE_DIRECTORY' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FILE_ATTRIBUTE_DIRECTORY' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'begin'       Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'string'      Keyword
 '('           Punctuation
@@ -350,17 +350,17 @@
 '.'           Operator
 'cFileName'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'string'      Keyword
 '('           Punctuation
@@ -368,66 +368,66 @@
 '.'           Operator
 'cFileName'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '..'          Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'begin'       Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'CountFolders' Name
 '('           Punctuation
 'Handle'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 '.'           Operator
 'cFileName'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Recurse'     Name
 ')'           Punctuation
 ';'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'until'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FindNextFile' Name
 '('           Punctuation
 'hFindFile'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'CntFolders'  Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'finally'     Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Windows'     Name
 '.'           Operator
 'FindClose'   Name
@@ -435,203 +435,203 @@
 'hFindFile'   Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '////////////////////////////////////////////////////////////////////////////////' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//  FindAllFiles' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'FindAllFiles' Name.Function
 '('           Punctuation
 'Handle'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THandle'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'RootFolder'  Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Mask'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Keyword
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Recurse'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'hFindFile'   Name
-'              ' Text
+'              ' Text.Whitespace
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THandle'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'wfd'         Name
-'                    ' Text
+'                    ' Text.Whitespace
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TWin32FindData' Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'RootFolder'  Name
 '['           Punctuation
 'length'      Name.Builtin
 '('           Punctuation
 'RootFolder'  Name
 ')]'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '\\'          Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ZeroMemory'  Name
 '('           Punctuation
 '@'           Operator
 'wfd'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'wfd'         Name
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'wfd'         Name
 '.'           Operator
 'dwFileAttributes' Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FILE_ATTRIBUTE_NORMAL' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Recurse'     Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'hFindFile'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindFirstFile' Name
 '('           Punctuation
 'pointer'     Keyword.Type
 '('           Punctuation
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '*.*'         Literal.String
 "'"           Literal.String
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'hFindFile'   Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'try'         Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'repeat'      Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 '.'           Operator
 'dwFileAttributes' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'FILE_ATTRIBUTE_DIRECTORY' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FILE_ATTRIBUTE_DIRECTORY' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'begin'       Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'string'      Keyword
 '('           Punctuation
@@ -639,17 +639,17 @@
 '.'           Operator
 'cFileName'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '.'           Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'string'      Keyword
 '('           Punctuation
@@ -657,78 +657,78 @@
 '.'           Operator
 'cFileName'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '..'          Literal.String
 "'"           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'begin'       Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'FindAllFiles' Name
 '('           Punctuation
 'Handle'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 '.'           Operator
 'cFileName'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Mask'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Recurse'     Name
 ')'           Punctuation
 ';'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'until'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FindNextFile' Name
 '('           Punctuation
 'hFindFile'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'NumFolder'   Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'SendMessage' Name
 '('           Punctuation
 'Handle'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FFM_ONDIRFOUND' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'NumFolder'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'lParam'      Name
 '('           Punctuation
 'string'      Keyword
@@ -736,9 +736,9 @@
 'RootFolder'  Name
 ')))'         Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'finally'     Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Windows'     Name
 '.'           Operator
 'FindClose'   Name
@@ -746,115 +746,115 @@
 'hFindFile'   Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'hFindFile'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FindFirstFile' Name
 '('           Punctuation
 'pointer'     Keyword.Type
 '('           Punctuation
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'Mask'        Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'hFindFile'   Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'INVALID_HANDLE_VALUE' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'try'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'repeat'      Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'wfd'         Name
 '.'           Operator
 'dwFileAttributes' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'FILE_ATTRIBUTE_DIRECTORY' Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'FILE_ATTRIBUTE_DIRECTORY' Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'SendMessage' Name
 '('           Punctuation
 'Handle'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FFM_ONFILEFOUND' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'lParam'      Name
 '('           Punctuation
 'string'      Keyword
 '('           Punctuation
 'RootFolder'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 '.'           Operator
 'cFileName'   Name
 ')))'         Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'until'       Keyword
-' '           Text
+' '           Text.Whitespace
 'FindNextFile' Name
 '('           Punctuation
 'hFindFile'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'wfd'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'finally'     Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Windows'     Name
 '.'           Operator
 'FindClose'   Name
@@ -862,1382 +862,1382 @@
 'hFindFile'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 'property'    Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Property
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 'read'        Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'ftest'       Name.Function
-' '           Text
+' '           Text.Whitespace
 'write'       Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'ftest'       Name.Function
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'boolean'     Keyword.Type
-' '           Text
+' '           Text.Whitespace
 'read'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'ftest'       Name
-' '           Text
+' '           Text.Whitespace
 'write'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'ftest'       Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '//'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '// This sourcecode is part of omorphia' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'Function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'IsValidHandle' Name.Function
 '('           Punctuation
 'Const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Handle'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THandle'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Boolean'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 '{$IFDEF OMORPHIA_FEATURES_USEASM}' Comment.Multiline
-' '           Text
+' '           Text.Whitespace
 'Assembler'   Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Asm'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'TEST'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'JZ'          Keyword
-'      '      Text
+'      '      Text.Whitespace
 '@@Finish'    Name.Label
-'\n    '      Text
+'\n    '      Text.Whitespace
 'NOT'         Keyword
-'     '       Text
+'     '       Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'TEST'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SETNZ'       Keyword
-'   '         Text
+'   '         Text.Whitespace
 'AL'          Name.Builtin
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '{$IFDEF WINDOWS}' Comment.Multiline
-'\n    '      Text
+'\n    '      Text.Whitespace
 'JZ'          Keyword
-'      '      Text
+'      '      Text.Whitespace
 '@@Finish'    Name.Label
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '//Save the handle against modifications or loss' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '//reserve some space for a later duplicate' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '//Check if we are working on NT-Platform' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CALL'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'IsWindowsNTSystem' Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'TEST'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'JZ'          Keyword
-'      '      Text
+'      '      Text.Whitespace
 '@@NoNTSystem' Name.Label
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'DWORD'       Name
-' '           Text
+' '           Text.Whitespace
 'PTR'         Name
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'ESP'         Name.Builtin
 ']'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'LEA'         Keyword
-'     '       Text
+'     '       Text.Whitespace
 'EAX'         Name.Builtin
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'DWORD'       Name
-' '           Text
+' '           Text.Whitespace
 'PTR'         Name
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'ESP'         Name.Builtin
 '+'           Operator
 '$04'         Literal.Number.Hex
 ']'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CALL'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'GetHandleInformation' Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'TEST'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'JNZ'         Keyword
-'     '       Text
+'     '       Text.Whitespace
 '@@Finish2'   Name.Label
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '@@NoNTSystem' Name.Label
 ':'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '//Result := DuplicateHandle(GetCurrentProcess, Handle, GetCurrentProcess,' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '//  @Duplicate, 0, False, DUPLICATE_SAME_ACCESS);' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'DUPLICATE_SAME_ACCESS' Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 '$00000000'   Literal.Number.Hex
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 '$00000000'   Literal.Number.Hex
-'\n    '      Text
+'\n    '      Text.Whitespace
 'LEA'         Keyword
-'     '       Text
+'     '       Text.Whitespace
 'EAX'         Name.Builtin
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'DWORD'       Name
-' '           Text
+' '           Text.Whitespace
 'PTR'         Name
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'ESP'         Name.Builtin
 '+'           Operator
 '$0C'         Literal.Number.Hex
 ']'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CALL'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'GetCurrentProcess' Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'DWORD'       Name
-' '           Text
+' '           Text.Whitespace
 'PTR'         Name
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'ESP'         Name.Builtin
 '+'           Operator
 '$18'         Literal.Number.Hex
 ']'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CALL'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'DuplicateHandle' Name
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'TEST'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'JZ'          Keyword
-'      '      Text
+'      '      Text.Whitespace
 '@@Finish2'   Name.Label
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '//  Result := CloseHandle(Duplicate);' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'DWORD'       Name
-' '           Text
+' '           Text.Whitespace
 'PTR'         Name
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'ESP'         Name.Builtin
 ']'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CALL'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'CloseHandle' Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '@@Finish2'   Name.Label
 ':'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'POP'         Keyword
-'     '       Text
+'     '       Text.Whitespace
 'EDX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'POP'         Keyword
-'     '       Text
+'     '       Text.Whitespace
 'EDX'         Name.Builtin
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PUSH'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 '$00000000'   Literal.Number.Hex
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CALL'        Keyword
-'    '        Text
+'    '        Text.Whitespace
 'SetLastError' Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'POP'         Keyword
-'     '       Text
+'     '       Text.Whitespace
 'EAX'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 '{$ENDIF}'    Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '@@Finish'    Name.Label
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'End'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$ELSE}'     Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Var'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Duplicate'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'THandle'     Keyword.Type
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Flags'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'DWORD'       Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'If'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IsWinNT'     Name
-' '           Text
+' '           Text.Whitespace
 'Then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'GetHandleInformation' Name
 '('           Punctuation
 'Handle'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Flags'       Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Else'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'If'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Not'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'Then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '// DuplicateHandle is used as an additional check for those object types not' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '// supported by GetHandleInformation (e.g. according to the documentation,' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 "// GetHandleInformation doesn't support window stations and desktop although" Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '// tests show that it does). GetHandleInformation is tried first because its' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '// much faster. Additionally GetHandleInformation is only supported on NT...' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'DuplicateHandle' Name
 '('           Punctuation
 'GetCurrentProcess' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Handle'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'GetCurrentProcess' Name
 ','           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@'           Operator
 'Duplicate'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'DUPLICATE_SAME_ACCESS' Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'If'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 'Then'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'CloseHandle' Name
 '('           Punctuation
 'Duplicate'   Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'End'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'End'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$ENDIF}'    Comment.Multiline
-'\n\n\n    \t\n\n' Text
+'\n\n\n    \t\n\n' Text.Whitespace
 
 '{*******************************************************}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{                                                       }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{       Delphi Supplemental Components                  }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{       ZLIB Data Compression Interface Unit            }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{                                                       }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{       Copyright (c) 1997 Borland International        }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{                                                       }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{*******************************************************}' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ Modified for zlib 1.1.3 by Davide Moretti <dave@rimini.com }' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'unit'        Keyword
-' '           Text
+' '           Text.Whitespace
 'zlib'        Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'interface'   Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'uses'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Sysutils'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Classes'     Name
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'type'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TAlloc'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'AppData'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Items'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TFree'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'AppData'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Block'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '// Internal structure.  Ignore.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TZStreamRec' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'packed'      Keyword
-' '           Text
+' '           Text.Whitespace
 'record'      Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'next_in'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'       '     Text
+'       '     Text.Whitespace
 '// next input byte' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'avail_in'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'    '        Text
+'    '        Text.Whitespace
 '// number of bytes available at next_in' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'total_in'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'    '        Text
+'    '        Text.Whitespace
 '// total nb of input bytes read so far' Comment.Single
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'next_out'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'      '      Text
+'      '      Text.Whitespace
 '// next output byte should be put here' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'avail_out'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'   '         Text
+'   '         Text.Whitespace
 '// remaining free space at next_out' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'total_out'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'   '         Text
+'   '         Text.Whitespace
 '// total nb of bytes output so far' Comment.Single
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'msg'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'           ' Text
+'           ' Text.Whitespace
 '// last error message, NULL if no error' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'internal'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-'    '        Text
+'    '        Text.Whitespace
 '// not visible by applications' Comment.Single
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'zalloc'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TAlloc'      Name
 ';'           Operator
-'       '     Text
+'       '     Text.Whitespace
 '// used to allocate the internal state' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'zfree'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TFree'       Name
 ';'           Operator
-'         '   Text
+'         '   Text.Whitespace
 '// used to free the internal state' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'AppData'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-'     '       Text
+'     '       Text.Whitespace
 '// private data object passed to zalloc and zfree' Comment.Single
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'data_type'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'   '         Text
+'   '         Text.Whitespace
 '//  best guess about the data type: ascii or binary' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'adler'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'       '     Text
+'       '     Text.Whitespace
 '// adler32 value of the uncompressed data' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'reserved'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'    '        Text
+'    '        Text.Whitespace
 '// reserved for future use' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '// Abstract ancestor class' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TCustomZlibStream' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'class'       Keyword
 '('           Punctuation
 'TStream'     Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'private'     Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FStrm'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStream'     Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FStrmPos'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FOnProgress' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TNotifyEvent' Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FZRec'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FBuffer'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'Word'        Keyword.Type
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'protected'   Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Progress'    Name.Function
 '('           Punctuation
 'Sender'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TObject'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'dynamic'     Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'property'    Keyword
-' '           Text
+' '           Text.Whitespace
 'OnProgress'  Name.Property
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TNotifyEvent' Name
-' '           Text
+' '           Text.Whitespace
 'read'        Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'FOnProgress' Name.Function
-' '           Text
+' '           Text.Whitespace
 'write'       Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'FOnProgress' Name.Function
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'constructor' Keyword
-' '           Text
+' '           Text.Whitespace
 'Create'      Name.Function
 '('           Punctuation
 'Strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStream'     Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ TCompressionStream compresses data on the fly as data is written to it, and\n  stores the compressed data to another stream.\n\n  TCompressionStream is write-only and strictly sequential. Reading from the\n  stream will raise an exception. Using Seek to move the stream pointer\n  will raise an exception.\n\n  Output data is cached internally, written to the output stream only when\n  the internal output buffer is full.  All pending output data is flushed\n  when the stream is destroyed.\n\n  The Position property returns the number of uncompressed bytes of\n  data that have been written to the stream so far.\n\n  CompressionRate returns the on-the-fly percentage by which the original\n  data has been compressed:  (1 - (CompressedBytes / UncompressedBytes)) * 100\n  If raw data size = 100 and compressed data size = 25, the CompressionRate\n  is 75%\n\n  The OnProgress event is called each time the output buffer is filled and\n  written to the output stream.  This is useful for updating a progress\n  indicator when you are writing a large chunk of data to the compression\n  stream in a single call.}' Comment.Multiline
-'\n\n\n  '    Text
+'\n\n\n  '    Text.Whitespace
 'TCompressionLevel' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'clNone'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'clFastest'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'clDefault'   Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'clMax'       Name
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'TCompressionStream' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'class'       Keyword
 '('           Punctuation
 'TCustomZlibStream' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'private'     Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'GetCompressionRate' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Single'      Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'public'      Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'constructor' Keyword
-' '           Text
+' '           Text.Whitespace
 'Create'      Name.Function
 '('           Punctuation
 'CompressionLevel' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCompressionLevel' Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Dest'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStream'     Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'destructor'  Keyword
-' '           Text
+' '           Text.Whitespace
 'Destroy'     Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'override'    Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Read'        Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'override'    Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Write'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'override'    Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Seek'        Name.Function
 '('           Punctuation
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Origin'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Word'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'override'    Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'property'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CompressionRate' Name.Property
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Single'      Keyword.Type
-' '           Text
+' '           Text.Whitespace
 'read'        Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'GetCompressionRate' Name.Function
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'property'    Keyword
-' '           Text
+' '           Text.Whitespace
 'OnProgress'  Name.Property
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{ TDecompressionStream decompresses data on the fly as data is read from it.\n\n  Compressed data comes from a separate source stream.  TDecompressionStream\n  is read-only and unidirectional; you can seek forward in the stream, but not\n  backwards.  The special case of setting the stream position to zero is\n  allowed.  Seeking forward decompresses data until the requested position in\n  the uncompressed data has been reached.  Seeking backwards, seeking relative\n  to the end of the stream, requesting the size of the stream, and writing to\n  the stream will raise an exception.\n\n  The Position property returns the number of bytes of uncompressed data that\n  have been read from the stream so far.\n\n  The OnProgress event is called each time the internal input buffer of\n  compressed data is exhausted and the next block is read from the input stream.\n  This is useful for updating a progress indicator when you are reading a\n  large chunk of data from the decompression stream in a single call.}' Comment.Multiline
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'TDecompressionStream' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'class'       Keyword
 '('           Punctuation
 'TCustomZlibStream' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'public'      Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'constructor' Keyword
-' '           Text
+' '           Text.Whitespace
 'Create'      Name.Function
 '('           Punctuation
 'Source'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStream'     Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'destructor'  Keyword
-' '           Text
+' '           Text.Whitespace
 'Destroy'     Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'override'    Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Read'        Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'override'    Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Write'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'override'    Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'Seek'        Name.Function
 '('           Punctuation
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Origin'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Word'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'override'    Keyword.Pseudo
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'property'    Keyword
-' '           Text
+' '           Text.Whitespace
 'OnProgress'  Name.Property
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n\n\n\n'    Text
+'\n\n\n\n'    Text.Whitespace
 
 '{ CompressBuf compresses data, buffer to buffer, in one call.\n   In: InBuf = ptr to compressed data\n       InBytes = number of bytes in InBuf\n  Out: OutBuf = ptr to newly allocated buffer containing decompressed data\n       OutBytes = number of bytes in OutBuf   }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'CompressBuf' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'InBuf'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'InBytes'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'OutBuf'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '{ DecompressBuf decompresses data, buffer to buffer, in one call.\n   In: InBuf = ptr to compressed data\n       InBytes = number of bytes in InBuf\n       OutEstimate = zero, or est. size of the decompressed data\n  Out: OutBuf = ptr to newly allocated buffer containing decompressed data\n       OutBytes = number of bytes in OutBuf   }' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'DecompressBuf' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'InBuf'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'InBytes'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n '         Text
+'\n '         Text.Whitespace
 'OutEstimate' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'OutBuf'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'zlib_version' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 '1.1.3'       Literal.String
 "'"           Literal.String
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'type'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EZlibError'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'class'       Keyword
 '('           Punctuation
 'Exception'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ECompressionError' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'class'       Keyword
 '('           Punctuation
 'EZlibError'  Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EDecompressionError' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'class'       Keyword
 '('           Punctuation
 'EZlibError'  Name
 ')'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'adler32'     Name.Function
 '('           Punctuation
 'adler'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'buf'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'len'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'implementation' Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_NO_FLUSH'  Name
-'      '      Text
+'      '      Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_PARTIAL_FLUSH' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_SYNC_FLUSH' Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_FULL_FLUSH' Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_FINISH'    Name
-'        '    Text
+'        '    Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Z_OK'        Name
-'            ' Text
+'            ' Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_STREAM_END' Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_NEED_DICT' Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_ERRNO'     Name
-'         '   Text
+'         '   Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_STREAM_ERROR' Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '-'           Operator
 '2'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_DATA_ERROR' Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '-'           Operator
 '3'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_MEM_ERROR' Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '-'           Operator
 '4'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_BUF_ERROR' Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '-'           Operator
 '5'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_VERSION_ERROR' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '-'           Operator
 '6'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Z_NO_COMPRESSION' Name
-'       '     Text
+'       '     Text.Whitespace
 '='           Operator
-'   '         Text
+'   '         Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_BEST_SPEED' Name
-'           ' Text
+'           ' Text.Whitespace
 '='           Operator
-'   '         Text
+'   '         Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_BEST_COMPRESSION' Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
-'   '         Text
+'   '         Text.Whitespace
 '9'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_DEFAULT_COMPRESSION' Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Z_FILTERED'  Name
-'            ' Text
+'            ' Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_HUFFMAN_ONLY' Name
-'        '    Text
+'        '    Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_DEFAULT_STRATEGY' Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Z_BINARY'    Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_ASCII'     Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Z_UNKNOWN'   Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'Z_DEFLATED'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
 ';'           Operator
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '_z_errmsg'   Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
 '['           Punctuation
 '0'           Literal.Number.Integer
@@ -2245,676 +2245,676 @@
 '.'           Operator
 '9'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'need dictionary' Literal.String
 "'"           Literal.String
 ','           Operator
-'      '      Text
+'      '      Text.Whitespace
 '// Z_NEED_DICT      (2)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'stream end'  Literal.String
 "'"           Literal.String
 ','           Operator
-'           ' Text
+'           ' Text.Whitespace
 '// Z_STREAM_END     (1)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
 ','           Operator
-'                     ' Text
+'                     ' Text.Whitespace
 '// Z_OK             (0)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'file error'  Literal.String
 "'"           Literal.String
 ','           Operator
-'           ' Text
+'           ' Text.Whitespace
 '// Z_ERRNO          (-1)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'stream error' Literal.String
 "'"           Literal.String
 ','           Operator
-'         '   Text
+'         '   Text.Whitespace
 '// Z_STREAM_ERROR   (-2)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'data error'  Literal.String
 "'"           Literal.String
 ','           Operator
-'           ' Text
+'           ' Text.Whitespace
 '// Z_DATA_ERROR     (-3)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'insufficient memory' Literal.String
 "'"           Literal.String
 ','           Operator
-'  '          Text
+'  '          Text.Whitespace
 '// Z_MEM_ERROR      (-4)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'buffer error' Literal.String
 "'"           Literal.String
 ','           Operator
-'         '   Text
+'         '   Text.Whitespace
 '// Z_BUF_ERROR      (-5)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 'incompatible version' Literal.String
 "'"           Literal.String
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '// Z_VERSION_ERROR  (-6)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'"           Literal.String
 "'"           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 ')'           Punctuation
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '{$L deflate.obj}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$L inflate.obj}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$L inftrees.obj}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$L trees.obj}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$L adler32.obj}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$L infblock.obj}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$L infcodes.obj}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$L infutil.obj}' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{$L inffast.obj}' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '_tr_init'    Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '_tr_tally'   Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '_tr_flush_block' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '_tr_align'   Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '_tr_stored_block' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'adler32'     Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_blocks_new' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_blocks' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_blocks_reset' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_blocks_free' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_set_dictionary' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_trees_bits' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_trees_dynamic' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_trees_fixed' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_codes_new' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_codes' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_codes_free' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '_inflate_mask' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_flush' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate_fast' Name.Function
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '_memset'     Name.Function
 '('           Punctuation
 'P'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Byte'        Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
 'cdecl'       Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FillChar'    Name.Builtin
 '('           Punctuation
 'P'           Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'count'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'B'           Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '_memcpy'     Name.Function
 '('           Punctuation
 'dest'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'source'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
 'cdecl'       Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Move'        Name.Builtin
 '('           Punctuation
 'source'      Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'dest'        Name
 '^'           Operator
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'count'       Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n\n\n'    Text
+'\n\n\n\n'    Text.Whitespace
 
 '// deflate compresses data' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'deflateInit_' Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'level'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'version'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'recsize'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'deflate'     Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'flush'       Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'deflateEnd'  Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '// inflate decompresses data' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'inflateInit_' Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'version'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'recsize'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'inflate'     Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'flush'       Name.Builtin
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'inflateEnd'  Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'inflateReset' Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'external'    Keyword.Pseudo
 ';'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'zcalloc'     Name.Function
 '('           Punctuation
 'AppData'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Items'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Size'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetMem'      Name.Builtin
 '('           Punctuation
 'Result'      Name.Builtin.Pseudo
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Items'       Name
 '*'           Operator
 'Size'        Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'zcfree'      Name.Function
 '('           Punctuation
 'AppData'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Block'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FreeMem'     Name.Builtin
 '('           Punctuation
 'Block'       Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'zlibCheck'   Name.Function
 '('           Punctuation
 'code'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'code'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'code'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'EZlibError'  Name
 '.'           Operator
 'Create'      Name
@@ -2924,51 +2924,51 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'    '        Text
+'    '        Text.Whitespace
 '//!!'        Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'CCheck'      Name.Function
 '('           Punctuation
 'code'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'code'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'code'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ECompressionError' Name
 '.'           Operator
 'Create'      Name
@@ -2978,51 +2978,51 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 '//!!'        Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'DCheck'      Name.Function
 '('           Punctuation
 'code'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'code'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'code'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'EDecompressionError' Name
 '.'           Operator
 'Create'      Name
@@ -3032,252 +3032,252 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'  '          Text
+'  '          Text.Whitespace
 '//!!'        Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'CompressBuf' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'InBuf'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'InBytes'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'OutBuf'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'P'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FillChar'    Name.Builtin
 '('           Punctuation
 'strm'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'strm'        Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'OutBytes'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '(('          Punctuation
 'InBytes'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'InBytes'     Name
-' '           Text
+' '           Text.Whitespace
 'div'         Keyword
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '12'          Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '255'         Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 '255'         Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetMem'      Name.Builtin
 '('           Punctuation
 'OutBuf'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'try'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'strm'        Name
 '.'           Operator
 'next_in'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'InBuf'       Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'strm'        Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'InBytes'     Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'strm'        Name
 '.'           Operator
 'next_out'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBuf'      Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'strm'        Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CCheck'      Name
 '('           Punctuation
 'deflateInit_' Name
 '('           Punctuation
 'strm'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_BEST_COMPRESSION' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'zlib_version' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'strm'        Name
 ')))'         Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'try'         Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'CCheck'      Name
 '('           Punctuation
 'deflate'     Name
 '('           Punctuation
 'strm'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_FINISH'    Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_STREAM_END' Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'P'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBuf'      Name
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'OutBytes'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '256'         Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'ReallocMem'  Name.Builtin
 '('           Punctuation
 'OutBuf'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'strm'        Name
 '.'           Operator
 'next_out'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 '('           Punctuation
 'Integer'     Keyword.Type
 '('           Punctuation
 'OutBuf'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Integer'     Keyword.Type
 '('           Punctuation
@@ -3285,30 +3285,30 @@
 '.'           Operator
 'next_out'    Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 '('           Punctuation
 'P'           Name
 ')))'         Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'strm'        Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '256'         Literal.Number.Integer
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'finally'     Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'CCheck'      Name
 '('           Punctuation
 'deflateEnd'  Name
@@ -3316,308 +3316,308 @@
 'strm'        Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ReallocMem'  Name.Builtin
 '('           Punctuation
 'OutBuf'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 '.'           Operator
 'total_out'   Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'OutBytes'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 '.'           Operator
 'total_out'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'except'      Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FreeMem'     Name.Builtin
 '('           Punctuation
 'OutBuf'      Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'raise'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'DecompressBuf' Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'InBuf'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'InBytes'     Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'OutEstimate' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'OutBuf'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'out'         Name
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TZStreamRec' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'P'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Pointer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'BufInc'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FillChar'    Name.Builtin
 '('           Punctuation
 'strm'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'strm'        Name
 ')'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'BufInc'      Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'InBytes'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '255'         Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Keyword
-' '           Text
+' '           Text.Whitespace
 '255'         Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'OutEstimate' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'OutBytes'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'BufInc'      Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'OutBytes'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'OutEstimate' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'GetMem'      Name.Builtin
 '('           Punctuation
 'OutBuf'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'try'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'strm'        Name
 '.'           Operator
 'next_in'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'InBuf'       Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'strm'        Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'InBytes'     Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'strm'        Name
 '.'           Operator
 'next_out'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBuf'      Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'strm'        Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'DCheck'      Name
 '('           Punctuation
 'inflateInit_' Name
 '('           Punctuation
 'strm'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'zlib_version' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'strm'        Name
 ')))'         Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'try'         Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'DCheck'      Name
 '('           Punctuation
 'inflate'     Name
 '('           Punctuation
 'strm'        Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_FINISH'    Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_STREAM_END' Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'P'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBuf'      Name
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'Inc'         Name.Builtin
 '('           Punctuation
 'OutBytes'    Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'BufInc'      Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'ReallocMem'  Name.Builtin
 '('           Punctuation
 'OutBuf'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'OutBytes'    Name
 ')'           Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'strm'        Name
 '.'           Operator
 'next_out'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PChar'       Keyword.Type
 '('           Punctuation
 'Integer'     Keyword.Type
 '('           Punctuation
 'OutBuf'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Integer'     Keyword.Type
 '('           Punctuation
@@ -3625,30 +3625,30 @@
 '.'           Operator
 'next_out'    Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 '('           Punctuation
 'P'           Name
 ')))'         Punctuation
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'strm'        Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'BufInc'      Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'finally'     Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'DCheck'      Name
 '('           Punctuation
 'inflateEnd'  Name
@@ -3656,304 +3656,304 @@
 'strm'        Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ReallocMem'  Name.Builtin
 '('           Punctuation
 'OutBuf'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 '.'           Operator
 'total_out'   Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'OutBytes'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'strm'        Name
 '.'           Operator
 'total_out'   Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'except'      Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FreeMem'     Name.Builtin
 '('           Punctuation
 'OutBuf'      Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'raise'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '// TCustomZlibStream' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'constructor' Keyword
-' '           Text
+' '           Text.Whitespace
 'TCustomZLibStream' Name.Class
 '.'           Operator
 'Create'      Name.Function
 '('           Punctuation
 'Strm'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStream'     Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'inherited'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Create'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FStrm'       Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Strm'        Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FStrmPos'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Strm'        Name
 '.'           Operator
 'Position'    Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'TCustomZLibStream' Name.Class
 '.'           Operator
 'Progress'    Name.Function
 '('           Punctuation
 'Sender'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TObject'     Keyword.Type
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Assigned'    Name.Builtin
 '('           Punctuation
 'FOnProgress' Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'FOnProgress' Name
 '('           Punctuation
 'Sender'      Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '// TCompressionStream' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'constructor' Keyword
-' '           Text
+' '           Text.Whitespace
 'TCompressionStream' Name.Class
 '.'           Operator
 'Create'      Name.Function
 '('           Punctuation
 'CompressionLevel' Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TCompressionLevel' Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Dest'        Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStream'     Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Levels'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'TCompressionLevel' Name
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ShortInt'    Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '('           Punctuation
 'Z_NO_COMPRESSION' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_BEST_SPEED' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_DEFAULT_COMPRESSION' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_BEST_COMPRESSION' Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'inherited'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Create'      Name
 '('           Punctuation
 'Dest'        Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'next_out'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FBuffer'     Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FBuffer'     Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'CCheck'      Name
 '('           Punctuation
 'deflateInit_' Name
 '('           Punctuation
 'FZRec'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Levels'      Name
 '['           Punctuation
 'CompressionLevel' Name
 ']'           Punctuation
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'zlib_version' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FZRec'       Name
 ')))'         Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'destructor'  Keyword
-' '           Text
+' '           Text.Whitespace
 'TCompressionStream' Name.Class
 '.'           Operator
 'Destroy'     Name.Function
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'next_in'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'try'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Position'    Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'FStrmPos'    Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Position'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FStrmPos'    Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'CCheck'      Name
 '('           Punctuation
@@ -3961,153 +3961,153 @@
 '('           Punctuation
 'FZRec'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_FINISH'    Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'Z_STREAM_END' Name
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'WriteBuffer' Name
 '('           Punctuation
 'FBuffer'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FBuffer'     Name
 '))'          Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'next_out'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FBuffer'     Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FBuffer'     Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FBuffer'     Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'WriteBuffer' Name
 '('           Punctuation
 'FBuffer'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FBuffer'     Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'finally'     Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'deflateEnd'  Name
 '('           Punctuation
 'FZRec'       Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'inherited'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Destroy'     Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TCompressionStream' Name.Class
 '.'           Operator
 'Read'        Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ECompressionError' Name
 '.'           Operator
 'Create'      Name
@@ -4117,252 +4117,252 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TCompressionStream' Name.Class
 '.'           Operator
 'Write'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'next_in'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@'           Operator
 'Buffer'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Position'    Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'FStrmPos'    Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Position'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FStrmPos'    Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'FZRec'       Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'CCheck'      Name
 '('           Punctuation
 'deflate'     Name
 '('           Punctuation
 'FZRec'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'WriteBuffer' Name
 '('           Punctuation
 'FBuffer'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FBuffer'     Name
 '))'          Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'next_out'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FBuffer'     Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FBuffer'     Name
 ')'           Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FStrmPos'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Position'    Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Progress'    Name
 '('           Punctuation
 'Self'        Keyword
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TCompressionStream' Name.Class
 '.'           Operator
 'Seek'        Name.Function
 '('           Punctuation
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Origin'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Word'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Origin'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'soFromCurrent' Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'total_in'    Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ECompressionError' Name
 '.'           Operator
 'Create'      Name
@@ -4372,407 +4372,407 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TCompressionStream' Name.Class
 '.'           Operator
 'GetCompressionRate' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Single'      Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'total_in'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '1.0'         Literal.Number.Float
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'FZRec'       Name
 '.'           Operator
 'total_out'   Name
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'total_in'    Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number.Integer
 '0.0'         Literal.Number.Float
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '// TDecompressionStream' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'constructor' Keyword
-' '           Text
+' '           Text.Whitespace
 'TDecompressionStream' Name.Class
 '.'           Operator
 'Create'      Name.Function
 '('           Punctuation
 'Source'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'TStream'     Name
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'inherited'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Create'      Name
 '('           Punctuation
 'Source'      Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'next_in'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FBuffer'     Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'DCheck'      Name
 '('           Punctuation
 'inflateInit_' Name
 '('           Punctuation
 'FZRec'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'zlib_version' Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FZRec'       Name
 ')))'         Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'destructor'  Keyword
-' '           Text
+' '           Text.Whitespace
 'TDecompressionStream' Name.Class
 '.'           Operator
 'Destroy'     Name.Function
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'inflateEnd'  Name
 '('           Punctuation
 'FZRec'       Name
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'inherited'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Destroy'     Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TDecompressionStream' Name.Class
 '.'           Operator
 'Read'        Name.Function
 '('           Punctuation
 'var'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'next_out'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@'           Operator
 'Buffer'      Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Position'    Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'FStrmPos'    Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Position'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FStrmPos'    Name
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Read'        Name
 '('           Punctuation
 'FBuffer'     Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'FBuffer'     Name
 '))'          Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'begin'       Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_out'   Name
 ';'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'Exit'        Keyword
 ';'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'next_in'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FBuffer'     Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'FStrmPos'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Position'    Name
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Progress'    Name
 '('           Punctuation
 'Self'        Keyword
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'DCheck'      Name
 '('           Punctuation
 'inflate'     Name
 '('           Punctuation
 'FZRec'       Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '))'          Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TDecompressionStream' Name.Class
 '.'           Operator
 'Write'       Name.Function
 '('           Punctuation
 'const'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Buffer'      Name
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Count'       Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'EDecompressionError' Name
 '.'           Operator
 'Create'      Name
@@ -4782,87 +4782,87 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'function'    Keyword
-' '           Text
+' '           Text.Whitespace
 'TDecompressionStream' Name.Class
 '.'           Operator
 'Seek'        Name.Function
 '('           Punctuation
 'Offset'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-' '           Text
+' '           Text.Whitespace
 'Origin'      Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Word'        Keyword.Type
 ')'           Punctuation
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Longint'     Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'I'           Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Keyword.Type
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Buf'         Name
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'array'       Keyword
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 '0'           Literal.Number.Integer
 '.'           Operator
 '.'           Operator
 '4095'        Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Char'        Keyword.Type
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'begin'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Origin'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'soFromBeginning' Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'DCheck'      Name
 '('           Punctuation
 'inflateReset' Name
@@ -4870,195 +4870,195 @@
 'FZRec'       Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'next_in'     Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FBuffer'     Name
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'avail_in'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FStrm'       Name
 '.'           Operator
 'Position'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'FStrmPos'    Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Origin'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'soFromCurrent' Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '(('          Punctuation
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'total_out'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Origin'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'soFromBeginning' Name
 '))'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'begin'       Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Origin'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'soFromBeginning' Name
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Dec'         Name.Builtin
 '('           Punctuation
 'Offset'      Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'total_out'   Name
 ')'           Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'I'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 'div'         Keyword
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'Buf'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'ReadBuffer'  Name
 '('           Punctuation
 'Buf'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'Buf'         Name
 '))'          Punctuation
 ';'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'ReadBuffer'  Name
 '('           Punctuation
 'Buf'         Name
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 'Offset'      Name
-' '           Text
+' '           Text.Whitespace
 'mod'         Keyword
-' '           Text
+' '           Text.Whitespace
 'sizeof'      Name.Builtin
 '('           Punctuation
 'Buf'         Name
 '))'          Punctuation
 ';'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'EDecompressionError' Name
 '.'           Operator
 'Create'      Name
@@ -5068,22 +5068,22 @@
 "'"           Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'Result'      Name.Builtin.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'FZRec'       Name
 '.'           Operator
 'total_out'   Name
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'end'         Keyword
 '.'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/docker/docker.docker.output b/tests/examplefiles/docker/docker.docker.output
index 212c704906..2dd09318c7 100644
--- a/tests/examplefiles/docker/docker.docker.output
+++ b/tests/examplefiles/docker/docker.docker.output
@@ -1,182 +1,182 @@
 'FROM'        Keyword
 ' '           Text.Whitespace
 'alpine:3.5'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MAINTAINER'  Keyword
 ' '           Text.Whitespace
 "First O'Last" Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# comment'   Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'run'         Keyword
 ' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'  '          Text
+'  '          Text.Whitespace
 '123'         Literal.Number
-' '           Text
+' '           Text.Whitespace
 '$bar'        Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'RUN'         Keyword
 ' '           Text.Whitespace
 'apk'         Text
-' '           Text
+' '           Text.Whitespace
 '--update'    Text
-' '           Text
+' '           Text.Whitespace
 'add'         Text
-' '           Text
+' '           Text.Whitespace
 'rsync'       Text
-' '           Text
+' '           Text.Whitespace
 'dumb-init'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Test env with both syntax' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ENV'         Keyword
 ' '           Text.Whitespace
 'FOO'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"BAR"'       Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ENV'         Keyword
 ' '           Text.Whitespace
 'FOO'         Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '"BAR"'       Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'COPY'        Keyword
 ' '           Text.Whitespace
 'foo'         Text
-' '           Text
+' '           Text.Whitespace
 '"bar"'       Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'COPY'        Keyword
 ' '           Text.Whitespace
 'foo'         Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '"bar"'       Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'HEALTHCHECK' Keyword
 ' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'    '        Text
+'    '        Text.Whitespace
 '--interval'  Text
 '='           Operator
 '5m'          Text
-' '           Text
+' '           Text.Whitespace
 '--timeout'   Text
 '='           Operator
 '3s'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'    '        Text
+'    '        Text.Whitespace
 'CMD'         Keyword
 ' '           Text.Whitespace
 'curl'        Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 'http://localhost/' Text
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# ONBUILD keyword, then with linebreak' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ONBUILD'     Keyword
 ' '           Text.Whitespace
 'ADD'         Keyword
 ' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '/app/src'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ONBUILD'     Keyword
 ' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'RUN'         Keyword
 ' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '123'         Literal.Number
-' '           Text
+' '           Text.Whitespace
 '$bar'        Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Potential JSON array parsing, mixed with linebreaks' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'VOLUME'      Keyword
 ' '           Text.Whitespace
 '\\'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '/foo'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'VOLUME'      Keyword
 ' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'    '        Text
+'    '        Text.Whitespace
 '['           Punctuation
 '"/bar"'      Literal.String.Double
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'VOLUME'      Keyword
 ' '           Text.Whitespace
 '['           Punctuation
 '"/bar"'      Literal.String.Double
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'VOLUME'      Keyword
 ' '           Text.Whitespace
 '/foo'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'CMD'         Keyword
 ' '           Text.Whitespace
@@ -186,4 +186,4 @@
 ' '           Text.Whitespace
 '"bar"'       Literal.String.Double
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/evoque/test.evoque.output b/tests/examplefiles/evoque/test.evoque.output
index 7d86091e70..b05829e2ed 100644
--- a/tests/examplefiles/evoque/test.evoque.output
+++ b/tests/examplefiles/evoque/test.evoque.output
@@ -117,7 +117,7 @@
 '{'           Punctuation
 ' \n                #table_row' Literal.String
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text
 '}'           Punctuation
@@ -240,7 +240,7 @@
 '"'           Literal.String.Double
 ','           Punctuation
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'rows'        Name
diff --git a/tests/examplefiles/ezhil/ezhil_primefactors.n.output b/tests/examplefiles/ezhil/ezhil_primefactors.n.output
index fdca731c2a..481c0c683e 100644
--- a/tests/examplefiles/ezhil/ezhil_primefactors.n.output
+++ b/tests/examplefiles/ezhil/ezhil_primefactors.n.output
@@ -1,32 +1,32 @@
 '# (C) முத்தையா அண்ணாமலை 2013' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# (A) என். சொக்கன்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# எழில் தமிழ் நிரலாக்க மொழி உதாரணம்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Muthu A granted permission for this to be included under the BSD license' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# https://bitbucket.org/birkenfeld/pygments-main/pull-requests/443/ezhil-language-lexer-for-pygments/diff' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## Prime Factors Example' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## பகா எண் கூறுகளைக் கண்டறியும் உதாரணம்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## இது நிரல் தரப்பட்ட எண்ணின் பகாஎண் கூறுகளைக் கண்டறியும்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'நிரல்பாகம்'  Keyword
 ' '           Text.Whitespace
@@ -34,23 +34,23 @@
 '('           Punctuation
 'எண்1'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '## இது நிரல்பாகம் தரப்பட்ட எண் பகு எண்ணா அல்லது பகா எண்ணா என்று கண்டறிந்து சொல்லும்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '## பகுஎண் என்றால் 0 திரும்பத் தரப்படும்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '## பகாஎண் என்றால் 1 திரும்பத் தரப்படும்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '@'           Operator
@@ -63,15 +63,15 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text.Whitespace
 '## எதிர்மறை எண்களை நேராக்குதல்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'எண்1'        Name
@@ -86,15 +86,15 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '@'           Operator
@@ -107,29 +107,29 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text.Whitespace
 '## பூஜ்ஜியம், ஒன்று ஆகியவை பகா எண்கள் அல்ல' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'பின்கொடு'    Keyword
 ' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '@'           Operator
@@ -142,29 +142,29 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '## இரண்டு என்ற எண் ஒரு பகா எண்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'பின்கொடு'    Keyword
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'மீதம்'       Name
@@ -174,9 +174,9 @@
 'எண்1'        Name
 '%'           Operator
 '2'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '@'           Operator
@@ -189,29 +189,29 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '## இரட்டைப்படை எண், ஆகவே, இது பகா எண் அல்ல' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'பின்கொடு'    Keyword
 ' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'எண்1வர்க்கமூலம்' Name
@@ -221,9 +221,9 @@
 'எண்1'        Name
 '^'           Operator
 '0.5'         Literal.Number.Float
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '@'           Operator
@@ -254,9 +254,9 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆக'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 'மீதம்1'      Name
@@ -266,9 +266,9 @@
 'எண்1'        Name
 '%'           Operator
 'எண்2'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 '@'           Operator
@@ -281,48 +281,48 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 '## ஏதேனும் ஓர் எண்ணால் முழுமையாக வகுபட்டுவிட்டது, ஆகவே அது பகா எண் அல்ல' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 'பின்கொடு'    Keyword
 ' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'பின்கொடு'    Keyword
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'நிரல்பாகம்'  Keyword
 ' '           Text.Whitespace
@@ -330,15 +330,15 @@
 '('           Punctuation
 'எண்1'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '## இது எண் தரப்பட்ட எண்ணின் பகா எண் கூறுகளைக் கண்டறிந்து பட்டியல் இடும்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'கூறுகள்'     Name
@@ -348,9 +348,9 @@
 'பட்டியல்'    Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '@'           Operator
@@ -363,15 +363,15 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '## எதிர்மறை எண்களை நேராக்குதல்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'எண்1'        Name
@@ -386,15 +386,15 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '@'           Operator
@@ -407,30 +407,30 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '## ஒன்று அல்லது அதற்குக் குறைவான எண்களுக்குப் பகா எண் விகிதம் கண்டறியமுடியாது' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'பின்கொடு'    Keyword
 ' '           Text.Whitespace
 'கூறுகள்'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '@'           Operator
@@ -446,15 +446,15 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '## தரப்பட்ட எண்ணே பகா எண்ணாக அமைந்துவிட்டால், அதற்கு அதுவே பகாஎண் கூறு ஆகும்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'பின்இணை'     Name
@@ -464,21 +464,21 @@
 ' '           Text.Whitespace
 'எண்1'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'பின்கொடு'    Keyword
 ' '           Text.Whitespace
 'கூறுகள்'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'தாற்காலிகஎண்' Name
@@ -486,9 +486,9 @@
 '='           Operator
 ' '           Text.Whitespace
 'எண்1'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'எண்2'        Name
@@ -496,9 +496,9 @@
 '='           Operator
 ' '           Text.Whitespace
 '2'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '@'           Operator
@@ -511,9 +511,9 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'வரை'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'விடை1'       Name
@@ -524,7 +524,7 @@
 '('           Punctuation
 'எண்2'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'மீண்டும்தொடங்கு' Name
@@ -532,9 +532,9 @@
 '='           Operator
 ' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '@'           Operator
@@ -547,9 +547,9 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 'விடை2'       Name
@@ -559,10 +559,10 @@
 'தாற்காலிகஎண்' Name
 '%'           Operator
 'எண்2'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 '@'           Operator
@@ -575,15 +575,15 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 '## பகா எண்ணால் முழுமையாக வகுபட்டுள்ளது, அதனைப் பட்டியலில் இணைக்கிறோம்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 'பின்இணை'     Name
@@ -593,7 +593,7 @@
 ' '           Text.Whitespace
 'எண்2'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 'தாற்காலிகஎண்' Name
@@ -603,15 +603,15 @@
 'தாற்காலிகஎண்' Name
 '/'           Operator
 'எண்2'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 '## மீண்டும் இரண்டில் தொடங்கி இதே கணக்கிடுதலைத் தொடரவேண்டும்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 'எண்2'        Name
@@ -619,7 +619,7 @@
 '='           Operator
 ' '           Text.Whitespace
 '2'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 'மீண்டும்தொடங்கு' Name
@@ -627,22 +627,22 @@
 '='           Operator
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '@'           Operator
@@ -655,15 +655,15 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 '## அடுத்த எண்ணைத் தேர்ந்தெடுத்துக் கணக்கிடுதலைத் தொடரவேண்டும்' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 'எண்2'        Name
@@ -675,34 +675,34 @@
 '+'           Operator
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'பின்கொடு'    Keyword
 ' '           Text.Whitespace
 'கூறுகள்'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'அ'           Name
 ' '           Text.Whitespace
@@ -715,9 +715,9 @@
 '"உங்களுக்குப் பிடித்த ஓர் எண்ணைத் தாருங்கள்: "' Literal.String
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'பகாஎண்கூறுகள்' Name
 ' '           Text.Whitespace
@@ -726,9 +726,9 @@
 'பட்டியல்'    Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'பகாஎண்கூறுகள்' Name
 ' '           Text.Whitespace
@@ -738,9 +738,9 @@
 '('           Punctuation
 'அ'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'பதிப்பி'     Keyword
 ' '           Text.Whitespace
@@ -749,4 +749,4 @@
 ' '           Text.Whitespace
 'பகாஎண்கூறுகள்' Name
 ' '           Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/fancy/example_file.fy.output b/tests/examplefiles/fancy/example_file.fy.output
index e5b5f72ee8..537a3c61b5 100644
--- a/tests/examplefiles/fancy/example_file.fy.output
+++ b/tests/examplefiles/fancy/example_file.fy.output
@@ -1,146 +1,146 @@
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Person'      Name.Constant
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'initialize:' Name.Function
-' '           Text
+' '           Text.Whitespace
 '@name'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 'age:'        Name.Function
-' '           Text
+' '           Text.Whitespace
 '@age'        Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '"""\n    This is a docstring for the Person constructor method.\n    Docstrings usually are multi-line, like this one.\n    """' Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'to_s'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# return is optional in this case, but we use it nontheless\n' Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '"Person with name: #{@name inspect} and age: #{@age}"' Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'PersonWithCity' Name.Constant
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Person'      Name.Constant
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'initialize:' Name.Function
-' '           Text
+' '           Text.Whitespace
 '@name'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 'age:'        Name.Function
-' '           Text
+' '           Text.Whitespace
 '@age'        Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 'city:'       Name.Function
-' '           Text
+' '           Text.Whitespace
 '@city'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'to_s'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'super'       Name.Constant
-' '           Text
+' '           Text.Whitespace
 'to_s'        Name
-' '           Text
+' '           Text.Whitespace
 '++'          Operator
-' '           Text
+' '           Text.Whitespace
 '" living in: #{@city inspect}"' Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'p1'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Person'      Name.Constant
-' '           Text
+' '           Text.Whitespace
 'new:'        Name.Function
-' '           Text
+' '           Text.Whitespace
 '"Johnny Jackson"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'age:'        Name.Function
-' '           Text
+' '           Text.Whitespace
 '42'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p1'          Name
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-' '           Text
+' '           Text.Whitespace
 '# prints: Person with name: "Johnny Jackson" and age: 42\n' Comment.Single
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p2'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PersonWithCity' Name.Constant
-' '           Text
+' '           Text.Whitespace
 'new:'        Name.Function
-' '           Text
+' '           Text.Whitespace
 '"John Appleseed"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'age:'        Name.Function
-' '           Text
+' '           Text.Whitespace
 '55'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'city:'       Name.Function
-' '           Text
+' '           Text.Whitespace
 '"New York"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p2'          Name
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-' '           Text
+' '           Text.Whitespace
 '# prints: Person with name: "John Appleseed" age: 55 living in: "New York"\n' Comment.Single
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'array'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
@@ -148,38 +148,38 @@
 ','           Punctuation
 '3'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'bar"        Literal.String.Symbol
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'hash'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '<['          Operator
 "'foo"        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '=>'          Operator
-' '           Text
+' '           Text.Whitespace
 '"bar"'       Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'bar"        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '=>'          Operator
-' '           Text
+' '           Text.Whitespace
 '42'          Literal.Number.Integer
 ']>'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tuple'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
@@ -189,607 +189,607 @@
 ','           Punctuation
 '"world"'     Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'block'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'y'           Name
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'y'           Name
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'block'       Name
-' '           Text
+' '           Text.Whitespace
 'call:'       Name.Function
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '4'           Literal.Number.Integer
 ','           Punctuation
 '2'           Literal.Number.Integer
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '0b010101'    Literal.Number.Bin
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '0b00101'     Literal.Number.Bin
-' '           Text
+' '           Text.Whitespace
 'to_s:'       Name.Function
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '.'           Operator
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0xFF'        Literal.Number.Hex
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '0xAB'        Literal.Number.Hex
-' '           Text
+' '           Text.Whitespace
 'to_s:'       Name.Function
-' '           Text
+' '           Text.Whitespace
 '16'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '.'           Operator
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0o77'        Literal.Number.Oct
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0o76'        Literal.Number.Oct
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '123'         Literal.Number.Integer
 '.'           Operator
 '123'         Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '.'           Operator
 '222'         Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'try'         Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '10'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'catch'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ZeroDivisionError' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '=>'          Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
-'\n  '        Text
+'\n  '        Text.Whitespace
 'retry'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'finally'     Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '"Finally, done!"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'a_method:'   Name.Function
-' '           Text
+' '           Text.Whitespace
 'arg1'        Name
-' '           Text
+' '           Text.Whitespace
 'with_default_arg:' Name.Function
-' '           Text
+' '           Text.Whitespace
 'arg2'        Name
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '42'          Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'arg1'        Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'arg2'        Name
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'a_method:'   Name.Function
-' '           Text
+' '           Text.Whitespace
 '42'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a_method:'   Name.Function
-' '           Text
+' '           Text.Whitespace
 '42'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'with_default_arg:' Name.Function
-' '           Text
+' '           Text.Whitespace
 '85'          Literal.Number.Integer
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ClassWithClassMethod' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Constant
-' '           Text
+' '           Text.Whitespace
 'class_method1' Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'works"      Literal.String.Symbol
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ClassWithClassMethod' Name.Constant
-' '           Text
+' '           Text.Whitespace
 'class_method2' Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 "'this_as_well" Literal.String.Symbol
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ClassWithClassMethod' Name.Constant
-' '           Text
+' '           Text.Whitespace
 'class_method1' Name
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ClassWithClassMethod' Name.Constant
-' '           Text
+' '           Text.Whitespace
 'class_method2' Name
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'another_method:' Name.Function
-' '           Text
+' '           Text.Whitespace
 'block'       Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'upto:'       Name.Function
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '.'           Operator
-' '           Text
+' '           Text.Whitespace
 'map:'        Name.Function
-' '           Text
+' '           Text.Whitespace
 'block'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# local returns\n' Comment.Single
 
 'another_method:' Name.Function
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
 'x'           Name
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return_local' Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '.'           Operator
-' '           Text
+' '           Text.Whitespace
 'inspect'     Name
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# pattern matching:\n' Comment.Single
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'PatternMatching' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'match_it:'   Name.Function
-' '           Text
+' '           Text.Whitespace
 'obj'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'match'       Keyword
-' '           Text
+' '           Text.Whitespace
 'obj'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '->'          Operator
-' '           Text
+' '           Text.Whitespace
 '"It\'s a String!"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Fixnum'      Name.Constant
-' '           Text
+' '           Text.Whitespace
 '->'          Operator
-' '           Text
+' '           Text.Whitespace
 '"It\'s a Number!"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '_'           Name
-' '           Text
+' '           Text.Whitespace
 '->'          Operator
-' '           Text
+' '           Text.Whitespace
 '"Aything else!"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'match_with_extract:' Name.Function
-' '           Text
+' '           Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'match'       Keyword
-' '           Text
+' '           Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# m holds the MatchData object, m1 & m2 the first and second matches\n' Comment.Single
 
-'      '      Text
+'      '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '/^(.*) : (.*)$/' Literal.String.Regex
-' '           Text
+' '           Text.Whitespace
 '->'          Operator
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
 'm'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'm1'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'm2'          Name
 '|'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '"First match: #{m1}"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 '"Second match: #{m2}"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'pm'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PatternMatching' Name.Constant
-' '           Text
+' '           Text.Whitespace
 'new'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pm'          Name
-' '           Text
+' '           Text.Whitespace
 'match_it:'   Name.Function
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pm'          Name
-' '           Text
+' '           Text.Whitespace
 'match_it:'   Name.Function
-' '           Text
+' '           Text.Whitespace
 '42'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pm'          Name
-' '           Text
+' '           Text.Whitespace
 'match_it:'   Name.Function
-' '           Text
+' '           Text.Whitespace
 "'foo"        Literal.String.Symbol
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'pm'          Name
-' '           Text
+' '           Text.Whitespace
 'match_with_extract:' Name.Function
-' '           Text
+' '           Text.Whitespace
 '"Hello : World!"' Literal.String
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# calling ruby methods:\n' Comment.Single
 
 '['           Operator
 '3'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 'reverse'     Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'each'        Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
 'a'           Name
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'puts'        Name
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Hello"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'sub'         Name
 '('           Punctuation
 '"ll"'        Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"y"'         Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '['           Operator
 '3'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 'map'         Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
 'a'           Name
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'inject'      Name
 '('           Punctuation
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
 's'           Name
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 's'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# test symbol highlighting\n' Comment.Single
 
 '['           Operator
 "'foo"        Literal.String.Symbol
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '['           Operator
 "'foo?!"      Literal.String.Symbol
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
 "'foo"        Literal.String.Symbol
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
 "'foo!?"      Literal.String.Symbol
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
 "'foo:bar?!=&/:" Literal.String.Symbol
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '('           Punctuation
 "'foo"        Literal.String.Symbol
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# future sends\n' Comment.Single
 
 '42'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '@'           Operator
-' '           Text
+' '           Text.Whitespace
 'to_s'        Name
-' '           Text
+' '           Text.Whitespace
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '42'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '@'           Operator
-' '           Text
+' '           Text.Whitespace
 'to_s:'       Name.Function
-' '           Text
+' '           Text.Whitespace
 '16'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '.'           Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# async sends\n' Comment.Single
 
 '42'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '@@'          Operator
-' '           Text
+' '           Text.Whitespace
 'println'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '42'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '@@'          Operator
-' '           Text
+' '           Text.Whitespace
 'upto:'       Name.Function
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/fift/new-wallet-v3.fif b/tests/examplefiles/fift/new-wallet-v3.fif
new file mode 100644
index 0000000000..af1f94d8ba
--- /dev/null
+++ b/tests/examplefiles/fift/new-wallet-v3.fif
@@ -0,0 +1,44 @@
+"TonUtil.fif" include
+"Asm\".fif" include
+
+0x01 0xaC 0b0001 b{0101} x{eBac0c} B{eBaC0C}
+
+{ ."usage: " $0 type ." <workchain-id> <wallet-id> [<filename-base>]" cr
+  ."Creates a new advanced wallet with unique 32-bit identifier <wallet-id> in specified workchain, with private key saved to or loaded from <filename-base>.pk" cr
+  ."('new-wallet.pk' by default)" cr 1 halt
+} : usage
+$# 2- -2 and ' usage if
+
+3 :$1..n
+$1 parse-workchain-id =: wc    // set workchain id from command line argument
+$2 parse-int =: subwallet-id
+$3 "new-wallet" replace-if-null =: file-base
+
+."Creating new advanced v3 wallet in workchain " wc . cr
+."with unique wallet id " subwallet-id . cr
+
+// Create new advanced wallet; code adapted from `auto/wallet3-code.fif`
+"wallet-v3-code.fif" include
+// >libref
+// code
+<b 0 32 u, subwallet-id 32 u,
+   file-base +".pk" load-generate-keypair
+   constant wallet_pk
+   B, 
+b> // data
+null // no libraries
+<b b{0011} s, 3 roll ref, rot ref, swap dict, b>  // create StateInit
+dup ."StateInit: " <s csr. cr
+dup hashu wc swap 2dup 2constant wallet_addr
+."new wallet address = " 2dup .addr cr
+2dup file-base +".addr" save-address-verbose
+."Non-bounceable address (for init): " 2dup 7 .Addr cr
+."Bounceable address (for later access): " 6 .Addr cr
+<b subwallet-id 32 u, -1 32 i, 0 32 u, b>
+dup ."signing message: " <s csr. cr
+dup hashu wallet_pk ed25519_sign_uint rot
+<b b{1000100} s, wallet_addr addr, b{000010} s, swap <s s, b{0} s, swap B, swap <s s, b>
+dup ."External message for initialization is " <s csr. cr
+2 boc+>B dup Bx. cr
+file-base +"-query.boc" tuck B>file
+."(Saved wallet creating query to file " type .")" cr
diff --git a/tests/examplefiles/fift/new-wallet-v3.fif.output b/tests/examplefiles/fift/new-wallet-v3.fif.output
new file mode 100644
index 0000000000..2d8f5f9ba1
--- /dev/null
+++ b/tests/examplefiles/fift/new-wallet-v3.fif.output
@@ -0,0 +1,435 @@
+'"'           Literal.String
+'TonUtil.fif' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'include'     Name
+'\n'          Text.Whitespace
+
+'"'           Literal.String
+'Asm'         Literal.String
+'\\"'         Literal.String.Escape
+'.fif'        Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'include'     Name
+'\n\n'        Text.Whitespace
+
+'0x01'        Literal.Number.Hex
+' '           Text.Whitespace
+'0xaC'        Literal.Number.Hex
+' '           Text.Whitespace
+'0b0001'      Literal.Number.Bin
+' '           Text.Whitespace
+'b{0101}'     Literal
+' '           Text.Whitespace
+'x{eBac0c}'   Literal
+' '           Text.Whitespace
+'B{eBaC0C}'   Literal
+'\n\n'        Text.Whitespace
+
+'{'           Name
+' '           Text.Whitespace
+'."'          Literal.String
+'usage: '     Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'$0'          Name
+' '           Text.Whitespace
+'type'        Name
+' '           Text.Whitespace
+'."'          Literal.String
+' <workchain-id> <wallet-id> [<filename-base>]' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'cr'          Name
+'\n  '        Text.Whitespace
+'."'          Literal.String
+'Creates a new advanced wallet with unique 32-bit identifier <wallet-id> in specified workchain, with private key saved to or loaded from <filename-base>.pk' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'cr'          Name
+'\n  '        Text.Whitespace
+'."'          Literal.String
+"('new-wallet.pk' by default)" Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'cr'          Name
+' '           Text.Whitespace
+'1'           Literal.Number.Decimal
+' '           Text.Whitespace
+'halt'        Name
+'\n'          Text.Whitespace
+
+'}'           Name
+' '           Text.Whitespace
+':'           Name
+' '           Text.Whitespace
+'usage'       Name
+'\n'          Text.Whitespace
+
+'$#'          Name
+' '           Text.Whitespace
+'2'           Literal.Number.Decimal
+'-'           Name
+' '           Text.Whitespace
+'-2'          Literal.Number.Decimal
+' '           Text.Whitespace
+'and'         Name
+' '           Text.Whitespace
+"'"           Name
+' '           Text.Whitespace
+'usage'       Name
+' '           Text.Whitespace
+'if'          Name
+'\n\n'        Text.Whitespace
+
+'3'           Literal.Number.Decimal
+' '           Text.Whitespace
+':$1..n'      Name
+'\n'          Text.Whitespace
+
+'$1'          Name
+' '           Text.Whitespace
+'parse-workchain-id' Name
+' '           Text.Whitespace
+'=:'          Name
+' '           Text.Whitespace
+'wc'          Name
+'    '        Text.Whitespace
+'// set workchain id from command line argument' Comment.Singleline
+'\n'          Text.Whitespace
+
+'$2'          Name
+' '           Text.Whitespace
+'parse-int'   Name
+' '           Text.Whitespace
+'=:'          Name
+' '           Text.Whitespace
+'subwallet-id' Name
+'\n'          Text.Whitespace
+
+'$3'          Name
+' '           Text.Whitespace
+'"'           Literal.String
+'new-wallet'  Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'replace-if-null' Name
+' '           Text.Whitespace
+'=:'          Name
+' '           Text.Whitespace
+'file-base'   Name
+'\n\n'        Text.Whitespace
+
+'."'          Literal.String
+'Creating new advanced v3 wallet in workchain ' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'wc'          Name
+' '           Text.Whitespace
+'.'           Name
+' '           Text.Whitespace
+'cr'          Name
+'\n'          Text.Whitespace
+
+'."'          Literal.String
+'with unique wallet id ' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'subwallet-id' Name
+' '           Text.Whitespace
+'.'           Name
+' '           Text.Whitespace
+'cr'          Name
+'\n\n'        Text.Whitespace
+
+'// Create new advanced wallet; code adapted from `auto/wallet3-code.fif`' Comment.Singleline
+'\n'          Text.Whitespace
+
+'"'           Literal.String
+'wallet-v3-code.fif' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'include'     Name
+'\n'          Text.Whitespace
+
+'// >libref'  Comment.Singleline
+'\n'          Text.Whitespace
+
+'// code'     Comment.Singleline
+'\n'          Text.Whitespace
+
+'<b'          Name
+' '           Text.Whitespace
+'0'           Literal.Number.Decimal
+' '           Text.Whitespace
+'32'          Literal.Number.Decimal
+' '           Text.Whitespace
+'u,'          Name
+' '           Text.Whitespace
+'subwallet-id' Name
+' '           Text.Whitespace
+'32'          Literal.Number.Decimal
+' '           Text.Whitespace
+'u,'          Name
+'\n   '       Text.Whitespace
+'file-base'   Name
+' '           Text.Whitespace
+'+"'          Literal.String
+'.pk'         Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'load-generate-keypair' Name
+'\n   '       Text.Whitespace
+'constant'    Name
+' '           Text.Whitespace
+'wallet_pk'   Name
+'\n   '       Text.Whitespace
+'B,'          Name
+' \n'         Text.Whitespace
+
+'b>'          Name
+' '           Text.Whitespace
+'// data'     Comment.Singleline
+'\n'          Text.Whitespace
+
+'null'        Name
+' '           Text.Whitespace
+'// no libraries' Comment.Singleline
+'\n'          Text.Whitespace
+
+'<b'          Name
+' '           Text.Whitespace
+'b{0011}'     Literal
+' '           Text.Whitespace
+'s,'          Name
+' '           Text.Whitespace
+'3'           Literal.Number.Decimal
+' '           Text.Whitespace
+'roll'        Name
+' '           Text.Whitespace
+'ref,'        Name
+' '           Text.Whitespace
+'rot'         Name
+' '           Text.Whitespace
+'ref,'        Name
+' '           Text.Whitespace
+'swap'        Name
+' '           Text.Whitespace
+'dict,'       Name
+' '           Text.Whitespace
+'b>'          Name
+'  '          Text.Whitespace
+'// create StateInit' Comment.Singleline
+'\n'          Text.Whitespace
+
+'dup'         Name
+' '           Text.Whitespace
+'."'          Literal.String
+'StateInit: ' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'<s'          Name
+' '           Text.Whitespace
+'csr.'        Name
+' '           Text.Whitespace
+'cr'          Name
+'\n'          Text.Whitespace
+
+'dup'         Name
+' '           Text.Whitespace
+'hashu'       Name
+' '           Text.Whitespace
+'wc'          Name
+' '           Text.Whitespace
+'swap'        Name
+' '           Text.Whitespace
+'2'           Literal.Number.Decimal
+'dup'         Name
+' '           Text.Whitespace
+'2'           Literal.Number.Decimal
+'constant'    Name
+' '           Text.Whitespace
+'wallet_addr' Name
+'\n'          Text.Whitespace
+
+'."'          Literal.String
+'new wallet address = ' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'2'           Literal.Number.Decimal
+'dup'         Name
+' '           Text.Whitespace
+'.addr'       Name
+' '           Text.Whitespace
+'cr'          Name
+'\n'          Text.Whitespace
+
+'2'           Literal.Number.Decimal
+'dup'         Name
+' '           Text.Whitespace
+'file-base'   Name
+' '           Text.Whitespace
+'+"'          Literal.String
+'.addr'       Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'save-address-verbose' Name
+'\n'          Text.Whitespace
+
+'."'          Literal.String
+'Non-bounceable address (for init): ' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'2'           Literal.Number.Decimal
+'dup'         Name
+' '           Text.Whitespace
+'7'           Literal.Number.Decimal
+' '           Text.Whitespace
+'.Addr'       Name
+' '           Text.Whitespace
+'cr'          Name
+'\n'          Text.Whitespace
+
+'."'          Literal.String
+'Bounceable address (for later access): ' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'6'           Literal.Number.Decimal
+' '           Text.Whitespace
+'.Addr'       Name
+' '           Text.Whitespace
+'cr'          Name
+'\n'          Text.Whitespace
+
+'<b'          Name
+' '           Text.Whitespace
+'subwallet-id' Name
+' '           Text.Whitespace
+'32'          Literal.Number.Decimal
+' '           Text.Whitespace
+'u,'          Name
+' '           Text.Whitespace
+'-1'          Literal.Number.Decimal
+' '           Text.Whitespace
+'32'          Literal.Number.Decimal
+' '           Text.Whitespace
+'i,'          Name
+' '           Text.Whitespace
+'0'           Literal.Number.Decimal
+' '           Text.Whitespace
+'32'          Literal.Number.Decimal
+' '           Text.Whitespace
+'u,'          Name
+' '           Text.Whitespace
+'b>'          Name
+'\n'          Text.Whitespace
+
+'dup'         Name
+' '           Text.Whitespace
+'."'          Literal.String
+'signing message: ' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'<s'          Name
+' '           Text.Whitespace
+'csr.'        Name
+' '           Text.Whitespace
+'cr'          Name
+'\n'          Text.Whitespace
+
+'dup'         Name
+' '           Text.Whitespace
+'hashu'       Name
+' '           Text.Whitespace
+'wallet_pk'   Name
+' '           Text.Whitespace
+'ed25519_sign_uint' Name
+' '           Text.Whitespace
+'rot'         Name
+'\n'          Text.Whitespace
+
+'<b'          Name
+' '           Text.Whitespace
+'b{1000100}'  Literal
+' '           Text.Whitespace
+'s,'          Name
+' '           Text.Whitespace
+'wallet_addr' Name
+' '           Text.Whitespace
+'addr,'       Name
+' '           Text.Whitespace
+'b{000010}'   Literal
+' '           Text.Whitespace
+'s,'          Name
+' '           Text.Whitespace
+'swap'        Name
+' '           Text.Whitespace
+'<s'          Name
+' '           Text.Whitespace
+'s,'          Name
+' '           Text.Whitespace
+'b{0}'        Literal
+' '           Text.Whitespace
+'s,'          Name
+' '           Text.Whitespace
+'swap'        Name
+' '           Text.Whitespace
+'B,'          Name
+' '           Text.Whitespace
+'swap'        Name
+' '           Text.Whitespace
+'<s'          Name
+' '           Text.Whitespace
+'s,'          Name
+' '           Text.Whitespace
+'b>'          Name
+'\n'          Text.Whitespace
+
+'dup'         Name
+' '           Text.Whitespace
+'."'          Literal.String
+'External message for initialization is ' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'<s'          Name
+' '           Text.Whitespace
+'csr.'        Name
+' '           Text.Whitespace
+'cr'          Name
+'\n'          Text.Whitespace
+
+'2'           Literal.Number.Decimal
+' '           Text.Whitespace
+'boc+>B'      Name
+' '           Text.Whitespace
+'dup'         Name
+' '           Text.Whitespace
+'Bx.'         Name
+' '           Text.Whitespace
+'cr'          Name
+'\n'          Text.Whitespace
+
+'file-base'   Name
+' '           Text.Whitespace
+'+"'          Literal.String
+'-query.boc'  Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'tuck'        Name
+' '           Text.Whitespace
+'B>file'      Name
+'\n'          Text.Whitespace
+
+'."'          Literal.String
+'(Saved wallet creating query to file ' Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'type'        Name
+' '           Text.Whitespace
+'."'          Literal.String
+')'           Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'cr'          Name
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/func/test.fc b/tests/examplefiles/func/test.fc
new file mode 100644
index 0000000000..b196a6b491
--- /dev/null
+++ b/tests/examplefiles/func/test.fc
@@ -0,0 +1,52 @@
+#include "../";
+#pragma version >=1.0.0;
+
+global int k_const;
+const int k = 1;
+
+() recv_internal(int my_balance, int msg_value, cell in_msg_full, slice in_msg_body) impure {
+    slice cs = in_msg_full.begin_parse();
+    int flags = cs~load_uint(0x4_1_0);
+
+    if ((flags & 1) == true) { ;; ignore all bounced messages
+        return ();
+    }
+
+    slice sender_address = cs~load_msg_addr();
+
+    {-
+    {-
+    test - is test
+    -}
+    -}
+
+    ;; Send message
+    var message = begin_cell()
+        .store_uint(0x18, 6)
+        .store_slice(sender_address)
+        .store_coins(0)
+        .store_uint(0, 1 + 4 + 4 + 64 + 32 + 1 + 1)
+        .store_slice("Hello, world!"s)
+        .end_cell();
+
+    send_raw_message(message, 64);
+
+    ;; Update counter
+    var cs = get_data().begin_parse();
+    var counter = data~load_uint(32);
+
+    store_data(
+        begin_cell()
+            .store_uint(counter + 1, 32)
+        .end_cell()
+    );
+}
+
+() recv_external(slice in_msg) impure {
+    throw(0xffff);
+}
+
+int counter() method_id {
+    var data = get_data().begin_parse();
+    return data~load_uint(32);
+}
\ No newline at end of file
diff --git a/tests/examplefiles/func/test.fc.output b/tests/examplefiles/func/test.fc.output
new file mode 100644
index 0000000000..39358e23e5
--- /dev/null
+++ b/tests/examplefiles/func/test.fc.output
@@ -0,0 +1,429 @@
+'#include'    Keyword
+' '           Text.Whitespace
+'"../"'       Literal.String
+';'           Text
+'\n'          Text.Whitespace
+
+'#pragma'     Keyword
+' '           Text.Whitespace
+'version'     Keyword
+' '           Text.Whitespace
+'>=1.0.0'     Literal.Number
+';'           Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'global'      Keyword.Constant
+' '           Text.Whitespace
+'int'         Keyword.Type
+' '           Text.Whitespace
+'k_const'     Name.Variable
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'const'       Keyword.Constant
+' '           Text.Whitespace
+'int'         Keyword.Type
+' '           Text.Whitespace
+'k'           Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'('           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'recv_internal' Name.Function
+'('           Punctuation
+'int'         Keyword.Type
+' '           Text.Whitespace
+'my_balance'  Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'int'         Keyword.Type
+' '           Text.Whitespace
+'msg_value'   Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'cell'        Keyword.Type
+' '           Text.Whitespace
+'in_msg_full' Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'slice'       Keyword.Type
+' '           Text.Whitespace
+'in_msg_body' Name.Variable
+')'           Punctuation
+' '           Text.Whitespace
+'impure'      Keyword
+' '           Text.Whitespace
+'{'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'slice'       Keyword.Type
+' '           Text.Whitespace
+'cs'          Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'in_msg_full' Name.Variable
+'.'           Punctuation
+'begin_parse' Name.Function
+'('           Punctuation
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'int'         Keyword.Type
+' '           Text.Whitespace
+'flags'       Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'cs'          Name.Variable
+'~'           Punctuation
+'load_uint'   Name.Function
+'('           Punctuation
+'0x4_1_0'     Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'if'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'('           Punctuation
+'flags'       Name.Variable
+' '           Text.Whitespace
+'&'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'=='          Operator
+' '           Text.Whitespace
+'true'        Keyword.Constant
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+';; ignore all bounced messages' Comment.Singleline
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'return'      Keyword
+' '           Text.Whitespace
+'('           Punctuation
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'slice'       Keyword.Type
+' '           Text.Whitespace
+'sender_address' Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'cs'          Name.Variable
+'~'           Punctuation
+'load_msg_addr' Name.Function
+'('           Punctuation
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'{-'          Comment.Multiline
+'\n    '      Comment.Multiline
+'{-'          Comment.Multiline
+'\n    test ' Comment.Multiline
+'-'           Comment.Multiline
+' is test\n    ' Comment.Multiline
+'-}'          Comment.Multiline
+'\n    '      Comment.Multiline
+'-}'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+';; Send message' Comment.Singleline
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'var'         Keyword.Type
+' '           Text.Whitespace
+'message'     Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'begin_cell'  Name.Function
+'('           Punctuation
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'.'           Punctuation
+'store_uint'  Name.Function
+'('           Punctuation
+'0x18'        Literal.Number
+','           Punctuation
+' '           Text.Whitespace
+'6'           Literal.Number
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'.'           Punctuation
+'store_slice' Name.Function
+'('           Punctuation
+'sender_address' Name.Variable
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'.'           Punctuation
+'store_coins' Name.Function
+'('           Punctuation
+'0'           Literal.Number
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'.'           Punctuation
+'store_uint'  Name.Function
+'('           Punctuation
+'0'           Literal.Number
+','           Punctuation
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'4'           Literal.Number
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'4'           Literal.Number
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'64'          Literal.Number
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'32'          Literal.Number
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'.'           Punctuation
+'store_slice' Name.Function
+'('           Punctuation
+'"Hello, world!"s' Literal.String
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'.'           Punctuation
+'end_cell'    Name.Function
+'('           Punctuation
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'send_raw_message' Name.Function
+'('           Punctuation
+'message'     Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'64'          Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+';; Update counter' Comment.Singleline
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'var'         Keyword.Type
+' '           Text.Whitespace
+'cs'          Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'get_data'    Name.Function
+'('           Punctuation
+')'           Punctuation
+'.'           Punctuation
+'begin_parse' Name.Function
+'('           Punctuation
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'var'         Keyword.Type
+' '           Text.Whitespace
+'counter'     Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'data'        Name.Variable
+'~'           Punctuation
+'load_uint'   Name.Function
+'('           Punctuation
+'32'          Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'store_data'  Name.Function
+'('           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'begin_cell'  Name.Function
+'('           Punctuation
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'            ' Text.Whitespace
+'.'           Punctuation
+'store_uint'  Name.Function
+'('           Punctuation
+'counter'     Name.Variable
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+','           Punctuation
+' '           Text.Whitespace
+'32'          Literal.Number
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'.'           Punctuation
+'end_cell'    Name.Function
+'('           Punctuation
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'('           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'recv_external' Name.Function
+'('           Punctuation
+'slice'       Keyword.Type
+' '           Text.Whitespace
+'in_msg'      Name.Variable
+')'           Punctuation
+' '           Text.Whitespace
+'impure'      Keyword
+' '           Text.Whitespace
+'{'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'throw'       Name.Function
+'('           Punctuation
+'0xffff'      Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'int'         Keyword.Type
+' '           Text.Whitespace
+'counter'     Name.Function
+'('           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'method_id'   Keyword
+' '           Text.Whitespace
+'{'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'var'         Keyword.Type
+' '           Text.Whitespace
+'data'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'get_data'    Name.Function
+'('           Punctuation
+')'           Punctuation
+'.'           Punctuation
+'begin_parse' Name.Function
+'('           Punctuation
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'return'      Keyword
+' '           Text.Whitespace
+'data'        Name.Variable
+'~'           Punctuation
+'load_uint'   Name.Function
+'('           Punctuation
+'32'          Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/gap-repl/euclidean.tst b/tests/examplefiles/gap-repl/euclidean.tst
new file mode 100644
index 0000000000..ca3b3285db
--- /dev/null
+++ b/tests/examplefiles/gap-repl/euclidean.tst
@@ -0,0 +1,60 @@
+#@local checkEuclideanRing
+gap> START_TEST("euclidean.tst");
+
+# test consistency of EuclideanDegree, EuclideanQuotient, EuclideanRemainder,
+# and QuotientRemainder for some ring and elements of it
+gap> checkEuclideanRing :=
+> function(R, colls...)
+>   local coll1, coll2, a, b, deg_b, deg_r, q, r, qr;
+>   if Length(colls) >= 1 then coll1:=colls[1];
+>   elif Size(R) <= 100 then coll1 := R;
+>   else coll1 := List([1..100],i->Random(R));
+>   fi;
+>   if Length(colls) >= 2 then coll2:=colls[2];
+>   elif Size(R) <= 100 then coll2 := R;
+>   else coll2 := List([1..100],i->Random(R));
+>   fi;
+>   for b in coll1 do
+>     if IsZero(b) then continue; fi;
+>     deg_b := EuclideanDegree(R, b);
+>     for a in coll2 do
+>       q := EuclideanQuotient(R, a, b); Assert(0, q in R);
+>       r := EuclideanRemainder(R, a, b); Assert(0, r in R);
+>       if a <> q*b + r then Error("a <> q*b + r for ", [R,a,b]); fi;
+>       deg_r := EuclideanDegree(R, r);
+>       if not IsZero(r) and deg_r >= deg_b then Error("Euclidean degree did not decrease for ",[R,a,b]); fi;
+>       qr := QuotientRemainder(R, a, b);
+>       if qr <> [q, r] then Error("QuotientRemainder inconsistent for ", [R,a,b]); fi;
+>     od;
+>   od;
+>   return true;
+> end;;
+
+# rings in characteristic 0
+gap> checkEuclideanRing(Integers,[-100..100],[-100..100]);
+true
+gap> checkEuclideanRing(Rationals);
+true
+gap> checkEuclideanRing(GaussianIntegers);
+true
+gap> checkEuclideanRing(GaussianRationals);
+true
+
+# finite fields
+gap> ForAll(Filtered([2..50], IsPrimePowerInt), q->checkEuclideanRing(GF(q)));
+true
+
+# ZmodnZ
+gap> ForAll([1..50], m -> checkEuclideanRing(Integers mod m));
+true
+gap> checkEuclideanRing(Integers mod ((2*3*5)^2));
+true
+gap> checkEuclideanRing(Integers mod ((2*3*5)^3));
+true
+gap> checkEuclideanRing(Integers mod ((2*3*5*7)^2));
+true
+gap> checkEuclideanRing(Integers mod ((2*3*5*7)^3));
+true
+
+#
+gap> STOP_TEST( "euclidean.tst", 1);
diff --git a/tests/examplefiles/gap-repl/euclidean.tst.output b/tests/examplefiles/gap-repl/euclidean.tst.output
new file mode 100644
index 0000000000..62a0b2a1c8
--- /dev/null
+++ b/tests/examplefiles/gap-repl/euclidean.tst.output
@@ -0,0 +1,838 @@
+'#@local checkEuclideanRing\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'START_TEST'  Name.Variable
+'('           Punctuation
+'"euclidean.tst"' Literal.String
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'\n'          Generic.Output
+
+'# test consistency of EuclideanDegree, EuclideanQuotient, EuclideanRemainder,\n' Generic.Output
+
+'# and QuotientRemainder for some ring and elements of it\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'checkEuclideanRing' Name.Variable
+' '           Text
+':='          Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+'function'    Keyword
+'('           Punctuation
+'R'           Name.Variable
+','           Operator
+' '           Text
+'colls'       Name.Variable
+'.'           Operator
+'.'           Operator
+'.'           Operator
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'local'       Keyword
+' '           Text
+'coll1'       Name.Variable
+','           Operator
+' '           Text
+'coll2'       Name.Variable
+','           Operator
+' '           Text
+'a'           Name.Variable
+','           Operator
+' '           Text
+'b'           Name.Variable
+','           Operator
+' '           Text
+'deg_b'       Name.Variable
+','           Operator
+' '           Text
+'deg_r'       Name.Variable
+','           Operator
+' '           Text
+'q'           Name.Variable
+','           Operator
+' '           Text
+'r'           Name.Variable
+','           Operator
+' '           Text
+'qr'          Name.Variable
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'if'          Keyword
+' '           Text
+'Length'      Name.Variable
+'('           Punctuation
+'colls'       Name.Variable
+')'           Punctuation
+' '           Text
+'>'           Operator
+'='           Operator
+' '           Text
+'1'           Name.Variable
+' '           Text
+'then'        Keyword
+' '           Text
+'coll1'       Name.Variable
+':='          Operator
+'colls'       Name.Variable
+'['           Punctuation
+'1'           Name.Variable
+']'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'elif'        Keyword
+' '           Text
+'Size'        Name.Variable
+'('           Punctuation
+'R'           Name.Variable
+')'           Punctuation
+' '           Text
+'<'           Operator
+'='           Operator
+' '           Text
+'100'         Name.Variable
+' '           Text
+'then'        Keyword
+' '           Text
+'coll1'       Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'R'           Name.Variable
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'else'        Keyword
+' '           Text
+'coll1'       Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'List'        Name.Variable
+'('           Punctuation
+'['           Punctuation
+'1'           Name.Variable
+'.'           Operator
+'.'           Operator
+'100'         Name.Variable
+']'           Punctuation
+','           Operator
+'i'           Name.Variable
+'-'           Operator
+'>'           Operator
+'Random'      Name.Variable
+'('           Punctuation
+'R'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'fi'          Keyword
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'if'          Keyword
+' '           Text
+'Length'      Name.Variable
+'('           Punctuation
+'colls'       Name.Variable
+')'           Punctuation
+' '           Text
+'>'           Operator
+'='           Operator
+' '           Text
+'2'           Name.Variable
+' '           Text
+'then'        Keyword
+' '           Text
+'coll2'       Name.Variable
+':='          Operator
+'colls'       Name.Variable
+'['           Punctuation
+'2'           Name.Variable
+']'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'elif'        Keyword
+' '           Text
+'Size'        Name.Variable
+'('           Punctuation
+'R'           Name.Variable
+')'           Punctuation
+' '           Text
+'<'           Operator
+'='           Operator
+' '           Text
+'100'         Name.Variable
+' '           Text
+'then'        Keyword
+' '           Text
+'coll2'       Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'R'           Name.Variable
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'else'        Keyword
+' '           Text
+'coll2'       Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'List'        Name.Variable
+'('           Punctuation
+'['           Punctuation
+'1'           Name.Variable
+'.'           Operator
+'.'           Operator
+'100'         Name.Variable
+']'           Punctuation
+','           Operator
+'i'           Name.Variable
+'-'           Operator
+'>'           Operator
+'Random'      Name.Variable
+'('           Punctuation
+'R'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'fi'          Keyword
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'for'         Keyword
+' '           Text
+'b'           Name.Variable
+' '           Text
+'in'          Operator.Word
+' '           Text
+'coll1'       Name.Variable
+' '           Text
+'do'          Keyword
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'if'          Keyword
+' '           Text
+'IsZero'      Name.Variable
+'('           Punctuation
+'b'           Name.Variable
+')'           Punctuation
+' '           Text
+'then'        Keyword
+' '           Text
+'continue'    Keyword
+';'           Operator
+' '           Text
+'fi'          Keyword
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'deg_b'       Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'EuclideanDegree' Name.Variable
+'('           Punctuation
+'R'           Name.Variable
+','           Operator
+' '           Text
+'b'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'for'         Keyword
+' '           Text
+'a'           Name.Variable
+' '           Text
+'in'          Operator.Word
+' '           Text
+'coll2'       Name.Variable
+' '           Text
+'do'          Keyword
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'q'           Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'EuclideanQuotient' Name.Variable
+'('           Punctuation
+'R'           Name.Variable
+','           Operator
+' '           Text
+'a'           Name.Variable
+','           Operator
+' '           Text
+'b'           Name.Variable
+')'           Punctuation
+';'           Operator
+' '           Text
+'Assert'      Keyword
+'('           Punctuation
+'0'           Name.Variable
+','           Operator
+' '           Text
+'q'           Name.Variable
+' '           Text
+'in'          Operator.Word
+' '           Text
+'R'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'r'           Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'EuclideanRemainder' Name.Variable
+'('           Punctuation
+'R'           Name.Variable
+','           Operator
+' '           Text
+'a'           Name.Variable
+','           Operator
+' '           Text
+'b'           Name.Variable
+')'           Punctuation
+';'           Operator
+' '           Text
+'Assert'      Keyword
+'('           Punctuation
+'0'           Name.Variable
+','           Operator
+' '           Text
+'r'           Name.Variable
+' '           Text
+'in'          Operator.Word
+' '           Text
+'R'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'if'          Keyword
+' '           Text
+'a'           Name.Variable
+' '           Text
+'<'           Operator
+'>'           Operator
+' '           Text
+'q'           Name.Variable
+'*'           Operator
+'b'           Name.Variable
+' '           Text
+'+'           Operator
+' '           Text
+'r'           Name.Variable
+' '           Text
+'then'        Keyword
+' '           Text
+'Error'       Name.Variable
+'('           Punctuation
+'"a <> q*b + r for "' Literal.String
+','           Operator
+' '           Text
+'['           Punctuation
+'R'           Name.Variable
+','           Operator
+'a'           Name.Variable
+','           Operator
+'b'           Name.Variable
+']'           Punctuation
+')'           Punctuation
+';'           Operator
+' '           Text
+'fi'          Keyword
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'deg_r'       Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'EuclideanDegree' Name.Variable
+'('           Punctuation
+'R'           Name.Variable
+','           Operator
+' '           Text
+'r'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'if'          Keyword
+' '           Text
+'not'         Operator.Word
+' '           Text
+'IsZero'      Name.Variable
+'('           Punctuation
+'r'           Name.Variable
+')'           Punctuation
+' '           Text
+'and'         Operator.Word
+' '           Text
+'deg_r'       Name.Variable
+' '           Text
+'>'           Operator
+'='           Operator
+' '           Text
+'deg_b'       Name.Variable
+' '           Text
+'then'        Keyword
+' '           Text
+'Error'       Name.Variable
+'('           Punctuation
+'"Euclidean degree did not decrease for "' Literal.String
+','           Operator
+'['           Punctuation
+'R'           Name.Variable
+','           Operator
+'a'           Name.Variable
+','           Operator
+'b'           Name.Variable
+']'           Punctuation
+')'           Punctuation
+';'           Operator
+' '           Text
+'fi'          Keyword
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'qr'          Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'QuotientRemainder' Name.Variable
+'('           Punctuation
+'R'           Name.Variable
+','           Operator
+' '           Text
+'a'           Name.Variable
+','           Operator
+' '           Text
+'b'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'if'          Keyword
+' '           Text
+'qr'          Name.Variable
+' '           Text
+'<'           Operator
+'>'           Operator
+' '           Text
+'['           Punctuation
+'q'           Name.Variable
+','           Operator
+' '           Text
+'r'           Name.Variable
+']'           Punctuation
+' '           Text
+'then'        Keyword
+' '           Text
+'Error'       Name.Variable
+'('           Punctuation
+'"QuotientRemainder inconsistent for "' Literal.String
+','           Operator
+' '           Text
+'['           Punctuation
+'R'           Name.Variable
+','           Operator
+'a'           Name.Variable
+','           Operator
+'b'           Name.Variable
+']'           Punctuation
+')'           Punctuation
+';'           Operator
+' '           Text
+'fi'          Keyword
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+' '           Text
+' '           Text
+'od'          Keyword
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'od'          Keyword
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'return'      Keyword
+' '           Text
+'true'        Name.Constant
+';'           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+'end'         Keyword
+';'           Operator
+';'           Operator
+'\n'          Text.Whitespace
+
+'\n'          Generic.Output
+
+'# rings in characteristic 0\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'Integers'    Name.Variable
+','           Operator
+'['           Punctuation
+'-'           Operator
+'100'         Name.Variable
+'.'           Operator
+'.'           Operator
+'100'         Name.Variable
+']'           Punctuation
+','           Operator
+'['           Punctuation
+'-'           Operator
+'100'         Name.Variable
+'.'           Operator
+'.'           Operator
+'100'         Name.Variable
+']'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'gap> '       Generic.Prompt
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'Rationals'   Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'gap> '       Generic.Prompt
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'GaussianIntegers' Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'gap> '       Generic.Prompt
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'GaussianRationals' Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'\n'          Generic.Output
+
+'# finite fields\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'ForAll'      Name.Variable
+'('           Punctuation
+'Filtered'    Name.Variable
+'('           Punctuation
+'['           Punctuation
+'2'           Name.Variable
+'.'           Operator
+'.'           Operator
+'50'          Name.Variable
+']'           Punctuation
+','           Operator
+' '           Text
+'IsPrimePowerInt' Name.Variable
+')'           Punctuation
+','           Operator
+' '           Text
+'q'           Name.Variable
+'-'           Operator
+'>'           Operator
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'GF'          Name.Variable
+'('           Punctuation
+'q'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'\n'          Generic.Output
+
+'# ZmodnZ\n'  Generic.Output
+
+'gap> '       Generic.Prompt
+'ForAll'      Name.Variable
+'('           Punctuation
+'['           Punctuation
+'1'           Name.Variable
+'.'           Operator
+'.'           Operator
+'50'          Name.Variable
+']'           Punctuation
+','           Operator
+' '           Text
+'m'           Name.Variable
+' '           Text
+'-'           Operator
+'>'           Operator
+' '           Text
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'Integers'    Name.Variable
+' '           Text
+'mod'         Operator.Word
+' '           Text
+'m'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'gap> '       Generic.Prompt
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'Integers'    Name.Variable
+' '           Text
+'mod'         Operator.Word
+' '           Text
+'('           Punctuation
+'('           Punctuation
+'2'           Name.Variable
+'*'           Operator
+'3'           Name.Variable
+'*'           Operator
+'5'           Name.Variable
+')'           Punctuation
+'^'           Operator
+'2'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'gap> '       Generic.Prompt
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'Integers'    Name.Variable
+' '           Text
+'mod'         Operator.Word
+' '           Text
+'('           Punctuation
+'('           Punctuation
+'2'           Name.Variable
+'*'           Operator
+'3'           Name.Variable
+'*'           Operator
+'5'           Name.Variable
+')'           Punctuation
+'^'           Operator
+'3'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'gap> '       Generic.Prompt
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'Integers'    Name.Variable
+' '           Text
+'mod'         Operator.Word
+' '           Text
+'('           Punctuation
+'('           Punctuation
+'2'           Name.Variable
+'*'           Operator
+'3'           Name.Variable
+'*'           Operator
+'5'           Name.Variable
+'*'           Operator
+'7'           Name.Variable
+')'           Punctuation
+'^'           Operator
+'2'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'gap> '       Generic.Prompt
+'checkEuclideanRing' Name.Variable
+'('           Punctuation
+'Integers'    Name.Variable
+' '           Text
+'mod'         Operator.Word
+' '           Text
+'('           Punctuation
+'('           Punctuation
+'2'           Name.Variable
+'*'           Operator
+'3'           Name.Variable
+'*'           Operator
+'5'           Name.Variable
+'*'           Operator
+'7'           Name.Variable
+')'           Punctuation
+'^'           Operator
+'3'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'\n'          Generic.Output
+
+'#\n'         Generic.Output
+
+'gap> '       Generic.Prompt
+'STOP_TEST'   Name.Variable
+'('           Punctuation
+' '           Text
+'"euclidean.tst"' Literal.String
+','           Operator
+' '           Text
+'1'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/gap-repl/magma.tst b/tests/examplefiles/gap-repl/magma.tst
new file mode 100644
index 0000000000..fac994f8c2
--- /dev/null
+++ b/tests/examplefiles/gap-repl/magma.tst
@@ -0,0 +1,58 @@
+#@local F,M,T
+gap> START_TEST( "magma.tst" );
+
+#
+gap> M:= MagmaByMultiplicationTable( [ [ 1, 1 ], [ 1, 1 ] ] );;
+gap> IsGeneratorsOfMagmaWithInverses( Elements( M ) );
+false
+
+# IsAssociative and IsCommutative
+gap> T := [
+>   [ 2, 4, 3, 4, 5 ],
+>   [ 3, 3, 2, 3, 3 ],
+>   [ 5, 5, 5, 4, 4 ],
+>   [ 5, 1, 4, 1, 1 ],
+>   [ 5, 3, 3, 4, 5 ]
+> ];;
+gap> M := MagmaByMultiplicationTable(T);
+<magma with 5 generators>
+gap> IsAssociative(M) or IsCommutative(M);
+false
+gap> Filtered(Combinations(Elements(M)), x -> Size(x) > 0 and IsAssociative(x));
+[ [ m5 ] ]
+gap> Filtered(Combinations(Elements(M)), x -> Size(x) > 0 and IsCommutative(x));
+[ [ m1 ], [ m1, m5 ], [ m2 ], [ m2, m5 ], [ m3 ], [ m3, m4 ], [ m4 ], [ m5 ] ]
+gap> T := [
+>   [ 1, 4, 3, 3, 2 ],
+>   [ 4, 2, 4, 4, 2 ],
+>   [ 3, 4, 3, 4, 1 ],
+>   [ 1, 4, 5, 4, 3 ],
+>   [ 2, 2, 3, 5, 3 ]
+> ];;
+gap> M := MagmaByMultiplicationTable(T);
+<magma with 5 generators>
+gap> IsAssociative(M) or IsCommutative(M);
+false
+gap> Filtered(Combinations(Elements(M)), x -> Size(x) > 0 and IsAssociative(x));
+[ [ m1 ], [ m1, m3 ], [ m2 ], [ m2, m4 ], [ m3 ], [ m4 ] ]
+gap> AsSemigroup([Elements(M)[1], Elements(M)[2]]);
+fail
+gap> AsSemigroup([Elements(M)[1], Elements(M)[3]]);
+<semigroup of size 2, with 2 generators>
+gap> Filtered(Combinations(Elements(M)), x -> Size(x) > 0 and IsCommutative(x));
+[ [ m1 ], [ m1, m2 ], [ m1, m2, m3 ], [ m1, m2, m5 ], [ m1, m3 ], [ m1, m5 ], 
+  [ m2 ], [ m2, m3 ], [ m2, m4 ], [ m2, m5 ], [ m3 ], [ m4 ], [ m5 ] ]
+
+#
+gap> F := Elements( GL(2,2) );;
+gap> IsAssociative( F );
+true
+gap> IsCommutative( F );
+false
+gap> Number( Combinations( F, 3 ), IsCommutative );
+1
+gap> AsSemigroup( F );
+<semigroup of size 6, with 2 generators>
+
+#
+gap> STOP_TEST( "magma.tst" );
diff --git a/tests/examplefiles/gap-repl/magma.tst.output b/tests/examplefiles/gap-repl/magma.tst.output
new file mode 100644
index 0000000000..4014b562c8
--- /dev/null
+++ b/tests/examplefiles/gap-repl/magma.tst.output
@@ -0,0 +1,694 @@
+'#@local F,M,T\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'START_TEST'  Name.Variable
+'('           Punctuation
+' '           Text
+'"magma.tst"' Literal.String
+' '           Text
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'\n'          Generic.Output
+
+'#\n'         Generic.Output
+
+'gap> '       Generic.Prompt
+'M'           Name.Variable
+':='          Operator
+' '           Text
+'MagmaByMultiplicationTable' Name.Variable
+'('           Punctuation
+' '           Text
+'['           Punctuation
+' '           Text
+'['           Punctuation
+' '           Text
+'1'           Name.Variable
+','           Operator
+' '           Text
+'1'           Name.Variable
+' '           Text
+']'           Punctuation
+','           Operator
+' '           Text
+'['           Punctuation
+' '           Text
+'1'           Name.Variable
+','           Operator
+' '           Text
+'1'           Name.Variable
+' '           Text
+']'           Punctuation
+' '           Text
+']'           Punctuation
+' '           Text
+')'           Punctuation
+';'           Operator
+';'           Operator
+'\n'          Text.Whitespace
+
+'gap> '       Generic.Prompt
+'IsGeneratorsOfMagmaWithInverses' Name.Variable
+'('           Punctuation
+' '           Text
+'Elements'    Name.Variable
+'('           Punctuation
+' '           Text
+'M'           Name.Variable
+' '           Text
+')'           Punctuation
+' '           Text
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'false\n'     Generic.Output
+
+'\n'          Generic.Output
+
+'# IsAssociative and IsCommutative\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'T'           Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'['           Punctuation
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'2'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'5'           Name.Variable
+' '           Text
+']'           Punctuation
+','           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'2'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+' '           Text
+']'           Punctuation
+','           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'5'           Name.Variable
+','           Operator
+' '           Text
+'5'           Name.Variable
+','           Operator
+' '           Text
+'5'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+' '           Text
+']'           Punctuation
+','           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'5'           Name.Variable
+','           Operator
+' '           Text
+'1'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'1'           Name.Variable
+','           Operator
+' '           Text
+'1'           Name.Variable
+' '           Text
+']'           Punctuation
+','           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'5'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'5'           Name.Variable
+' '           Text
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+']'           Punctuation
+';'           Operator
+';'           Operator
+'\n'          Text.Whitespace
+
+'gap> '       Generic.Prompt
+'M'           Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'MagmaByMultiplicationTable' Name.Variable
+'('           Punctuation
+'T'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'<magma with 5 generators>\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'IsAssociative' Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+' '           Text
+'or'          Operator.Word
+' '           Text
+'IsCommutative' Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'false\n'     Generic.Output
+
+'gap> '       Generic.Prompt
+'Filtered'    Name.Variable
+'('           Punctuation
+'Combinations' Name.Variable
+'('           Punctuation
+'Elements'    Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+','           Operator
+' '           Text
+'x'           Name.Variable
+' '           Text
+'-'           Operator
+'>'           Operator
+' '           Text
+'Size'        Name.Variable
+'('           Punctuation
+'x'           Name.Variable
+')'           Punctuation
+' '           Text
+'>'           Operator
+' '           Text
+'0'           Name.Variable
+' '           Text
+'and'         Operator.Word
+' '           Text
+'IsAssociative' Name.Variable
+'('           Punctuation
+'x'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'[ [ m5 ] ]\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'Filtered'    Name.Variable
+'('           Punctuation
+'Combinations' Name.Variable
+'('           Punctuation
+'Elements'    Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+','           Operator
+' '           Text
+'x'           Name.Variable
+' '           Text
+'-'           Operator
+'>'           Operator
+' '           Text
+'Size'        Name.Variable
+'('           Punctuation
+'x'           Name.Variable
+')'           Punctuation
+' '           Text
+'>'           Operator
+' '           Text
+'0'           Name.Variable
+' '           Text
+'and'         Operator.Word
+' '           Text
+'IsCommutative' Name.Variable
+'('           Punctuation
+'x'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'[ [ m1 ], [ m1, m5 ], [ m2 ], [ m2, m5 ], [ m3 ], [ m3, m4 ], [ m4 ], [ m5 ] ]\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'T'           Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'['           Punctuation
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'1'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'2'           Name.Variable
+' '           Text
+']'           Punctuation
+','           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'2'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'2'           Name.Variable
+' '           Text
+']'           Punctuation
+','           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'1'           Name.Variable
+' '           Text
+']'           Punctuation
+','           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'1'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'5'           Name.Variable
+','           Operator
+' '           Text
+'4'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+' '           Text
+']'           Punctuation
+','           Operator
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+' '           Text
+' '           Text
+'['           Punctuation
+' '           Text
+'2'           Name.Variable
+','           Operator
+' '           Text
+'2'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+','           Operator
+' '           Text
+'5'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+' '           Text
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'> '          Generic.Prompt
+']'           Punctuation
+';'           Operator
+';'           Operator
+'\n'          Text.Whitespace
+
+'gap> '       Generic.Prompt
+'M'           Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'MagmaByMultiplicationTable' Name.Variable
+'('           Punctuation
+'T'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'<magma with 5 generators>\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'IsAssociative' Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+' '           Text
+'or'          Operator.Word
+' '           Text
+'IsCommutative' Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'false\n'     Generic.Output
+
+'gap> '       Generic.Prompt
+'Filtered'    Name.Variable
+'('           Punctuation
+'Combinations' Name.Variable
+'('           Punctuation
+'Elements'    Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+','           Operator
+' '           Text
+'x'           Name.Variable
+' '           Text
+'-'           Operator
+'>'           Operator
+' '           Text
+'Size'        Name.Variable
+'('           Punctuation
+'x'           Name.Variable
+')'           Punctuation
+' '           Text
+'>'           Operator
+' '           Text
+'0'           Name.Variable
+' '           Text
+'and'         Operator.Word
+' '           Text
+'IsAssociative' Name.Variable
+'('           Punctuation
+'x'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'[ [ m1 ], [ m1, m3 ], [ m2 ], [ m2, m4 ], [ m3 ], [ m4 ] ]\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'AsSemigroup' Name.Variable
+'('           Punctuation
+'['           Punctuation
+'Elements'    Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+'['           Punctuation
+'1'           Name.Variable
+']'           Punctuation
+','           Operator
+' '           Text
+'Elements'    Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+'['           Punctuation
+'2'           Name.Variable
+']'           Punctuation
+']'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'fail\n'      Generic.Output
+
+'gap> '       Generic.Prompt
+'AsSemigroup' Name.Variable
+'('           Punctuation
+'['           Punctuation
+'Elements'    Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+'['           Punctuation
+'1'           Name.Variable
+']'           Punctuation
+','           Operator
+' '           Text
+'Elements'    Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+'['           Punctuation
+'3'           Name.Variable
+']'           Punctuation
+']'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'<semigroup of size 2, with 2 generators>\n' Generic.Output
+
+'gap> '       Generic.Prompt
+'Filtered'    Name.Variable
+'('           Punctuation
+'Combinations' Name.Variable
+'('           Punctuation
+'Elements'    Name.Variable
+'('           Punctuation
+'M'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+','           Operator
+' '           Text
+'x'           Name.Variable
+' '           Text
+'-'           Operator
+'>'           Operator
+' '           Text
+'Size'        Name.Variable
+'('           Punctuation
+'x'           Name.Variable
+')'           Punctuation
+' '           Text
+'>'           Operator
+' '           Text
+'0'           Name.Variable
+' '           Text
+'and'         Operator.Word
+' '           Text
+'IsCommutative' Name.Variable
+'('           Punctuation
+'x'           Name.Variable
+')'           Punctuation
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'[ [ m1 ], [ m1, m2 ], [ m1, m2, m3 ], [ m1, m2, m5 ], [ m1, m3 ], [ m1, m5 ], \n' Generic.Output
+
+'  [ m2 ], [ m2, m3 ], [ m2, m4 ], [ m2, m5 ], [ m3 ], [ m4 ], [ m5 ] ]\n' Generic.Output
+
+'\n'          Generic.Output
+
+'#\n'         Generic.Output
+
+'gap> '       Generic.Prompt
+'F'           Name.Variable
+' '           Text
+':='          Operator
+' '           Text
+'Elements'    Name.Variable
+'('           Punctuation
+' '           Text
+'GL'          Name.Variable
+'('           Punctuation
+'2'           Name.Variable
+','           Operator
+'2'           Name.Variable
+')'           Punctuation
+' '           Text
+')'           Punctuation
+';'           Operator
+';'           Operator
+'\n'          Text.Whitespace
+
+'gap> '       Generic.Prompt
+'IsAssociative' Name.Variable
+'('           Punctuation
+' '           Text
+'F'           Name.Variable
+' '           Text
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'true\n'      Generic.Output
+
+'gap> '       Generic.Prompt
+'IsCommutative' Name.Variable
+'('           Punctuation
+' '           Text
+'F'           Name.Variable
+' '           Text
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'false\n'     Generic.Output
+
+'gap> '       Generic.Prompt
+'Number'      Name.Variable
+'('           Punctuation
+' '           Text
+'Combinations' Name.Variable
+'('           Punctuation
+' '           Text
+'F'           Name.Variable
+','           Operator
+' '           Text
+'3'           Name.Variable
+' '           Text
+')'           Punctuation
+','           Operator
+' '           Text
+'IsCommutative' Name.Variable
+' '           Text
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'1\n'         Generic.Output
+
+'gap> '       Generic.Prompt
+'AsSemigroup' Name.Variable
+'('           Punctuation
+' '           Text
+'F'           Name.Variable
+' '           Text
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
+
+'<semigroup of size 6, with 2 generators>\n' Generic.Output
+
+'\n'          Generic.Output
+
+'#\n'         Generic.Output
+
+'gap> '       Generic.Prompt
+'STOP_TEST'   Name.Variable
+'('           Punctuation
+' '           Text
+'"magma.tst"' Literal.String
+' '           Text
+')'           Punctuation
+';'           Operator
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/gap/example.gd.output b/tests/examplefiles/gap/example.gd.output
index 6cf80a8a61..67858221e4 100644
--- a/tests/examplefiles/gap/example.gd.output
+++ b/tests/examplefiles/gap/example.gd.output
@@ -1,20 +1,20 @@
 '#############################################################################' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#W  example.gd' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  This file contains a sample of a GAP declaration file.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DeclareProperty' Name.Builtin
 '('           Punctuation
@@ -26,7 +26,7 @@
 ' '           Text
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DeclareGlobalFunction' Name.Builtin
 '('           Punctuation
@@ -35,47 +35,47 @@
 ' '           Text
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#############################################################################' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#C  IsQuuxFrobnicator(<R>)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  <ManSection>' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  <Filt Name="IsQuuxFrobnicator" Arg=\'R\' Type=\'Category\'/>' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  <Description>' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  Tests whether R is a quux frobnicator.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  </Description>' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  </ManSection>' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DeclareSynonym' Name.Builtin
 '('           Punctuation
@@ -91,4 +91,4 @@
 ' '           Text
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/gap/example.gi.output b/tests/examplefiles/gap/example.gi.output
index 91e99b5dcc..4c78442a99 100644
--- a/tests/examplefiles/gap/example.gi.output
+++ b/tests/examplefiles/gap/example.gi.output
@@ -1,49 +1,49 @@
 '#############################################################################' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#W  example.gd' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  This file contains a sample of a GAP implementation file.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#############################################################################' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#M  SomeOperation( <val> )' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  performs some operation on <val>' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'InstallMethod' Name.Builtin
 '('           Punctuation
 ' '           Text
 'SomeProperty' Name.Variable
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -51,7 +51,7 @@
 ' '           Text
 '"for left modules"' Literal.String
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -66,7 +66,7 @@
 ' '           Text
 '0'           Name.Variable
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -78,7 +78,7 @@
 'M'           Name.Variable
 ' '           Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -105,7 +105,7 @@
 ')'           Punctuation
 ' '           Text
 'then'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -117,7 +117,7 @@
 ' '           Text
 'true'        Name.Constant
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -125,7 +125,7 @@
 ' '           Text
 'fi'          Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -135,7 +135,7 @@
 '('           Punctuation
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -145,31 +145,31 @@
 ' '           Text
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#############################################################################' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#F  SomeGlobalFunction( )' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##  A global variadic funfion.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'InstallGlobalFunction' Name.Builtin
 '('           Punctuation
@@ -183,7 +183,7 @@
 'arg'         Name.Variable
 ' '           Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -203,7 +203,7 @@
 '3'           Name.Variable
 ' '           Text
 'then'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -232,7 +232,7 @@
 '3'           Name.Variable
 ']'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -252,7 +252,7 @@
 '2'           Name.Variable
 ' '           Text
 'then'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -273,14 +273,14 @@
 '['           Punctuation
 '2'           Name.Variable
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 ' '           Text
 ' '           Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -295,7 +295,7 @@
 ' '           Text
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -303,7 +303,7 @@
 ' '           Text
 'fi'          Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -313,20 +313,20 @@
 ' '           Text
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# A plain function.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SomeFunc'    Name.Variable
 ' '           Text
@@ -339,7 +339,7 @@
 ' '           Text
 'y'           Name.Variable
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -358,7 +358,7 @@
 ' '           Text
 'j'           Name.Variable
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -376,7 +376,7 @@
 '.'           Operator
 '0'           Name.Variable
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -394,7 +394,7 @@
 ' '           Text
 'y'           Name.Variable
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -415,7 +415,7 @@
 ' '           Text
 '5'           Name.Variable
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -440,7 +440,7 @@
 ' '           Text
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -455,7 +455,7 @@
 '0'           Name.Variable
 ' '           Text
 'do'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -474,7 +474,7 @@
 'tmp'         Name.Variable
 ' '           Text
 'do'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -496,7 +496,7 @@
 '"\\n"'       Literal.String
 ')'           Punctuation
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -508,7 +508,7 @@
 ' '           Text
 'od'          Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -519,7 +519,7 @@
 ' '           Text
 ' '           Text
 'repeat'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -543,7 +543,7 @@
 ' '           Text
 '1'           Name.Variable
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -561,7 +561,7 @@
 ' '           Text
 '1'           Name.Variable
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -580,7 +580,7 @@
 '-'           Operator
 '1'           Name.Variable
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -588,7 +588,7 @@
 ' '           Text
 'od'          Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -598,11 +598,11 @@
 ' '           Text
 'z'           Name.Variable
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -612,4 +612,4 @@
 ' '           Text
 ' '           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/genshi/genshi_example.xml+genshi.output b/tests/examplefiles/genshi/genshi_example.xml+genshi.output
index bc9ccce806..473e978b2f 100644
--- a/tests/examplefiles/genshi/genshi_example.xml+genshi.output
+++ b/tests/examplefiles/genshi/genshi_example.xml+genshi.output
@@ -1,5 +1,5 @@
 '<!DOCTYPE html\n    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<html'       Name.Tag
 ' '           Text
@@ -21,7 +21,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '<xi:include' Name.Tag
 ' '           Text
 'href='       Name.Attribute
@@ -31,28 +31,46 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '<head'       Name.Tag
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<title'      Name.Tag
 '>'           Name.Tag
 '$title'      Name.Variable
 '</title>'    Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<script'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'type='       Name.Attribute
 '"text/javascript"' Literal.String
 '>'           Name.Tag
-'\n      $(document).ready(function() {\n        $("#group").change(function() {\n          $("#groupdesc").enable(this.selectedIndex != 0)\n        }).change();\n      });\n    ' Text
+'\n      '    Text.Whitespace
+'$(document).ready(function()' Text
+' '           Text.Whitespace
+'{'           Text
+'\n        '  Text.Whitespace
+'$("#group").change(function()' Text
+' '           Text.Whitespace
+'{'           Text
+'\n          ' Text.Whitespace
+'$("#groupdesc").enable(this.selectedIndex' Text
+' '           Text.Whitespace
+'!='          Text
+' '           Text.Whitespace
+'0)'          Text
+'\n        '  Text.Whitespace
+'}).change();' Text
+'\n      '    Text.Whitespace
+'});'         Text
+'\n    '      Text.Whitespace
 '</script>'   Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '</head>'     Name.Tag
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '<body'       Name.Tag
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<div'        Name.Tag
 ' '           Text
 'id='         Name.Attribute
@@ -67,7 +85,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<ul'         Name.Tag
 ' '           Text
 'py:if='      Name.Attribute
@@ -75,7 +93,7 @@
 'report_href' Name
 '"'           Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<li'         Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -92,10 +110,12 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'Available Reports' Text
+'Available'   Text
+' '           Text.Whitespace
+'Reports'     Text
 '</a>'        Name.Tag
 '</li>'       Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<li'         Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -104,13 +124,15 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'Custom Query' Text
+'Custom'      Text
+' '           Text.Whitespace
+'Query'       Text
 '</li>'       Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</ul>'       Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</div>'      Name.Tag
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '<py:def'     Name.Tag
 ' '           Text
 'function='   Name.Attribute
@@ -121,7 +143,7 @@
 ')'           Punctuation
 '"'           Literal.String
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<span'       Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -140,7 +162,8 @@
 'No'          Literal.String.Single
 "'"           Literal.String.Single
 '}'           Comment.Preproc
-' match'      Text
+' '           Text.Whitespace
+'match'       Text
 '${'          Comment.Preproc
 'v'           Name
 ' '           Text
@@ -161,9 +184,9 @@
 '}'           Comment.Preproc
 ')'           Text
 '</span>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</py:def>'   Name.Tag
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '<div'        Name.Tag
 ' '           Text
 'id='         Name.Attribute
@@ -178,11 +201,11 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<h1'         Name.Tag
 '>'           Name.Tag
 '$title'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '${'          Comment.Preproc
 'num_matches' Name
 '('           Punctuation
@@ -193,7 +216,7 @@
 ')'           Punctuation
 '}'           Comment.Preproc
 '</h1>'       Name.Tag
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '<form'       Name.Tag
 ' '           Text
 'id='         Name.Attribute
@@ -218,7 +241,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<fieldset'   Name.Tag
 ' '           Text
 'id='         Name.Attribute
@@ -227,12 +250,12 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<legend'     Name.Tag
 '>'           Name.Tag
 'Filters'     Text
 '</legend>'   Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<table'      Name.Tag
 ' '           Text
 'summary='    Name.Attribute
@@ -241,10 +264,10 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n            ' Text
+'\n            ' Text.Whitespace
 '<tbody'      Name.Tag
 '>'           Name.Tag
-'\n              ' Text
+'\n              ' Text.Whitespace
 '<tr'         Name.Tag
 ' '           Text
 'style='      Name.Attribute
@@ -263,9 +286,9 @@
 '>'           Name.Tag
 '</td>'       Name.Tag
 '</tr>'       Name.Tag
-'\n            ' Text
+'\n            ' Text.Whitespace
 '</tbody>'    Name.Tag
-'\n            ' Text
+'\n            ' Text.Whitespace
 '<py:for'     Name.Tag
 ' '           Text
 'each='       Name.Attribute
@@ -284,7 +307,7 @@
 ')'           Punctuation
 '"'           Literal.String
 '>'           Name.Tag
-'\n              ' Text
+'\n              ' Text.Whitespace
 '<py:for'     Name.Tag
 ' '           Text
 'each='       Name.Attribute
@@ -303,7 +326,7 @@
 ')'           Punctuation
 '"'           Literal.String
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<tbody'      Name.Tag
 ' '           Text
 'py:if='      Name.Attribute
@@ -339,7 +362,7 @@
 ')'           Punctuation
 '"'           Literal.String
 '>'           Name.Tag
-'\n                  ' Text
+'\n                  ' Text.Whitespace
 '<py:for'     Name.Tag
 ' '           Text
 'each='       Name.Attribute
@@ -362,7 +385,7 @@
 ')'           Punctuation
 '"'           Literal.String
 '>'           Name.Tag
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '<tr'         Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -386,7 +409,7 @@
 '0'           Literal.Number.Integer
 '"'           Literal.String
 '>'           Name.Tag
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '<py:choose'  Name.Tag
 ' '           Text
 'test='       Name.Attribute
@@ -394,7 +417,7 @@
 'constraint_idx' Name
 '"'           Literal.String
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<py:when'    Name.Tag
 ' '           Text
 'test='       Name.Attribute
@@ -402,7 +425,7 @@
 '0'           Literal.Number.Integer
 '"'           Literal.String
 '>'           Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<th'         Name.Tag
 ' '           Text
 'scope='      Name.Attribute
@@ -416,7 +439,7 @@
 '$field.label' Name.Variable
 '</label>'    Name.Tag
 '</th>'       Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<td'         Name.Tag
 ' '           Text
 'py:if='      Name.Attribute
@@ -447,7 +470,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '<select'     Name.Tag
 ' '           Text
 'name='       Name.Attribute
@@ -459,7 +482,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n                              ' Text
+'\n                              ' Text.Whitespace
 '<option'     Name.Tag
 ' '           Text
 'py:for='     Name.Attribute
@@ -509,19 +532,19 @@
 ''            Literal.String
 '>'           Name.Tag
 '$mode.name'  Name.Variable
-'\n                              ' Text
+'\n                              ' Text.Whitespace
 '</option>'   Name.Tag
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '</select>'   Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '</td>'       Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</py:when>'  Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<py:otherwise' Name.Tag
 '>'           Name.Tag
 '<!--! not the first line of a multiline constraint -->' Comment.Multiline
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<th'         Name.Tag
 ' '           Text
 'colspan='    Name.Attribute
@@ -535,11 +558,11 @@
 'or'          Text
 '</label>'    Name.Tag
 '</th>'       Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</py:otherwise>' Name.Tag
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '</py:choose>' Name.Tag
-'\n\n                      ' Text
+'\n\n                      ' Text.Whitespace
 '<td'         Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -586,7 +609,7 @@
 'type'        Name
 '"'           Literal.String
 '>'           Name.Tag
-'\n\n                        ' Text
+'\n\n                        ' Text.Whitespace
 '<py:when'    Name.Tag
 ' '           Text
 'test='       Name.Attribute
@@ -596,7 +619,7 @@
 "'"           Literal.String.Single
 '"'           Literal.String
 '>'           Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<select'     Name.Tag
 ' '           Text
 'name='       Name.Attribute
@@ -607,11 +630,11 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '<option'     Name.Tag
 '>'           Name.Tag
 '</option>'   Name.Tag
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '<option'     Name.Tag
 ' '           Text
 'py:for='     Name.Attribute
@@ -648,13 +671,13 @@
 ''            Literal.String
 '>'           Name.Tag
 '$option'     Name.Variable
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '</option>'   Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '</select>'   Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</py:when>'  Name.Tag
-'\n\n\n                        ' Text
+'\n\n\n                        ' Text.Whitespace
 '<py:when'    Name.Tag
 ' '           Text
 'test='       Name.Attribute
@@ -664,7 +687,7 @@
 "'"           Literal.String.Single
 '"'           Literal.String
 '>'           Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<py:for'     Name.Tag
 ' '           Text
 'each='       Name.Attribute
@@ -678,7 +701,7 @@
 'options'     Name
 '"'           Literal.String
 '>'           Name.Tag
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -737,7 +760,7 @@
 "'"           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                                              ' Text
 'for'         Keyword
@@ -769,7 +792,7 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '<label'      Name.Tag
 ' '           Text
 'for='        Name.Attribute
@@ -792,11 +815,11 @@
 "'"           Literal.String.Single
 '}'           Comment.Preproc
 '</label>'    Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '</py:for>'   Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</py:when>'  Name.Tag
-'\n\n                        ' Text
+'\n\n                        ' Text.Whitespace
 '<py:when'    Name.Tag
 ' '           Text
 'test='       Name.Attribute
@@ -806,7 +829,7 @@
 "'"           Literal.String.Single
 '"'           Literal.String
 '>'           Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -857,7 +880,7 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<label'      Name.Tag
 ' '           Text
 'for='        Name.Attribute
@@ -871,7 +894,7 @@
 '>'           Name.Tag
 'yes'         Text
 '</label>'    Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -922,7 +945,7 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<label'      Name.Tag
 ' '           Text
 'for='        Name.Attribute
@@ -936,9 +959,9 @@
 '>'           Name.Tag
 'no'          Text
 '</label>'    Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</py:when>'  Name.Tag
-'\n\n                        ' Text
+'\n\n                        ' Text.Whitespace
 '<py:when'    Name.Tag
 ' '           Text
 'test='       Name.Attribute
@@ -948,7 +971,7 @@
 "'"           Literal.String.Single
 '"'           Literal.String
 '>'           Name.Tag
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -978,11 +1001,11 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</py:when>'  Name.Tag
-'\n\n                      ' Text
+'\n\n                      ' Text.Whitespace
 '</td>'       Name.Tag
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '<td'         Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -1018,7 +1041,7 @@
 '1'           Literal.Number.Integer
 '"'           Literal.String
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -1034,7 +1057,7 @@
 'field_name'  Name
 '}'           Comment.Preproc
 '${'          Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                          ' Text
 'field'       Name
@@ -1073,22 +1096,22 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '</td>'       Name.Tag
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '</tr>'       Name.Tag
-'\n                  ' Text
+'\n                  ' Text.Whitespace
 '</py:for>'   Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</tbody>'    Name.Tag
-'\n              ' Text
+'\n              ' Text.Whitespace
 '</py:for>'   Name.Tag
-'\n            ' Text
+'\n            ' Text.Whitespace
 '</py:for>'   Name.Tag
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 '<tbody'      Name.Tag
 '>'           Name.Tag
-'\n              ' Text
+'\n              ' Text.Whitespace
 '<tr'         Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -1097,7 +1120,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<td'         Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -1118,7 +1141,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n                  ' Text
+'\n                  ' Text.Whitespace
 '<label'      Name.Tag
 ' '           Text
 'for='        Name.Attribute
@@ -1127,10 +1150,12 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'Add filter'  Text
+'Add'         Text
+' '           Text.Whitespace
+'filter'      Text
 '</label>'    Name.Tag
 '&nbsp;'      Name.Entity
-'\n                  ' Text
+'\n                  ' Text.Whitespace
 '<select'     Name.Tag
 ' '           Text
 'name='       Name.Attribute
@@ -1145,11 +1170,11 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '<option'     Name.Tag
 '>'           Name.Tag
 '</option>'   Name.Tag
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '<option'     Name.Tag
 ' '           Text
 'py:for='     Name.Attribute
@@ -1189,7 +1214,7 @@
 "'"           Literal.String.Single
 ' '           Text
 'and'         Operator.Word
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                                         ' Text
 'constraints' Name
@@ -1198,7 +1223,7 @@
 ']'           Punctuation
 ' '           Text
 'and'         Operator.Word
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                                         ' Text
 'len'         Name.Builtin
@@ -1217,17 +1242,17 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '${'          Comment.Preproc
 'field'       Name
 '.'           Operator
 'label'       Name
 '}'           Comment.Preproc
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '</option>'   Name.Tag
-'\n                  ' Text
+'\n                  ' Text.Whitespace
 '</select>'   Name.Tag
-'\n                  ' Text
+'\n                  ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -1249,17 +1274,17 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</td>'       Name.Tag
-'\n              ' Text
+'\n              ' Text.Whitespace
 '</tr>'       Name.Tag
-'\n            ' Text
+'\n            ' Text.Whitespace
 '</tbody>'    Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '</table>'    Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</fieldset>' Name.Tag
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '<p'          Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -1268,7 +1293,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<label'      Name.Tag
 ' '           Text
 'for='        Name.Attribute
@@ -1277,9 +1302,13 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'Group results by' Text
+'Group'       Text
+' '           Text.Whitespace
+'results'     Text
+' '           Text.Whitespace
+'by'          Text
 '</label>'    Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<select'     Name.Tag
 ' '           Text
 'name='       Name.Attribute
@@ -1294,11 +1323,11 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n            ' Text
+'\n            ' Text.Whitespace
 '<option'     Name.Tag
 '>'           Name.Tag
 '</option>'   Name.Tag
-'\n            ' Text
+'\n            ' Text.Whitespace
 '<option'     Name.Tag
 ' '           Text
 'py:for='     Name.Attribute
@@ -1379,9 +1408,9 @@
 'label'       Name
 '}'           Comment.Preproc
 '</option>'   Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '</select>'   Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -1417,7 +1446,7 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<label'      Name.Tag
 ' '           Text
 'for='        Name.Attribute
@@ -1428,9 +1457,9 @@
 '>'           Name.Tag
 'descending'  Text
 '</label>'    Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</p>'        Name.Tag
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '<p'          Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -1439,7 +1468,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -1475,7 +1504,7 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<label'      Name.Tag
 ' '           Text
 'for='        Name.Attribute
@@ -1484,11 +1513,21 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'Show full description under each result' Text
+'Show'        Text
+' '           Text.Whitespace
+'full'        Text
+' '           Text.Whitespace
+'description' Text
+' '           Text.Whitespace
+'under'       Text
+' '           Text.Whitespace
+'each'        Text
+' '           Text.Whitespace
+'result'      Text
 '</label>'    Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</p>'        Name.Tag
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '<div'        Name.Tag
 ' '           Text
 'class='      Name.Attribute
@@ -1497,7 +1536,7 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -1519,7 +1558,7 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'py:if='      Name.Attribute
@@ -1546,7 +1585,7 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<input'      Name.Tag
 ' '           Text
 'type='       Name.Attribute
@@ -1568,95 +1607,145 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</div>'      Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<hr'         Name.Tag
 ' '           Text
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</form>'     Name.Tag
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '<script'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'type='       Name.Attribute
 '"text/javascript"' Literal.String
 '>'           Name.Tag
-'\n        var properties={\n        ' Text
+'\n        '  Text.Whitespace
+'var'         Text
+' '           Text.Whitespace
+'properties={' Text
+'\n        '  Text.Whitespace
 '<py:for'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'each='       Name.Attribute
 '"idx, (field_name, field) in enumerate(fields.items())"' Literal.String
 '>'           Name.Tag
-'\n          $field_name: { type: "$field.type", label: "$field.label"\n          ' Text
+'\n          ' Text.Whitespace
+'$field_name:' Text
+' '           Text.Whitespace
+'{'           Text
+' '           Text.Whitespace
+'type:'       Text
+' '           Text.Whitespace
+'"$field.type",' Text
+' '           Text.Whitespace
+'label:'      Text
+' '           Text.Whitespace
+'"$field.label"' Text
+'\n          ' Text.Whitespace
 '<py:if'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'test='       Name.Attribute
 '"field.options"' Literal.String
 '>'           Name.Tag
-', options: [\n            ' Text
+','           Text
+' '           Text.Whitespace
+'options:'    Text
+' '           Text.Whitespace
+'['           Text
+'\n            ' Text.Whitespace
 '<py:for'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'each='       Name.Attribute
 '"idx, option in enumerate(field.options)"' Literal.String
 '>'           Name.Tag
 '"$option"'   Text
 '<py:if'      Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 'test='       Name.Attribute
 '"idx &lt; len(field.options)-1"' Literal.String
 '>'           Name.Tag
 ','           Text
 '</py:if>'    Name.Tag
-'\n            ' Text
+'\n            ' Text.Whitespace
 '</py:for>'   Name.Tag
-']\n          ' Text
+']'           Text
+'\n          ' Text.Whitespace
 '</py:if>'    Name.Tag
 '}'           Text
 '<py:if'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'test='       Name.Attribute
 '"idx &lt; len(fields)-1"' Literal.String
 '>'           Name.Tag
 ','           Text
 '</py:if>'    Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</py:for>'   Name.Tag
-'\n        };\n        var modes = {\n        ' Text
+'\n        '  Text.Whitespace
+'};'          Text
+'\n        '  Text.Whitespace
+'var'         Text
+' '           Text.Whitespace
+'modes'       Text
+' '           Text.Whitespace
+'='           Text
+' '           Text.Whitespace
+'{'           Text
+'\n        '  Text.Whitespace
 '<py:for'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'each='       Name.Attribute
 '"idx, (type_name, type_modes) in enumerate(modes.items())"' Literal.String
 '>'           Name.Tag
-'\n          $type_name: [\n          ' Text
+'\n          ' Text.Whitespace
+'$type_name:' Text
+' '           Text.Whitespace
+'['           Text
+'\n          ' Text.Whitespace
 '<py:for'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'each='       Name.Attribute
 '"idx, mode in enumerate(type_modes)"' Literal.String
 '>'           Name.Tag
-'\n            {text: "$mode.name", value: "$mode.value" }' Text
+'\n            ' Text.Whitespace
+'{text:'      Text
+' '           Text.Whitespace
+'"$mode.name",' Text
+' '           Text.Whitespace
+'value:'      Text
+' '           Text.Whitespace
+'"$mode.value"' Text
+' '           Text.Whitespace
+'}'           Text
 '<py:if'      Name.Tag
-'\n              ' Text
+'\n              ' Text.Whitespace
 'test='       Name.Attribute
 '"idx &lt; len(type_modes)-1"' Literal.String
 '>'           Name.Tag
 ','           Text
 '</py:if>'    Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '</py:for>'   Name.Tag
-'\n            ]' Text
+'\n            ' Text.Whitespace
+']'           Text
 '<py:if'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'test='       Name.Attribute
 '"idx &lt; len(modes)-1"' Literal.String
 '>'           Name.Tag
 ','           Text
 '</py:if>'    Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</py:for>'   Name.Tag
-'\n        };\n        initializeFilters();\n      ' Text
+'\n        '  Text.Whitespace
+'};'          Text
+'\n        '  Text.Whitespace
+'initializeFilters();' Text
+'\n      '    Text.Whitespace
 '</script>'   Name.Tag
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '<xi:include' Name.Tag
 ' '           Text
 'href='       Name.Attribute
@@ -1666,7 +1755,7 @@
 ''            Literal.String
 ' '           Text
 '/>'          Name.Tag
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '<div'        Name.Tag
 ' '           Text
 'id='         Name.Attribute
@@ -1675,12 +1764,14 @@
 '"'           Literal.String
 ''            Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<strong'     Name.Tag
 '>'           Name.Tag
 'Note:'       Text
 '</strong>'   Name.Tag
-' See '       Text
+' '           Text.Whitespace
+'See'         Text
+' '           Text.Whitespace
 '<a'          Name.Tag
 ' '           Text
 'href='       Name.Attribute
@@ -1700,13 +1791,23 @@
 '>'           Name.Tag
 'TracQuery'   Text
 '</a>'        Name.Tag
-'\n        for help on using queries.\n      ' Text
+'\n        '  Text.Whitespace
+'for'         Text
+' '           Text.Whitespace
+'help'        Text
+' '           Text.Whitespace
+'on'          Text
+' '           Text.Whitespace
+'using'       Text
+' '           Text.Whitespace
+'queries.'    Text
+'\n      '    Text.Whitespace
 '</div>'      Name.Tag
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '</div>'      Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '</body>'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</html>'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/gnuplot/test.plot.output b/tests/examplefiles/gnuplot/test.plot.output
index fee25dba69..c1be5696f6 100644
--- a/tests/examplefiles/gnuplot/test.plot.output
+++ b/tests/examplefiles/gnuplot/test.plot.output
@@ -1,5 +1,5 @@
 '#'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -55,10 +55,10 @@
 'p'           Comment
 ' '           Comment
 '$'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -105,10 +105,10 @@
 '1'           Comment
 '.'           Comment
 '1'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -166,9 +166,9 @@
 '.'           Comment
 'n'           Comment
 'l'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -180,7 +180,7 @@
 'r'           Comment
 'y'           Comment
 ':'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -230,7 +230,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -306,9 +306,9 @@
 'c'           Comment
 't'           Comment
 '.'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
 ' '           Text.Whitespace
@@ -461,7 +461,7 @@
 '"'           Literal.String
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'load'        Keyword
 ' '           Text.Whitespace
@@ -496,7 +496,7 @@
 '4.0'         Literal.Number.Float
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -539,7 +539,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'n'           Name.Variable
 ' '           Text.Whitespace
@@ -1018,7 +1018,7 @@
 'label'       Name.Builtin
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -1062,7 +1062,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'n'           Name.Variable
 ' '           Text.Whitespace
@@ -1535,7 +1535,7 @@
 'label'       Name.Builtin
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -1578,7 +1578,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p'           Keyword
 ' '           Text.Whitespace
@@ -2015,7 +2015,7 @@
 'label'       Name.Builtin
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -2059,7 +2059,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p'           Keyword
 ' '           Text.Whitespace
@@ -2478,7 +2478,7 @@
 'label'       Name.Builtin
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -2529,7 +2529,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'nn'          Name.Variable
 ' '           Text.Whitespace
@@ -3070,7 +3070,7 @@
 'label'       Name.Builtin
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -3119,7 +3119,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'nn'          Name.Variable
 ' '           Text.Whitespace
@@ -3637,7 +3637,7 @@
 'label'       Name.Builtin
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -3688,7 +3688,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'r'           Name.Variable
 ' '           Text.Whitespace
@@ -4189,7 +4189,7 @@
 'label'       Name.Builtin
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -4241,7 +4241,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'r'           Name.Variable
 ' '           Text.Whitespace
@@ -4722,7 +4722,7 @@
 'label'       Name.Builtin
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -4765,7 +4765,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'mu'          Name.Variable
 ' '           Text.Whitespace
@@ -5185,7 +5185,7 @@
 'label'       Name.Builtin
 '\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
 ' '           Comment
@@ -5227,7 +5227,7 @@
 'i'           Comment
 'o'           Comment
 'n'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'mu'          Name.Variable
 ' '           Text.Whitespace
diff --git a/tests/examplefiles/golo/example.golo.output b/tests/examplefiles/golo/example.golo.output
index 288ffdfeb6..9ff0235f76 100644
--- a/tests/examplefiles/golo/example.golo.output
+++ b/tests/examplefiles/golo/example.golo.output
@@ -1,27 +1,27 @@
 '#'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Comments ' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'module'      Keyword.Namespace
 ' '           Text.Whitespace
 'pygments.Example' Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword.Namespace
 ' '           Text.Whitespace
 'some.Module' Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'local'       Keyword
 ' '           Text.Whitespace
@@ -45,25 +45,25 @@
 '+'           Operator
 ' '           Text.Whitespace
 'b'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '----\ngolodoc string\n----' Literal.String.Doc
-'\n'          Text
+'\n'          Text.Whitespace
 
 'augment'     Keyword
 ' '           Text.Whitespace
 'java.util.Collection' Name.Namespace
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '----\n  sub doc\n  ----' Literal.String.Doc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'function'    Keyword.Declaration
@@ -80,7 +80,7 @@
 '|'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'return'      Keyword
@@ -95,16 +95,16 @@
 '+'           Operator
 ' '           Text.Whitespace
 'v'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -120,7 +120,7 @@
 '|'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'let'         Keyword.Declaration
@@ -132,7 +132,7 @@
 '"'           Literal.String
 'a string'    Literal.String
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'var'         Keyword.Declaration
@@ -143,7 +143,7 @@
 ' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'tmp'         Name
@@ -160,7 +160,7 @@
 'toString'    Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'println'     Name.Builtin
@@ -171,12 +171,12 @@
 ' '           Text.Whitespace
 'b'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -185,7 +185,7 @@
 '='           Operator
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'foreach'     Keyword
@@ -203,7 +203,7 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'if'          Keyword
@@ -227,7 +227,7 @@
 'false'       Keyword.Constant
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 'print'       Name.Builtin
@@ -236,7 +236,7 @@
 'e'           Literal.String
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '}'           Punctuation
@@ -244,7 +244,7 @@
 'else'        Keyword
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 'print'       Name.Builtin
@@ -253,20 +253,20 @@
 'o'           Literal.String
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -279,13 +279,13 @@
 '|'           Punctuation
 ' '           Text.Whitespace
 '->'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'match'       Keyword
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'when'        Keyword
@@ -305,7 +305,7 @@
 '"'           Literal.String
 'e'           Literal.String
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'otherwise'   Keyword
@@ -313,16 +313,16 @@
 '"'           Literal.String
 'o'           Literal.String
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -347,9 +347,9 @@
 '+'           Operator
 ' '           Text.Whitespace
 'y'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'let'         Keyword.Declaration
 ' '           Text.Whitespace
@@ -360,9 +360,9 @@
 "'"           Literal.String
 'a'           Literal.String
 "'"           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'let'         Keyword.Declaration
 ' '           Text.Whitespace
@@ -370,7 +370,7 @@
 ' '           Text.Whitespace
 '='           Operator
 ' '           Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"""'         Literal.String
 '\n'          Literal.String
@@ -385,9 +385,9 @@
 '\n'          Literal.String
 
 '"""'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'local'       Keyword
 ' '           Text.Whitespace
@@ -403,7 +403,7 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'name'        Name.Function
@@ -413,7 +413,7 @@
 '"'           Literal.String.Double
 ')'           Punctuation
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'age'         Name.Function
@@ -421,7 +421,7 @@
 '25'          Literal.Number.Integer
 ')'           Punctuation
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'define'      Name.Function
@@ -452,12 +452,12 @@
 'age'         Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '----\nGolo doc string\n----' Literal.String.Doc
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -466,7 +466,7 @@
 '='           Operator
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'let'         Keyword.Declaration
@@ -477,7 +477,7 @@
 ' '           Text.Whitespace
 'map'         Name.Builtin
 '['           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '['           Punctuation
@@ -489,7 +489,7 @@
 '1'           Literal.Number.Integer
 ']'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '['           Punctuation
@@ -500,13 +500,13 @@
 ' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'println'     Name.Builtin
@@ -525,7 +525,7 @@
 ' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'println'     Name.Builtin
@@ -551,14 +551,14 @@
 '0'           Literal.String
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'struct'      Keyword.Declaration
 ' '           Text.Whitespace
@@ -574,9 +574,9 @@
 'y'           Name
 ' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -589,7 +589,7 @@
 '|'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'return'      Keyword
@@ -600,7 +600,7 @@
 '|'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'return'      Keyword
@@ -618,19 +618,19 @@
 '('           Punctuation
 'args'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@deco1'      Name.Decorator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -643,7 +643,7 @@
 '|'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'return'      Keyword
@@ -655,15 +655,15 @@
 '+'           Operator
 ' '           Text.Whitespace
 'a'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@deco1'      Name.Decorator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -684,9 +684,9 @@
 '+'           Operator
 ' '           Text.Whitespace
 'a'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -699,7 +699,7 @@
 '|'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'return'      Keyword
@@ -710,7 +710,7 @@
 '|'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'return'      Keyword
@@ -728,22 +728,22 @@
 '('           Punctuation
 'args'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@deco2'      Name.Decorator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@deco1'      Name.Decorator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -764,9 +764,9 @@
 '+'           Operator
 ' '           Text.Whitespace
 'a'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'let'         Keyword.Declaration
 ' '           Text.Whitespace
@@ -783,12 +783,12 @@
 '^'           Operator
 'deco2'       Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@deco3'      Name.Decorator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -809,12 +809,12 @@
 '+'           Operator
 ' '           Text.Whitespace
 'a'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@another.Module.deco' Name.Decorator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -827,9 +827,9 @@
 '"'           Literal.String
 'pong'        Literal.String
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@deco'       Name.Decorator
 '('           Punctuation
@@ -840,7 +840,7 @@
 ' '           Text.Whitespace
 'params'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -853,4 +853,4 @@
 '"'           Literal.String
 'gnip'        Literal.String
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/golo/hello.golo.output b/tests/examplefiles/golo/hello.golo.output
index 8baaa20a52..7edf2ab98a 100644
--- a/tests/examplefiles/golo/hello.golo.output
+++ b/tests/examplefiles/golo/hello.golo.output
@@ -1,9 +1,9 @@
 'module'      Keyword.Namespace
 ' '           Text.Whitespace
 'hello.World' Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
@@ -16,7 +16,7 @@
 '|'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'println'     Name.Builtin
@@ -25,7 +25,7 @@
 'Hello world!' Literal.String
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/inform6/inform6_example b/tests/examplefiles/inform6/inform6_example
index 3eaef8c75e..c7d5de6745 100644
--- a/tests/examplefiles/inform6/inform6_example
+++ b/tests/examplefiles/inform6/inform6_example
@@ -73,7 +73,7 @@ Property long
     ! to the semicolon
     ;
 Property additive;
-Property individual;
+Property individual 1;
 Iffalse true;
 Property long individual;
 Property long individual individual;
@@ -334,6 +334,8 @@ Extend only 'feel' 'touch' replace * noun -> Feel;
         a = '''; ! character
         a = $09afAF;
         a = $$01;
+        a = $+1.0;
+        a = $<-1E-3;
         a = ##Eat; a = #a$Eat;
         a = #g$self;
         a = #n$!word;
diff --git a/tests/examplefiles/inform6/inform6_example.output b/tests/examplefiles/inform6/inform6_example.output
index 404cb052c2..ccff13bebc 100644
--- a/tests/examplefiles/inform6/inform6_example.output
+++ b/tests/examplefiles/inform6/inform6_example.output
@@ -525,6 +525,9 @@
 'Property'    Keyword
 ' '           Text
 'individual'  Name.Constant
+' '           Text
+''            Text
+'1'           Literal.Number.Integer
 ''            Punctuation
 ';'           Punctuation
 '\n'          Text
@@ -3478,6 +3481,26 @@
 '='           Operator
 ' '           Text
 ''            Text
+'$+1.0'       Literal.Number.Float
+''            Punctuation
+';'           Punctuation
+'\n        '  Text
+''            Text
+'a'           Name
+' '           Text
+'='           Operator
+' '           Text
+''            Text
+'$<-1E-3'     Literal.Number.Float
+''            Punctuation
+';'           Punctuation
+'\n        '  Text
+''            Text
+'a'           Name
+' '           Text
+'='           Operator
+' '           Text
+''            Text
 '##'          Operator
 'Eat'         Name
 ''            Punctuation
diff --git a/tests/examplefiles/ini/test.ini b/tests/examplefiles/ini/test.ini
index a447803de7..c06aee44c1 100644
--- a/tests/examplefiles/ini/test.ini
+++ b/tests/examplefiles/ini/test.ini
@@ -1,10 +1,18 @@
-[section]
+[section1]
 
-foo = bar
-continued = foo
+foo = bar ; inline comment
+continued = foo # inline comment with \
+                # line continuation
   baz
 conttwo =
   foo
 ; comment
 # comment
 
+[section2]
+
+my_array = Asia, Africa, 'North America', South America, \
+           Antarctica, Europe, Australia
+
+implicit_boolean
+foo = bar
diff --git a/tests/examplefiles/ini/test.ini.output b/tests/examplefiles/ini/test.ini.output
index 4e7e3a59fb..27a91956fc 100644
--- a/tests/examplefiles/ini/test.ini.output
+++ b/tests/examplefiles/ini/test.ini.output
@@ -1,4 +1,4 @@
-'[section]'   Keyword
+'[section1]'  Keyword
 '\n\n'        Text.Whitespace
 
 'foo'         Name.Attribute
@@ -6,6 +6,8 @@
 '='           Operator
 ' '           Text.Whitespace
 'bar'         Literal.String
+' '           Text.Whitespace
+'; inline comment' Comment.Single
 '\n'          Text.Whitespace
 
 'continued'   Name.Attribute
@@ -13,6 +15,10 @@
 '='           Operator
 ' '           Text.Whitespace
 'foo'         Literal.String
+' '           Text.Whitespace
+'# inline comment with \\' Comment.Single
+'\n                ' Text.Whitespace
+'# line continuation' Comment.Single
 '\n  '        Text.Whitespace
 'baz'         Name.Attribute
 '\n'          Text.Whitespace
@@ -28,4 +34,27 @@
 '\n'          Text.Whitespace
 
 '# comment'   Comment.Single
+'\n\n'        Text.Whitespace
+
+'[section2]'  Keyword
+'\n\n'        Text.Whitespace
+
+'my_array'    Name.Attribute
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+"Asia, Africa, 'North America', South America, " Literal.String
+'\\'          Text
+'\n           ' Text.Whitespace
+'Antarctica, Europe, Australia' Literal.String
+'\n\n'        Text.Whitespace
+
+'implicit_boolean' Name.Attribute
+'\n'          Text.Whitespace
+
+'foo'         Name.Attribute
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'bar'         Literal.String
 '\n'          Text.Whitespace
diff --git a/tests/examplefiles/irc/example.weechatlog.output b/tests/examplefiles/irc/example.weechatlog.output
index d58b699829..fd45e9216f 100644
--- a/tests/examplefiles/irc/example.weechatlog.output
+++ b/tests/examplefiles/irc/example.weechatlog.output
@@ -1,5 +1,5 @@
 '****  Beginning of log  2007 Sep 01 00:23:55  ****' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2007 Sep 01 00:23:55  ' Comment.Preproc
 '--> '        Keyword
@@ -32,7 +32,7 @@
 
 '2007 Sep 01 00:23:55  ' Comment.Preproc
 '<root> '     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2007 Sep 01 00:23:55  ' Comment.Preproc
 '<root> '     Name.Tag
diff --git a/tests/examplefiles/javascript+mozpreproc/demo.js.in.output b/tests/examplefiles/javascript+mozpreproc/demo.js.in.output
index 06ca37182e..30c2a3e4a1 100644
--- a/tests/examplefiles/javascript+mozpreproc/demo.js.in.output
+++ b/tests/examplefiles/javascript+mozpreproc/demo.js.in.output
@@ -5,7 +5,7 @@
 '='           Operator
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Preproc
 'if'          Comment.Preproc
@@ -21,16 +21,16 @@
 ':'           Operator
 ' '           Text.Whitespace
 "'value'"     Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Preproc
 'endif'       Comment.Preproc
 '\n'          Text
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Preproc
 'literal'     Comment.Preproc
 ' #foo'       Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/jcl/example.jcl.output b/tests/examplefiles/jcl/example.jcl.output
index c899f2ee61..7f9ea3c05a 100644
--- a/tests/examplefiles/jcl/example.jcl.output
+++ b/tests/examplefiles/jcl/example.jcl.output
@@ -31,7 +31,7 @@
 'B'           Literal.String
 "'"           Literal.String
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 '  '          Text.Whitespace
@@ -50,7 +50,7 @@
 ','           Punctuation
 '10'          Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 "//* Copy 'OLDFILE' to 'NEWFILE'.\n" Comment.Single
 
@@ -62,7 +62,7 @@
 'PGM'         Name
 '='           Operator
 'IEBGENER'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 'SYSPRINT'    Name.Variable
@@ -70,7 +70,7 @@
 'SYSOUT'      Name
 '='           Operator
 '*'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 'SYSUT1'      Name.Variable
@@ -82,7 +82,7 @@
 'DISP'        Name
 '='           Operator
 'SHR'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 'SYSUT2'      Name.Variable
@@ -91,7 +91,7 @@
 '='           Operator
 'NEWFILE'     Name
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 '            ' Text.Whitespace
@@ -105,7 +105,7 @@
 'DELETE'      Name
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 '            ' Text.Whitespace
@@ -125,7 +125,7 @@
 ','           Punctuation
 '      '      Text.Whitespace
 'Some comment' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 '            ' Text.Whitespace
@@ -140,13 +140,13 @@
 '='           Operator
 '1150'        Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 'SYSIN'       Name.Variable
 '    DD '     Keyword.Reserved
 'DUMMY'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '/*'          Keyword.Pseudo
 '\n'          Text.Whitespace
@@ -266,7 +266,7 @@
 'R'           Literal.String
 'D'           Literal.String
 "'"           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//* Sort a couple of lines and show the result in the job log.\n' Comment.Single
 
@@ -278,13 +278,13 @@
 'PGM'         Name
 '='           Operator
 'IEFBR14'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 'SORTIN'      Name.Variable
 '   DD '      Keyword.Reserved
 '*'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'spam\n'      Other
 
@@ -301,7 +301,7 @@
 'SYSOUT'      Name
 '='           Operator
 '*'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '/*'          Keyword.Pseudo
 '\n'          Text.Whitespace
@@ -333,7 +333,7 @@
 'EVEN'        Name
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 '         '   Text.Whitespace
@@ -349,7 +349,7 @@
 'FIND'        Name
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 '         '   Text.Whitespace
@@ -374,18 +374,18 @@
 ')'           Punctuation
 '  '          Text.Whitespace
 'THIS STATEMENT CALLS THE X' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 '         '   Text.Whitespace
 'BILLING'     Name
 ' '           Text.Whitespace
 'PROCEDURE AND SPECIFIES RETURN CODE TESTS FOR THREEX' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '//'          Keyword.Pseudo
 '         '   Text.Whitespace
 'PROCEDURE'   Name
 ' '           Text.Whitespace
 'STEPS.'      Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/jsonnet/example.jsonnet b/tests/examplefiles/jsonnet/example.jsonnet
new file mode 100644
index 0000000000..74e2e45993
--- /dev/null
+++ b/tests/examplefiles/jsonnet/example.jsonnet
@@ -0,0 +1,74 @@
+/* Multiline /
+comment */
+local x = 100;
+/* Multiline
+comment */
+
+/**
+ * Docs
+ **/
+
+
+local i = import 'foo';
+local foo = 'bar';
+local lambda = function(foo, bar) ['baz', 'qux'];
+local named(foo, bar=10, baz=20) = ['baz', 'qux'];
+local in1troduction = 'introduction';
+assert 5 > 3: "interesting";
+//comment
+{
+  local foo = "bar",
+  spam: 'eggs',
+}
+
+{local foo = "bar"}
+
+
+{
+  // this is a comment
+  # python-style comment
+  assert 1 == 1: 'huh?',
+  spam: 'eggs // /* #',
+  spam2(foo, bar):: 2,
+  spa: 'eggs',
+  foo: 'bar',
+  block: |||
+    Hello
+    Block
+  |||,
+  baz: 'qux' + 'fuzz',
+  'm:oo': 'cow',
+  "b:oo": ('cow'),
+  goo: ['bar', 'ba\nz'],
+  spam3: 2.25,
+  spam4::: -2.25,
+  spam5::: +2.25,
+  spam6//funky
+  : 'hello' //moo
+    , //moo
+  ['spa\'m']: 'eggs',
+  ["spa\"m2"]: "eggs",
+  raw1: @'hello\',
+  raw2: @"hello\",
+  spam7: foo,
+  spam8: lambda(1, 2),
+  spam9: self.spam2(3, 4),
+  intro: in1troduction,
+  spam_10: 10,
+  spam_11(y=10):: 11,
+  spam12: std.type('null'),
+  spam13+: 27,
+  spam14: $.spam13,
+  spam15: ~5,
+  spam16: !false,
+  spam17: 0 - 5,
+  spam18: 5 & 3,
+  spam19: 5 | 3,
+  spam20: 5 ^ 3,
+  spam21: 5 == 3,
+  spam22: 5 < 3,
+  spam23: 5 > 3,
+  spam24: 5 * 3,
+  spam25: 5 / 3,
+  spam26: 5 % 3,
+}
diff --git a/tests/examplefiles/jsonnet/example.jsonnet.output b/tests/examplefiles/jsonnet/example.jsonnet.output
new file mode 100644
index 0000000000..3b98523e59
--- /dev/null
+++ b/tests/examplefiles/jsonnet/example.jsonnet.output
@@ -0,0 +1,697 @@
+'/* Multiline /\ncomment */' Comment
+'\n'          Text.Whitespace
+
+'local'       Keyword
+' '           Text.Whitespace
+'x'           Name.Variable
+' '           Text.Whitespace
+''            Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'100'         Literal.Number.Float
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'/* Multiline\ncomment */' Comment
+'\n\n'        Text.Whitespace
+
+'/**\n * Docs\n **/' Literal.String.Doc
+'\n\n\n'      Text.Whitespace
+
+'local'       Keyword
+' '           Text.Whitespace
+'i'           Name.Variable
+' '           Text.Whitespace
+''            Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'import'      Keyword
+' '           Text.Whitespace
+"'"           Literal.String
+'f'           Literal.String
+'o'           Literal.String
+'o'           Literal.String
+"'"           Literal.String
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'local'       Keyword
+' '           Text.Whitespace
+'foo'         Name.Variable
+' '           Text.Whitespace
+''            Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+"'"           Literal.String
+'b'           Literal.String
+'a'           Literal.String
+'r'           Literal.String
+"'"           Literal.String
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'local'       Keyword
+' '           Text.Whitespace
+'lambda'      Name.Variable
+' '           Text.Whitespace
+''            Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'function'    Keyword
+'('           Punctuation
+'foo'         Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'bar'         Name.Variable
+')'           Punctuation
+' '           Text.Whitespace
+'['           Punctuation
+"'"           Literal.String
+'b'           Literal.String
+'a'           Literal.String
+'z'           Literal.String
+"'"           Literal.String
+','           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'q'           Literal.String
+'u'           Literal.String
+'x'           Literal.String
+"'"           Literal.String
+']'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'local'       Keyword
+' '           Text.Whitespace
+'named'       Name.Function
+'('           Punctuation
+'foo'         Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'bar'         Name.Variable
+'='           Operator
+'10'          Literal.Number.Float
+''            Text.Whitespace
+','           Punctuation
+' '           Text.Whitespace
+'baz'         Name.Variable
+'='           Operator
+'20'          Literal.Number.Float
+''            Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+''            Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'['           Punctuation
+"'"           Literal.String
+'b'           Literal.String
+'a'           Literal.String
+'z'           Literal.String
+"'"           Literal.String
+','           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'q'           Literal.String
+'u'           Literal.String
+'x'           Literal.String
+"'"           Literal.String
+']'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'local'       Keyword
+' '           Text.Whitespace
+'in1troduction' Name.Variable
+' '           Text.Whitespace
+''            Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+"'"           Literal.String
+'i'           Literal.String
+'n'           Literal.String
+'t'           Literal.String
+'r'           Literal.String
+'o'           Literal.String
+'d'           Literal.String
+'u'           Literal.String
+'c'           Literal.String
+'t'           Literal.String
+'i'           Literal.String
+'o'           Literal.String
+'n'           Literal.String
+"'"           Literal.String
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'assert'      Keyword
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+':'           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String
+'i'           Literal.String
+'n'           Literal.String
+'t'           Literal.String
+'e'           Literal.String
+'r'           Literal.String
+'e'           Literal.String
+'s'           Literal.String
+'t'           Literal.String
+'i'           Literal.String
+'n'           Literal.String
+'g'           Literal.String
+'"'           Literal.String
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//comment\n' Comment.Single
+
+'{'           Punctuation
+'\n  '        Text.Whitespace
+'local'       Keyword
+' '           Text.Whitespace
+'foo'         Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'b'           Literal.String
+'a'           Literal.String
+'r'           Literal.String
+'"'           Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam'        Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'e'           Literal.String
+'g'           Literal.String
+'g'           Literal.String
+'s'           Literal.String
+"'"           Literal.String
+','           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n\n'        Text.Whitespace
+
+'{'           Punctuation
+'local'       Keyword
+' '           Text.Whitespace
+'foo'         Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'b'           Literal.String
+'a'           Literal.String
+'r'           Literal.String
+'"'           Literal.String
+'}'           Punctuation
+'\n\n\n'      Text.Whitespace
+
+'{'           Punctuation
+'\n  '        Text.Whitespace
+'// this is a comment\n' Comment.Single
+
+'  '          Text.Whitespace
+'# python-style comment\n' Comment.Single
+
+'  '          Text.Whitespace
+'assert'      Keyword
+' '           Text.Whitespace
+'1'           Literal.Number.Float
+' '           Text.Whitespace
+'='           Operator
+'='           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Float
+':'           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'h'           Literal.String
+'u'           Literal.String
+'h'           Literal.String
+'?'           Literal.String
+"'"           Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam'        Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'e'           Literal.String
+'g'           Literal.String
+'g'           Literal.String
+'s'           Literal.String
+' '           Literal.String
+'/'           Literal.String
+'/'           Literal.String
+' '           Literal.String
+'/'           Literal.String
+'*'           Literal.String
+' '           Literal.String
+'#'           Literal.String
+"'"           Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam2'       Name.Function
+'('           Punctuation
+'foo'         Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'bar'         Name.Variable
+')'           Punctuation
+'::'          Punctuation
+' '           Text.Whitespace
+'2'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spa'         Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'e'           Literal.String
+'g'           Literal.String
+'g'           Literal.String
+'s'           Literal.String
+"'"           Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'foo'         Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'b'           Literal.String
+'a'           Literal.String
+'r'           Literal.String
+"'"           Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'block'       Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'|||\n    Hello\n    Block\n  |||' Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'baz'         Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'q'           Literal.String
+'u'           Literal.String
+'x'           Literal.String
+"'"           Literal.String
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+"'"           Literal.String
+'f'           Literal.String
+'u'           Literal.String
+'z'           Literal.String
+'z'           Literal.String
+"'"           Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+"'"           Name.Variable
+"m:oo'"       Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'c'           Literal.String
+'o'           Literal.String
+'w'           Literal.String
+"'"           Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+'"'           Name.Variable
+'b:oo"'       Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'('           Punctuation
+"'"           Literal.String
+'c'           Literal.String
+'o'           Literal.String
+'w'           Literal.String
+"'"           Literal.String
+')'           Punctuation
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'goo'         Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'['           Punctuation
+"'"           Literal.String
+'b'           Literal.String
+'a'           Literal.String
+'r'           Literal.String
+"'"           Literal.String
+','           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'b'           Literal.String
+'a'           Literal.String
+'\\n'         Literal.String.Escape
+'z'           Literal.String
+"'"           Literal.String
+']'           Punctuation
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam3'       Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'2.2'         Literal.Number.Float
+'5'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam4'       Name.Variable
+':::'         Punctuation
+' '           Text.Whitespace
+'-2.2'        Literal.Number.Float
+'5'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam5'       Name.Variable
+':::'         Punctuation
+' '           Text.Whitespace
+'+2.2'        Literal.Number.Float
+'5'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam6'       Name.Variable
+'//funky\n'   Comment.Single
+
+'  '          Text.Whitespace
+':'           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'h'           Literal.String
+'e'           Literal.String
+'l'           Literal.String
+'l'           Literal.String
+'o'           Literal.String
+"'"           Literal.String
+' '           Text.Whitespace
+'//moo\n'     Comment.Single
+
+'    '        Text.Whitespace
+','           Punctuation
+' '           Text.Whitespace
+'//moo\n'     Comment.Single
+
+'  '          Text.Whitespace
+'['           Operator
+"'"           Literal.String
+'s'           Literal.String
+'p'           Literal.String
+'a'           Literal.String
+"\\'"         Literal.String.Escape
+'m'           Literal.String
+"'"           Literal.String
+']'           Operator
+':'           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+'e'           Literal.String
+'g'           Literal.String
+'g'           Literal.String
+'s'           Literal.String
+"'"           Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+'['           Operator
+'"'           Literal.String
+'s'           Literal.String
+'p'           Literal.String
+'a'           Literal.String
+'\\"'         Literal.String.Escape
+'m'           Literal.String
+'2'           Literal.String
+'"'           Literal.String
+']'           Operator
+':'           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String
+'e'           Literal.String
+'g'           Literal.String
+'g'           Literal.String
+'s'           Literal.String
+'"'           Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'raw1'        Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+"@'hello\\'"  Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'raw2'        Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'@"hello\\"'  Literal.String
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam7'       Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'foo'         Name.Variable
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam8'       Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'lambda'      Name.Function
+'('           Punctuation
+'1'           Literal.Number.Float
+','           Punctuation
+' '           Text.Whitespace
+'2'           Literal.Number.Float
+')'           Punctuation
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam9'       Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'self'        Keyword
+'.'           Punctuation
+'spam2'       Name.Function
+'('           Punctuation
+'3'           Literal.Number.Float
+','           Punctuation
+' '           Text.Whitespace
+'4'           Literal.Number.Float
+')'           Punctuation
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'intro'       Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'in1troduction' Name.Variable
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam_10'     Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'10'          Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam_11'     Name.Function
+'('           Punctuation
+'y'           Name.Variable
+'='           Operator
+'10'          Literal.Number.Float
+''            Text.Whitespace
+')'           Punctuation
+'::'          Punctuation
+' '           Text.Whitespace
+'11'          Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam12'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'std.type'    Name.Builtin
+'('           Punctuation
+"'"           Literal.String
+'n'           Literal.String
+'u'           Literal.String
+'l'           Literal.String
+'l'           Literal.String
+"'"           Literal.String
+')'           Punctuation
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam13'      Name.Variable
+'+:'          Punctuation
+' '           Text.Whitespace
+'27'          Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam14'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'$'           Operator
+'.'           Punctuation
+'spam13'      Name.Variable
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam15'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'~'           Operator
+'5'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam16'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'!'           Operator
+'false'       Keyword
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam17'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'0'           Literal.Number.Float
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam18'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'&'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam19'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'|'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam20'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'^'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam21'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'='           Operator
+'='           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam22'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'<'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam23'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam24'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam25'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+''            Text
+'spam26'      Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+' '           Text.Whitespace
+'%'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+','           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/jsp/test.jsp.output b/tests/examplefiles/jsp/test.jsp.output
index 1d0cdd62e3..0983ca19f9 100644
--- a/tests/examplefiles/jsp/test.jsp.output
+++ b/tests/examplefiles/jsp/test.jsp.output
@@ -19,7 +19,7 @@
 ' '           Text.Whitespace
 '%>'          Keyword
 ' -->'        Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%='         Keyword
 ' '           Text.Whitespace
@@ -34,7 +34,7 @@
 '\n'          Text.Whitespace
 
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%!'         Keyword
 ' '           Text.Whitespace
@@ -48,7 +48,7 @@
 ';'           Punctuation
 ' '           Text.Whitespace
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%!'         Keyword
 ' '           Text.Whitespace
@@ -64,7 +64,7 @@
 ';'           Punctuation
 ' '           Text.Whitespace
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%!'         Keyword
 ' '           Text.Whitespace
@@ -83,7 +83,7 @@
 ';'           Punctuation
 ' '           Text.Whitespace
 '%>'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '<%'          Keyword
 '\n'          Text.Whitespace
@@ -122,7 +122,7 @@
 '\n'          Text.Whitespace
 
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%@'         Keyword
 ' '           Text.Whitespace
@@ -135,7 +135,7 @@
 '"'           Literal.String
 ' '           Text.Whitespace
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%'          Keyword
 '\n'          Text.Whitespace
@@ -215,16 +215,21 @@
 '\n'          Text.Whitespace
 
 '%>'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '<jsp:useBean id="calendar" scope="page" class="employee.Calendar" />' Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<h2'         Name.Tag
 '>'           Name.Tag
-'\nCalendar of ' Text
+'\n'          Text.Whitespace
+
+'Calendar'    Text
+' '           Text.Whitespace
+'of'          Text
+' '           Text.Whitespace
 '<jsp:getProperty name="calendar" property="username" />' Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</h2>'       Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/lilypond/example.ly b/tests/examplefiles/lilypond/example.ly
index b2cbb81c36..8a2eb1d659 100644
--- a/tests/examplefiles/lilypond/example.ly
+++ b/tests/examplefiles/lilypond/example.ly
@@ -76,7 +76,8 @@ piuPiano = \markup \italic "più piano"
     \key d \major
     \cadenzaOn
     deses'!4.~(\tweak thickness 4\( deses^\p-\signumcongruentiae_1\4
-    deses\longa) \myFunc { r } 4 des8 8[ <des ges>8]\)
+    deses\longa) \myFunc { r } 4
+      des8-- 8[__ \ottava -1 <des, ges>8]\) \ottava 0
     \bar "||"
     \cadenzaOff
     \pageBreak
@@ -100,7 +101,7 @@ piuPiano = \markup \italic "più piano"
   }
   \addlyrics {
     \set Score.melismaBusyProperties = #'()
-    My Lily -- Song
+    My Lily -- Song __
   }
   \chordmode {
     c cis:dim3+\dim des:maj7/+e\!
diff --git a/tests/examplefiles/lilypond/example.ly.output b/tests/examplefiles/lilypond/example.ly.output
index f5fbe53105..b54953d44e 100644
--- a/tests/examplefiles/lilypond/example.ly.output
+++ b/tests/examplefiles/lilypond/example.ly.output
@@ -399,21 +399,31 @@
 '}'           Punctuation
 ' '           Text.Whitespace
 '4'           Literal.Number
-' '           Text.Whitespace
+'\n      '    Text.Whitespace
 'des'         Pitch
 '8'           Literal.Number
+'--'          Name.Builtin.Articulation
 ' '           Text.Whitespace
 '8'           Literal.Number
 '['           Name.Builtin.Articulation
+'__'          Name.Builtin.Articulation
+' '           Text.Whitespace
+'\\ottava'    Name.Builtin.MusicFunction
+' '           Text.Whitespace
+'-1'          Literal.Number
 ' '           Text.Whitespace
 '<'           Punctuation
-'des'         Pitch
+'des,'        Pitch
 ' '           Text.Whitespace
 'ges'         Pitch
 '>'           Punctuation
 '8'           Literal.Number
 ']'           Name.Builtin.Articulation
 '\\)'         Name.Builtin.Articulation
+' '           Text.Whitespace
+'\\ottava'    Name.Builtin.MusicFunction
+' '           Text.Whitespace
+'0'           Literal.Number
 '\n    '      Text.Whitespace
 '\\bar'       Name.Builtin.MusicFunction
 ' '           Text.Whitespace
@@ -477,7 +487,7 @@
 'left'        Name.Builtin.GrobProperty
 '.'           Punctuation
 'padding'     Name.Builtin.GrobProperty
-'-5'          Literal.Number
+'-5'          Name.Builtin.Articulation
 '\\-'         Name.Builtin.Articulation
 '^"'          Literal.String
 'Some music'  Literal.String
@@ -573,6 +583,8 @@
 '--'          Punctuation
 ' '           Text.Whitespace
 'Song'        Text
+' '           Text.Whitespace
+'__'          Punctuation
 '\n  '        Text.Whitespace
 '}'           Punctuation
 '\n  '        Text.Whitespace
diff --git a/tests/examplefiles/liquid/example.liquid.output b/tests/examplefiles/liquid/example.liquid.output
index 11db959b8c..73b3e0d125 100644
--- a/tests/examplefiles/liquid/example.liquid.output
+++ b/tests/examplefiles/liquid/example.liquid.output
@@ -18,7 +18,7 @@
 'endraw'      Name.Tag
 ' '           Text.Whitespace
 '%}'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\nJust regular text - what happens?\n\n' Text
 
@@ -127,7 +127,7 @@
 'upcase'      Name.Function
 ' '           Text.Whitespace
 '}}'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{{'          Punctuation
 ' '           Text.Whitespace
@@ -144,7 +144,7 @@
 'markdownify' Name.Function
 ' '           Text.Whitespace
 '}}'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{{'          Punctuation
 ' '           Text.Whitespace
@@ -163,7 +163,7 @@
 'markdownify' Name.Function
 ' '           Text.Whitespace
 '}}'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{{'          Punctuation
 ' '           Text.Whitespace
@@ -181,7 +181,7 @@
 '\'df"g\''    Literal.String.Single
 ' '           Text.Whitespace
 '}}'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -247,7 +247,7 @@
 "'B'"         Literal.String.Single
 ' '           Text.Whitespace
 '%}'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{%'          Punctuation
 ' '           Text.Whitespace
@@ -260,7 +260,7 @@
 "'C%}'"       Literal.String.Single
 ' '           Text.Whitespace
 '%}'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{%'          Punctuation
 ' '           Text.Whitespace
diff --git a/tests/examplefiles/llvm-mir/llvm-mir.mir.output b/tests/examplefiles/llvm-mir/llvm-mir.mir.output
index df67df8ba3..c383df50f3 100644
--- a/tests/examplefiles/llvm-mir/llvm-mir.mir.output
+++ b/tests/examplefiles/llvm-mir/llvm-mir.mir.output
@@ -148,7 +148,7 @@
 'i32'         Keyword.Type
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '%5'          Name.Variable
@@ -163,7 +163,7 @@
 ' '           Text
 'float '      Keyword.Type
 '1.0'         Literal.Number.Float
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '%6'          Name.Variable
@@ -207,7 +207,7 @@
 'COPY'        Name.Builtin
 ' '           Text
 '%3'          Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '...'         Keyword
 '\n'          Text
diff --git a/tests/examplefiles/make/Makefile.output b/tests/examplefiles/make/Makefile.output
index 705e565b86..7532821be1 100644
--- a/tests/examplefiles/make/Makefile.output
+++ b/tests/examplefiles/make/Makefile.output
@@ -38,183 +38,183 @@
 
 '# See also the section "Build instructions" in the README file.\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Variables set by makesetup ===\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MODOBJS'     Name.Variable
 '='           Operator
-'          '  Text
+'          '  Text.Whitespace
 'Modules/threadmodule.o' Text
-'  '          Text
+'  '          Text.Whitespace
 'Modules/signalmodule.o' Text
-'  '          Text
+'  '          Text.Whitespace
 'Modules/posixmodule.o' Text
-'  '          Text
+'  '          Text.Whitespace
 'Modules/errnomodule.o' Text
-'  '          Text
+'  '          Text.Whitespace
 'Modules/pwdmodule.o' Text
-'  '          Text
+'  '          Text.Whitespace
 'Modules/_sre.o' Text
-'  '          Text
+'  '          Text.Whitespace
 'Modules/_codecsmodule.o' Text
-'  '          Text
+'  '          Text.Whitespace
 'Modules/zipimport.o' Text
-'  '          Text
+'  '          Text.Whitespace
 'Modules/symtablemodule.o' Text
-'  '          Text
+'  '          Text.Whitespace
 'Modules/xxsubtype.o' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MODLIBS'     Name.Variable
 '='           Operator
-'        '    Text
+'        '    Text.Whitespace
 '$('          Keyword
 'LOCALMODLIBS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'BASEMODLIBS' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Variables set by configure\n' Comment
 
 'VERSION'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '2'           Literal.Number
 '.6'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'srcdir'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'CC'          Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'gcc'         Text
-' '           Text
+' '           Text.Whitespace
 '-pthread'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'CXX'         Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'g++'         Text
-' '           Text
+' '           Text.Whitespace
 '-pthread'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MAINCC'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LINKCC'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'PURIFY'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MAINCC'      Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'AR'          Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'ar'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'RANLIB'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'ranlib'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SVNVERSION'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'svnversion'  Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Shell used by make (some versions default to the login shell, which is bad)\n' Comment
 
 'SHELL'       Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '/bin/sh'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Use this to make a link between python$(VERSION) and python in $(BINDIR)\n' Comment
 
 'LN'          Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'ln'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Portable install script (configure doesn't always guess right)\n" Comment
 
 'INSTALL'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '/usr/bin/install' Text
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'INSTALL_PROGRAM' Name.Variable
 '='           Operator
 '${'          Literal.String.Interpol
 'INSTALL'     Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'INSTALL_SCRIPT' Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL'     Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'INSTALL_DATA' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL'     Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-m'          Text
-' '           Text
+' '           Text.Whitespace
 '644'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Shared libraries must be installed with executable mode on some systems;\n' Comment
 
@@ -224,62 +224,62 @@
 
 'INSTALL_SHARED' Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL'     Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-m'          Text
-' '           Text
+' '           Text.Whitespace
 '555'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MAKESETUP'   Name.Variable
 '='           Operator
-'      '      Text
+'      '      Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Modules/makesetup' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Compiler options\n' Comment
 
 'OPT'         Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-g'          Text
-' '           Text
+' '           Text.Whitespace
 '-Wall'       Text
-' '           Text
+' '           Text.Whitespace
 '-Wstrict-prototypes' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'BASECFLAGS'  Name.Variable
 '='           Operator
-'\t '         Text
+'\t '         Text.Whitespace
 '-fno-strict-aliasing' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'CFLAGS'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'BASECFLAGS'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'OPT'         Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'EXTRA_CFLAGS' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to\n" Comment
 
@@ -289,168 +289,168 @@
 
 'CPPFLAGS'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '-I.'         Text
-' '           Text
+' '           Text.Whitespace
 '-I'          Text
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Include'    Text
-' \n'         Text
+' \n'         Text.Whitespace
 
 'LDFLAGS'     Name.Variable
 '='           Operator
-'\t'          Text
-'\n'          Text
+'\t'          Text.Whitespace
+'\n'          Text.Whitespace
 
 'LDLAST'      Name.Variable
 '='           Operator
-'\t\t'        Text
-'\n'          Text
+'\t\t'        Text.Whitespace
+'\n'          Text.Whitespace
 
 'SGI_ABI'     Name.Variable
 '='           Operator
-'\t'          Text
-'\n'          Text
+'\t'          Text.Whitespace
+'\n'          Text.Whitespace
 
 'CCSHARED'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '-fPIC'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LINKFORSHARED' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '-Xlinker'    Text
-' '           Text
+' '           Text.Whitespace
 '-export-dynamic' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Extra C flags added for building the interpreter object files.\n' Comment
 
 'CFLAGSFORSHARED' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# C flags used for building the interpreter object files\n' Comment
 
 'PY_CFLAGS'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'CFLAGS'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'CPPFLAGS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'CFLAGSFORSHARED' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-DPy_BUILD_CORE' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Machine-dependent subdirectories\n' Comment
 
 'MACHDEP'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'linux2'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Install prefix for architecture-independent files\n' Comment
 
 'prefix'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '/usr/local'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Install prefix for architecture-dependent files\n' Comment
 
 'exec_prefix' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'prefix'      Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Expanded directories\n' Comment
 
 'BINDIR'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'exec_prefix' Text
 ')'           Keyword
 '/bin'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LIBDIR'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'exec_prefix' Text
 ')'           Keyword
 '/lib'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MANDIR'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'prefix'      Name.Variable
 '}'           Literal.String.Interpol
 '/man'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'INCLUDEDIR'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'prefix'      Name.Variable
 '}'           Literal.String.Interpol
 '/include'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'CONFINCLUDEDIR' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'exec_prefix' Text
 ')'           Keyword
 '/include'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SCRIPTDIR'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'prefix'      Text
 ')'           Keyword
 '/lib'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Detailed destination directories\n' Comment
 
 'BINLIBDEST'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'LIBDIR'      Text
 ')'           Keyword
@@ -458,11 +458,11 @@
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LIBDEST'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'SCRIPTDIR'   Text
 ')'           Keyword
@@ -470,11 +470,11 @@
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'INCLUDEPY'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'INCLUDEDIR'  Text
 ')'           Keyword
@@ -482,11 +482,11 @@
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'CONFINCLUDEPY' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'CONFINCLUDEDIR' Text
 ')'           Keyword
@@ -494,11 +494,11 @@
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LIBP'        Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'LIBDIR'      Text
 ')'           Keyword
@@ -506,89 +506,89 @@
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Symbols used for using shared libraries\n' Comment
 
 'SO'          Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '.so'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LDSHARED'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-shared'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'BLDSHARED'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-shared'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DESTSHARED'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'BINLIBDEST'  Text
 ')'           Keyword
 '/lib-dynload' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Executable suffix (.exe on Windows and Mac OS X)\n' Comment
 
 'EXE'         Name.Variable
 '='           Operator
-'\t\t'        Text
-'\n'          Text
+'\t\t'        Text.Whitespace
+'\n'          Text.Whitespace
 
 'BUILDEXE'    Name.Variable
 '='           Operator
-'\t'          Text
-'\n'          Text
+'\t'          Text.Whitespace
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Short name and location for Mac OS X Python framework\n' Comment
 
 'UNIVERSALSDK' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PYTHONFRAMEWORK' Name.Variable
 '='           Operator
-'\t'          Text
-'\n'          Text
+'\t'          Text.Whitespace
+'\n'          Text.Whitespace
 
 'PYTHONFRAMEWORKDIR' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'no-framework' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PYTHONFRAMEWORKPREFIX' Name.Variable
 '='           Operator
-'\t'          Text
-'\n'          Text
+'\t'          Text.Whitespace
+'\n'          Text.Whitespace
 
 'PYTHONFRAMEWORKINSTALLDIR' Name.Variable
 '='           Operator
-' '           Text
-'\n'          Text
+' '           Text.Whitespace
+'\n'          Text.Whitespace
 
 '# Deployment target selected during configure, to be checked\n' Comment
 
@@ -598,28 +598,28 @@
 
 'MACOSX_DEPLOYMENT_TARGET' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#export MACOSX_DEPLOYMENT_TARGET\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Options to enable prebinding (for fast startup prior to Mac OS X 10.3)\n' Comment
 
 'OTHER_LIBTOOL_OPT' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Environment to run shared python without installed libraries\n' Comment
 
 'RUNSHARED'   Name.Variable
 '='           Operator
-'       '     Text
-'\n'          Text
+'       '     Text.Whitespace
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Modes for directories, executables and data files created by the\n' Comment
 
@@ -627,296 +627,296 @@
 
 'DIRMODE'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '755'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'EXEMODE'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '755'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'FILEMODE'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '644'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# configure script arguments\n' Comment
 
 'CONFIG_ARGS' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 "'--with-pydebug'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Subdirectories with code\n' Comment
 
 'SRCDIRS'     Name.Variable
 '='           Operator
-' \t'         Text
+' \t'         Text.Whitespace
 'Parser'      Text
-' '           Text
+' '           Text.Whitespace
 'Grammar'     Text
-' '           Text
+' '           Text.Whitespace
 'Objects'     Text
-' '           Text
+' '           Text.Whitespace
 'Python'      Text
-' '           Text
+' '           Text.Whitespace
 'Modules'     Text
-' '           Text
+' '           Text.Whitespace
 'Mac'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Other subdirectories\n' Comment
 
 'SUBDIRSTOO'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'Include'     Text
-' '           Text
+' '           Text.Whitespace
 'Lib'         Text
-' '           Text
+' '           Text.Whitespace
 'Misc'        Text
-' '           Text
+' '           Text.Whitespace
 'Demo'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Files and directories to be distributed\n' Comment
 
 'CONFIGFILES' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'configure'   Text
-' '           Text
+' '           Text.Whitespace
 'configure.in' Text
-' '           Text
+' '           Text.Whitespace
 'acconfig.h'  Text
-' '           Text
+' '           Text.Whitespace
 'pyconfig.h.in' Text
-' '           Text
+' '           Text.Whitespace
 'Makefile.pre.in' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DISTFILES'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'README'      Text
-' '           Text
+' '           Text.Whitespace
 'ChangeLog'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'CONFIGFILES' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DISTDIRS'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'SUBDIRS'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SUBDIRSTOO'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Ext-dummy'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DIST'        Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'DISTFILES'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DISTDIRS'    Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'LIBRARY'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'libpython'   Text
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
 '.a'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LDLIBRARY'   Name.Variable
 '='           Operator
-'      '      Text
+'      '      Text.Whitespace
 'libpython'   Text
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
 '.a'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'BLDLIBRARY'  Name.Variable
 '='           Operator
-'     '       Text
+'     '       Text.Whitespace
 '$('          Keyword
 'LDLIBRARY'   Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DLLLIBRARY'  Name.Variable
 '='           Operator
-'\t'          Text
-'\n'          Text
+'\t'          Text.Whitespace
+'\n'          Text.Whitespace
 
 'LDLIBRARYDIR' Name.Variable
 '='           Operator
-'   '         Text
-'\n'          Text
+'   '         Text.Whitespace
+'\n'          Text.Whitespace
 
 'INSTSONAME'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'LDLIBRARY'   Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'LIBS'        Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-lpthread'   Text
-' '           Text
+' '           Text.Whitespace
 '-ldl'        Text
-'  '          Text
+'  '          Text.Whitespace
 '-lutil'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LIBM'        Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-lm'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LIBC'        Name.Variable
 '='           Operator
-'\t\t'        Text
-'\n'          Text
+'\t\t'        Text.Whitespace
+'\n'          Text.Whitespace
 
 'SYSLIBS'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'LIBM'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBC'        Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SHLIBS'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'LIBS'        Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'THREADOBJ'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'Python/thread.o' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DLINCLDIR'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DYNLOADFILE' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'dynload_shlib.o' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MACHDEP_OBJS' Name.Variable
 '='           Operator
-'\t'          Text
-'\n'          Text
+'\t'          Text.Whitespace
+'\n'          Text.Whitespace
 
 'UNICODE_OBJS' Name.Variable
 '='           Operator
-'   '         Text
+'   '         Text.Whitespace
 'Objects/unicodeobject.o' Text
-' '           Text
+' '           Text.Whitespace
 'Objects/unicodectype.o' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PYTHON'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'python'      Text
 '$('          Keyword
 'EXE'         Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'BUILDPYTHON' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'python'      Text
 '$('          Keyword
 'BUILDEXE'    Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Definitions added by makesetup ===\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LOCALMODLIBS' Name.Variable
 '='           Operator
-'          '  Text
-'\n'          Text
+'          '  Text.Whitespace
+'\n'          Text.Whitespace
 
 'BASEMODLIBS' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GLHACK'      Name.Variable
 '='           Operator
 '-Dclear'     Text
 '='           Operator
 '__GLclear'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PYTHONPATH'  Name.Variable
 '='           Operator
 '$('          Keyword
 'COREPYTHONPATH' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'COREPYTHONPATH' Name.Variable
 '='           Operator
@@ -938,16 +938,16 @@
 '$('          Keyword
 'TKPATH'      Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TKPATH'      Name.Variable
 '='           Operator
 ':lib-tk'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'EXTRAMACHDEPPATH' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MACHDEPPATH' Name.Variable
 '='           Operator
@@ -955,35 +955,35 @@
 '$('          Keyword
 'MACHDEP'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TESTPATH'    Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SITEPATH'    Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DESTPATH'    Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MACHDESTLIB' Name.Variable
 '='           Operator
 '$('          Keyword
 'BINLIBDEST'  Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DESTLIB'     Name.Variable
 '='           Operator
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '##########################################################################\n' Comment
 
@@ -991,36 +991,36 @@
 
 'MODULE_OBJS' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Modules/config.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Modules/getpath.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Modules/main.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Modules/gcmodule.o' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Used of signalmodule.o is not available\n' Comment
 
 'SIGNAL_OBJS' Name.Variable
 '='           Operator
-'\t'          Text
-'\n'          Text
+'\t'          Text.Whitespace
+'\n'          Text.Whitespace
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '##########################################################################\n' Comment
 
@@ -1028,32 +1028,32 @@
 
 'GRAMMAR_H'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Include/graminit.h' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GRAMMAR_C'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Python/graminit.c' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GRAMMAR_INPUT' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Grammar/Grammar' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '##########################################################################\n' Comment
 
@@ -1061,134 +1061,134 @@
 
 'PGEN'        Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/pgen' Text
 '$('          Keyword
 'EXE'         Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'POBJS'       Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/acceler.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/grammar1.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/listnode.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/node.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/parser.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/parsetok.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/bitset.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/metagrammar.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/firstsets.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/grammar.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/pgen.o' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'PARSER_OBJS' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'POBJS'       Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Parser/myreadline.o' Text
-' '           Text
+' '           Text.Whitespace
 'Parser/tokenizer.o' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PGOBJS'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/obmalloc.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/mysnprintf.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/tokenizer_pgen.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/printgrammar.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Parser/pgenmain.o' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'PGENOBJS'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'PGENMAIN'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'POBJS'       Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PGOBJS'      Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##########################################################################\n' Comment
 
@@ -1196,77 +1196,77 @@
 
 'AST_H_DIR'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Include'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'AST_H'       Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'AST_H_DIR'   Text
 ')'           Keyword
 '/Python-ast.h' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'AST_C_DIR'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Python'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'AST_C'       Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'AST_C_DIR'   Text
 ')'           Keyword
 '/Python-ast.c' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'AST_ASDL'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Parser/Python.asdl' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ASDLGEN_FILES' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Parser/asdl.py' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Parser/asdl_c.py' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# XXX Note that a build now requires Python exist before the build starts\n' Comment
 
 'ASDLGEN'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Parser/asdl_c.py' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##########################################################################\n' Comment
 
@@ -1274,204 +1274,204 @@
 
 'PYTHON_OBJS' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/Python-ast.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/asdl.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/ast.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/bltinmodule.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/ceval.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/compile.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/codecs.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/errors.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/frozen.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/frozenmain.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/future.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/getargs.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/getcompiler.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/getcopyright.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/getmtime.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/getplatform.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/getversion.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/graminit.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/import.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/importdl.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/marshal.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/modsupport.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/mystrtoul.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/mysnprintf.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/peephole.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/pyarena.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/pyfpe.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/pystate.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/pythonrun.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/structmember.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/symtable.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/sysmodule.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/traceback.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/getopt.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/pystrtod.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Python/'     Text
 '$('          Keyword
 'DYNLOADFILE' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'MACHDEP_OBJS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'THREADOBJ'   Text
 ')'           Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '##########################################################################\n' Comment
 
@@ -1479,179 +1479,179 @@
 
 'OBJECT_OBJS' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/abstract.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/boolobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/bufferobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/cellobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/classobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/cobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/codeobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/complexobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/descrobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/enumobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/exceptions.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/genobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/fileobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/floatobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/frameobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/funcobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/intobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/iterobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/listobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/longobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/dictobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/methodobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/moduleobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/object.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/obmalloc.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/rangeobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'                ' Text
+'                ' Text.Whitespace
 'Objects/setobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/sliceobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/stringobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/structseq.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/tupleobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/typeobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Objects/weakrefobject.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'UNICODE_OBJS' Text
 ')'           Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '##########################################################################\n' Comment
 
@@ -1659,71 +1659,71 @@
 
 'LIBRARY_OBJS' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Modules/_typesmodule.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Modules/getbuildinfo.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'PARSER_OBJS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'OBJECT_OBJS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'PYTHON_OBJS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'MODULE_OBJS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'SIGNAL_OBJS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'MODOBJS'     Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '#########################################################################\n' Comment
 
 '# Rules\n'   Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Default target\n' Comment
 
 'all'         Name.Function
 ':'           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'BUILDPYTHON' Name.Variable
 ')'           Keyword
@@ -1731,15 +1731,15 @@
 'oldsharedmods' Name
 ' '           Text
 'sharedmods'  Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Build the interpreter\n' Comment
 
 '$(BUILDPYTHON)' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'Modules'     Name
 '/'           Text
 'python'      Name
@@ -1753,182 +1753,182 @@
 '$('          Keyword
 'LDLIBRARY'   Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'LINKCC'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LDFLAGS'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LINKFORSHARED' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'Modules/python.o' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 '$('          Keyword
 'BLDLIBRARY'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBS'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MODLIBS'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SYSLIBS'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LDLAST'      Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'platform'    Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'BUILDPYTHON' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-E'          Text
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '\'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]\'' Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '>platform'   Text
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# Build the shared modules\n' Comment
 
 'sharedmods'  Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'BUILDPYTHON' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@case'       Text
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable
 'MAKEFLAGS'   Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '*-s*'        Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'CC'          Name.Variable
 '='           Operator
 "'$(CC)'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 'LDSHARED'    Name.Variable
 '='           Operator
 "'$(BLDSHARED)'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 'OPT'         Name.Variable
 '='           Operator
 "'$(OPT)'"    Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-E'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/setup.py'   Text
-' '           Text
+' '           Text.Whitespace
 '-q'          Text
-' '           Text
+' '           Text.Whitespace
 'build'       Text
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '*'           Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'CC'          Name.Variable
 '='           Operator
 "'$(CC)'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 'LDSHARED'    Name.Variable
 '='           Operator
 "'$(BLDSHARED)'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 'OPT'         Name.Variable
 '='           Operator
 "'$(OPT)'"    Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-E'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/setup.py'   Text
-' '           Text
+' '           Text.Whitespace
 'build'       Text
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'esac'        Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Build static library\n' Comment
 
@@ -1936,117 +1936,117 @@
 
 '$(LIBRARY)'  Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBRARY_OBJS' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '-rm'         Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'AR'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'cr'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 'Modules/getbuildinfo.o' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'AR'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'cr'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 'Modules/_typesmodule.o' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'AR'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'cr'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PARSER_OBJS' Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'AR'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'cr'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'OBJECT_OBJS' Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'AR'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'cr'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PYTHON_OBJS' Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'AR'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'cr'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MODULE_OBJS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SIGNAL_OBJS' Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'AR'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'cr'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MODOBJS'     Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'RANLIB'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'libpython$(VERSION).so' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBRARY_OBJS' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\tif test $(INSTSONAME) != $(LDLIBRARY); then \\\n' Comment.Preproc
 
@@ -2060,41 +2060,41 @@
 
 '\tfi\n'      Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'libpython$(VERSION).sl' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBRARY_OBJS' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'LDSHARED'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBRARY_OBJS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SHLIBS'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBC'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBM'        Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary\n' Comment
 
@@ -2108,11 +2108,11 @@
 'srcdir'      Text
 ')'           Keyword
 '/Mac/Resources/framework' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Text
 
 '\t'          Text
@@ -2188,21 +2188,21 @@
 'InfoPlist'   Name
 '.'           Text
 'strings'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'INSTALL'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '-m'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIRMODE'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
@@ -2210,7 +2210,7 @@
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\tif test "${UNIVERSALSDK}"; then \\\n' Comment.Preproc
 
@@ -2234,22 +2234,22 @@
 
 '\tfi\n'      Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'INSTALL'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '-m'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIRMODE'     Text
 ')'           Keyword
-'  '          Text
+'  '          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
@@ -2258,19 +2258,19 @@
 'VERSION'     Text
 ')'           Keyword
 '/Resources/English.lproj' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RESSRCDIR'   Text
 ')'           Keyword
 '/Info.plist' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
@@ -2279,19 +2279,19 @@
 'VERSION'     Text
 ')'           Keyword
 '/Resources/Info.plist' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RESSRCDIR'   Text
 ')'           Keyword
 '/version.plist' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
@@ -2300,19 +2300,19 @@
 'VERSION'     Text
 ')'           Keyword
 '/Resources/version.plist' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RESSRCDIR'   Text
 ')'           Keyword
 '/English.lproj/InfoPlist.strings' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
@@ -2321,33 +2321,33 @@
 'VERSION'     Text
 ')'           Keyword
 '/Resources/English.lproj/InfoPlist.strings' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-fsn'        Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
 '/Versions/Current' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-fsn'        Text
-' '           Text
+' '           Text.Whitespace
 'Versions/Current/' Text
 '$('          Keyword
 'PYTHONFRAMEWORK' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
@@ -2355,33 +2355,33 @@
 '$('          Keyword
 'PYTHONFRAMEWORK' Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-fsn'        Text
-' '           Text
+' '           Text.Whitespace
 'Versions/Current/Headers' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
 '/Headers'    Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-fsn'        Text
-' '           Text
+' '           Text.Whitespace
 'Versions/Current/Resources' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
 '/Resources'  Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This rule builds the Cygwin Python DLL and import library if configured\n' Comment
 
@@ -2389,11 +2389,11 @@
 
 '$(DLLLIBRARY) libpython$(VERSION).dll.a' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBRARY_OBJS' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\tif test -n "$(DLLLIBRARY)"; then \\\n' Comment.Preproc
 
@@ -2405,21 +2405,21 @@
 
 '\tfi\n'      Comment.Preproc
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'oldsharedmods' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SHAREDMODS'  Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'Makefile Modules/config.c' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Makefile'    Name
 '.'           Text
 'pre'         Name
@@ -2485,60 +2485,60 @@
 'Setup'       Name
 '.'           Text
 'local'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'SHELL'       Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MAKESETUP'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Modules/config.c.in' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 '-s'          Text
-' '           Text
+' '           Text.Whitespace
 'Modules'     Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 'Modules/Setup.config' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 'Modules/Setup.local' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 'Modules/Setup' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@mv'         Text
-' '           Text
+' '           Text.Whitespace
 'config.c'    Text
-' '           Text
+' '           Text.Whitespace
 'Modules'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@echo'       Text
-' '           Text
+' '           Text.Whitespace
 '"The Makefile was updated, you may need to re-run make."' Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 'Modules/Setup' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -2548,83 +2548,83 @@
 'Setup'       Name
 '.'           Text
 'dist'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@if'         Text
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 'Modules/Setup' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"-----------------------------------------------"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"Modules/Setup.dist is newer than Modules/Setup;"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"check to make sure you have all the updates you"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"need in your Modules/Setup file."' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"Usually, copying Setup.dist to Setup will work."' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"-----------------------------------------------"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'fi'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '############################################################################\n' Comment
 
 '# Special rules for object files\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/getbuildinfo.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PARSER_OBJS' Name.Variable
 ')'           Keyword
@@ -2682,19 +2682,19 @@
 'getbuildinfo' Name
 '.'           Text
 'c'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PY_CFLAGS'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-DSVNVERSION' Text
 '='           Operator
 '\\"'         Literal.String.Escape
@@ -2702,26 +2702,26 @@
 'LC_ALL'      Name.Variable
 '='           Operator
 'C'           Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SVNVERSION'  Text
 ')'           Keyword
 '`'           Literal.String.Backtick
 '\\"'         Literal.String.Escape
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Modules/getbuildinfo.c' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'Modules/getpath.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -2733,67 +2733,67 @@
 'c'           Name
 ' '           Text
 'Makefile'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PY_CFLAGS'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-DPYTHONPATH' Text
 '='           Operator
 '\'"$(PYTHONPATH)"\'' Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-DPREFIX'    Text
 '='           Operator
 '\'"$(prefix)"\'' Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-DEXEC_PREFIX' Text
 '='           Operator
 '\'"$(exec_prefix)"\'' Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-DVERSION'   Text
 '='           Operator
 '\'"$(VERSION)"\'' Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-DVPATH'     Text
 '='           Operator
 '\'"$(VPATH)"\'' Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Modules/getpath.c' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'Modules/python.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -2803,32 +2803,32 @@
 'python'      Name
 '.'           Text
 'c'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAINCC'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PY_CFLAGS'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Modules/python.c' Text
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '$(GRAMMAR_H) $(GRAMMAR_C)' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PGEN'        Name.Variable
 ')'           Keyword
@@ -2836,66 +2836,66 @@
 '$('          Keyword
 'GRAMMAR_INPUT' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-'           Text
 '$('          Keyword
 'PGEN'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'GRAMMAR_INPUT' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'GRAMMAR_H'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'GRAMMAR_C'   Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '$(PGEN)'     Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'PGENOBJS'    Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'OPT'         Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LDFLAGS'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PGENOBJS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBS'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PGEN'        Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'Parser/grammar.o' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -2937,11 +2937,11 @@
 'grammar'     Name
 '.'           Text
 'h'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Parser/metagrammar.o' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -2951,13 +2951,13 @@
 'metagrammar' Name
 '.'           Text
 'c'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Parser/tokenizer_pgen.o' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -2967,13 +2967,13 @@
 'tokenizer'   Name
 '.'           Text
 'c'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Parser/pgenmain.o' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -2983,13 +2983,13 @@
 'parsetok'    Name
 '.'           Text
 'h'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$(AST_H)'    Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'AST_ASDL'    Name.Variable
 ')'           Keyword
@@ -2997,27 +2997,27 @@
 '$('          Keyword
 'ASDLGEN_FILES' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'ASDLGEN'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-h'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'AST_H_DIR'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'AST_ASDL'    Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '$(AST_C)'    Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'AST_ASDL'    Name.Variable
 ')'           Keyword
@@ -3025,27 +3025,27 @@
 '$('          Keyword
 'ASDLGEN_FILES' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'ASDLGEN'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'AST_C_DIR'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'AST_ASDL'    Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'Python/compile.o Python/symtable.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'GRAMMAR_H'   Name.Variable
 ')'           Keyword
@@ -3053,13 +3053,13 @@
 '$('          Keyword
 'AST_H'       Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Python/getplatform.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -3069,36 +3069,36 @@
 'getplatform' Name
 '.'           Text
 'c'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PY_CFLAGS'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-DPLATFORM'  Text
 '='           Operator
 '\'"$(MACHDEP)"\'' Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Python/getplatform.c' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'Python/importdl.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -3108,37 +3108,37 @@
 'importdl'    Name
 '.'           Text
 'c'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PY_CFLAGS'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-I'          Text
 '$('          Keyword
 'DLINCLDIR'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Python/importdl.c' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'Objects/unicodectype.o' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -3164,303 +3164,303 @@
 'unicodetype_db' Name
 '.'           Text
 'h'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '############################################################################\n' Comment
 
 '# Header files\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PYTHON_HEADERS' Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/Python.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/Python-ast.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/asdl.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/abstract.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/boolobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/bufferobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/ceval.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/classobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/cobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/code.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/codecs.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/compile.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/complexobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/descrobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/dictobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/enumobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/genobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/fileobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/floatobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/funcobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/import.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/intobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/intrcheck.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/iterobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/listobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/longobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/methodobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/modsupport.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/moduleobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/object.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/objimpl.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/parsetok.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/patchlevel.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/pyarena.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/pydebug.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/pyerrors.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/pyfpe.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/pymem.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/pyport.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/pystate.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/pythonrun.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/rangeobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'                ' Text
+'                ' Text.Whitespace
 'Include/setobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/sliceobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/stringobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/structseq.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/structmember.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/symtable.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/sysmodule.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/traceback.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/tupleobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/unicodeobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Include/weakrefobject.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'pyconfig.h'  Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '$(LIBRARY_OBJS) $(MODOBJS) Modules/python.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PYTHON_HEADERS' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '######################################################################\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Test the interpreter (twice, once without .pyc files, once with)\n' Comment
 
@@ -3476,159 +3476,159 @@
 
 '# sample data.\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TESTOPTS'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '-l'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'EXTRATESTOPTS' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TESTPROG'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib/test/regrtest.py' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TESTPYTHON'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-E'          Text
-' '           Text
+' '           Text.Whitespace
 '-tt'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'test'        Name.Function
 ':'           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'all'         Name
 ' '           Text
 'platform'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-find'       Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib'        Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.py[co]'"  Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xargs'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '-'           Text
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTOPTS'    Text
 ')'           Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTOPTS'    Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'testall'     Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'all'         Name
 ' '           Text
 'platform'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-find'       Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib'        Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.py[co]'"  Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xargs'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '-'           Text
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTOPTS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-uall'       Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTOPTS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-uall'       Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '#  Run the unitests for both architectures in a Universal build on OSX\n' Comment
 
@@ -3636,11 +3636,11 @@
 
 'testuniversal' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'all'         Name
 ' '           Text
 'platform'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 "\t\tif [ `arch` != 'i386' ];then \\\n" Comment.Preproc
 
@@ -3650,241 +3650,241 @@
 
 '\t\tfi\n'    Comment.Preproc
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-find'       Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib'        Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.py[co]'"  Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xargs'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '-'           Text
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTOPTS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-uall'       Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTOPTS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-uall'       Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '/usr/libexec/oah/translate' Text
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-E'          Text
-' '           Text
+' '           Text.Whitespace
 '-tt'         Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTOPTS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-uall'       Text
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# Like testall, but with a single pass only\n' Comment
 
 'buildbottest' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'all'         Name
 ' '           Text
 'platform'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTOPTS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-uall'       Text
-' '           Text
+' '           Text.Whitespace
 '-rw'         Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'QUICKTESTOPTS' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'TESTOPTS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-x'          Text
-' '           Text
+' '           Text.Whitespace
 'test_thread' Text
-' '           Text
+' '           Text.Whitespace
 'test_signal' Text
-' '           Text
+' '           Text.Whitespace
 'test_strftime' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'test_unicodedata' Text
-' '           Text
+' '           Text.Whitespace
 'test_re'     Text
-' '           Text
+' '           Text.Whitespace
 'test_sre'    Text
-' '           Text
+' '           Text.Whitespace
 'test_select' Text
-' '           Text
+' '           Text.Whitespace
 'test_poll'   Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'test_linuxaudiodev' Text
-' '           Text
+' '           Text.Whitespace
 'test_struct' Text
-' '           Text
+' '           Text.Whitespace
 'test_sunaudiodev' Text
-' '           Text
+' '           Text.Whitespace
 'test_zlib'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'quicktest'   Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'all'         Name
 ' '           Text
 'platform'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-find'       Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib'        Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.py[co]'"  Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xargs'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '-'           Text
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'QUICKTESTOPTS' Text
 ')'           Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'QUICKTESTOPTS' Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'MEMTESTOPTS' Name.Variable
 '='           Operator
-'    '        Text
+'    '        Text.Whitespace
 '$('          Keyword
 'QUICKTESTOPTS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-x'          Text
-' '           Text
+' '           Text.Whitespace
 'test_dl'     Text
-' '           Text
+' '           Text.Whitespace
 'test___all__' Text
-' '           Text
+' '           Text.Whitespace
 'test_fork1'  Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'test_longexp' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'memtest'     Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'all'         Name
 ' '           Text
 'platform'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-rm'         Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
@@ -3892,53 +3892,53 @@
 '['           Operator
 'co'          Text
 ']'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '-'           Text
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MEMTESTOPTS' Text
 ')'           Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '$('          Keyword
 'TESTPYTHON'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'TESTPROG'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MEMTESTOPTS' Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Install everything\n' Comment
 
 'install'     Name.Function
 ':'           Operator
-'\t '         Text
+'\t '         Text.Whitespace
 'altinstall'  Name
 ' '           Text
 'bininstall'  Name
 ' '           Text
 'maninstall'  Name
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Install almost everything without disturbing previous versions\n' Comment
 
 'altinstall'  Name.Function
 ':'           Operator
-'\t '         Text
+'\t '         Text.Whitespace
 'altbininstall' Name
 ' '           Text
 'libinstall'  Name
@@ -3969,37 +3969,37 @@
 ' '           Text
 'oldsharedinstall' Name
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Install shared libraries enabled by Setup\n' Comment
 
 'DESTDIRS'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'exec_prefix' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBDIR'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'BINLIBDEST'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTSHARED'  Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'oldsharedinstall' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTSHARED'  Name.Variable
 ')'           Keyword
@@ -4007,24 +4007,24 @@
 '$('          Keyword
 'SHAREDMODS'  Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'X'           Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SHAREDMODS'  Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\t  if test $$i != X; then \\\n' Comment.Preproc
@@ -4037,29 +4037,29 @@
 
 '\t\tdone\n'  Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$(DESTSHARED)' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIRS'    Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\t\tif test ! -d $(DESTDIR)$$i; then \\\n' Comment.Preproc
@@ -4074,23 +4074,23 @@
 
 '\t\tdone\n'  Comment.Preproc
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Install the interpreter (by creating a hard link to python$(VERSION))\n' Comment
 
 'bininstall'  Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'altbininstall' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '-if'         Text
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4101,11 +4101,11 @@
 '$('          Keyword
 'PYTHON'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-h'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4117,16 +4117,16 @@
 'PYTHON'      Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4138,17 +4138,17 @@
 'PYTHON'      Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\telse true; \\\n' Comment.Preproc
 
 '\tfi\n'      Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '('           Operator
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4156,11 +4156,11 @@
 'BINDIR'      Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'python'      Text
 '$('          Keyword
 'VERSION'     Text
@@ -4168,15 +4168,15 @@
 '$('          Keyword
 'EXE'         Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PYTHON'      Text
 ')'           Keyword
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '('           Operator
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4184,22 +4184,22 @@
 'BINDIR'      Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-sf'         Text
-' '           Text
+' '           Text.Whitespace
 'python'      Text
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
 '-config'     Text
-' '           Text
+' '           Text.Whitespace
 'python-config' Text
 ')'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Install the interpreter with $(VERSION) affixed\n' Comment
 
@@ -4207,33 +4207,33 @@
 
 'altbininstall' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'BUILDPYTHON' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'BINDIR'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBDIR'      Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\tif test ! -d $(DESTDIR)$$i; then \\\n' Comment.Preproc
@@ -4248,15 +4248,15 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'INSTALL_PROGRAM' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4270,7 +4270,7 @@
 '$('          Keyword
 'EXE'         Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\tif test -f libpython$(VERSION)$(SO); then \\\n' Comment.Preproc
 
@@ -4294,36 +4294,36 @@
 
 '\tfi\n'      Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Install the manual page\n' Comment
 
 'maninstall'  Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MANDIR'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MANDIR'      Text
 ')'           Keyword
 '/man1'       Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\tif test ! -d $(DESTDIR)$$i; then \\\n' Comment.Preproc
@@ -4338,19 +4338,19 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Misc/python.man' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4358,217 +4358,217 @@
 'MANDIR'      Text
 ')'           Keyword
 '/man1/python.1' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Install the library\n' Comment
 
 'PLATDIR'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'plat-'       Text
 '$('          Keyword
 'MACHDEP'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'EXTRAPLATDIR' Name.Variable
 '='           Operator
-' '           Text
-'\n'          Text
+' '           Text.Whitespace
+'\n'          Text.Whitespace
 
 'EXTRAMACHDEPPATH' Name.Variable
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MACHDEPS'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'PLATDIR'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'EXTRAPLATDIR' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'XMLLIBSUBDIRS' Name.Variable
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 'xml'         Text
-' '           Text
+' '           Text.Whitespace
 'xml/dom'     Text
-' '           Text
+' '           Text.Whitespace
 'xml/etree'   Text
-' '           Text
+' '           Text.Whitespace
 'xml/parsers' Text
-' '           Text
+' '           Text.Whitespace
 'xml/sax'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PLATMACDIRS' Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'plat-mac'    Text
-' '           Text
+' '           Text.Whitespace
 'plat-mac/Carbon' Text
-' '           Text
+' '           Text.Whitespace
 'plat-mac/lib-scriptpackages' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'plat-mac/lib-scriptpackages/_builtinSuites' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'plat-mac/lib-scriptpackages/CodeWarrior' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'plat-mac/lib-scriptpackages/Explorer' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'plat-mac/lib-scriptpackages/Finder' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'plat-mac/lib-scriptpackages/Netscape' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'plat-mac/lib-scriptpackages/StdSuites' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'plat-mac/lib-scriptpackages/SystemEvents' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'plat-mac/lib-scriptpackages/Terminal' Text
-' \n'         Text
+' \n'         Text.Whitespace
 
 'PLATMACPATH' Name.Variable
 '='           Operator
 ':plat-mac:plat-mac/lib-scriptpackages' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'LIBSUBDIRS'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'lib-tk'      Text
-' '           Text
+' '           Text.Whitespace
 'site-packages' Text
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'test/output' Text
-' '           Text
+' '           Text.Whitespace
 'test/data'   Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'test/decimaltestdata' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'encodings'   Text
-' '           Text
+' '           Text.Whitespace
 'compiler'    Text
-' '           Text
+' '           Text.Whitespace
 'hotshot'     Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'email'       Text
-' '           Text
+' '           Text.Whitespace
 'email/mime'  Text
-' '           Text
+' '           Text.Whitespace
 'email/test'  Text
-' '           Text
+' '           Text.Whitespace
 'email/test/data' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'sqlite3'     Text
-' '           Text
+' '           Text.Whitespace
 'sqlite3/test' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'logging'     Text
-' '           Text
+' '           Text.Whitespace
 'bsddb'       Text
-' '           Text
+' '           Text.Whitespace
 'bsddb/test'  Text
-' '           Text
+' '           Text.Whitespace
 'csv'         Text
-' '           Text
+' '           Text.Whitespace
 'wsgiref'     Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'ctypes'      Text
-' '           Text
+' '           Text.Whitespace
 'ctypes/test' Text
-' '           Text
+' '           Text.Whitespace
 'ctypes/macholib' Text
-' '           Text
+' '           Text.Whitespace
 'idlelib'     Text
-' '           Text
+' '           Text.Whitespace
 'idlelib/Icons' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'distutils'   Text
-' '           Text
+' '           Text.Whitespace
 'distutils/command' Text
-' '           Text
+' '           Text.Whitespace
 'distutils/tests' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'XMLLIBSUBDIRS' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'setuptools'  Text
-' '           Text
+' '           Text.Whitespace
 'setuptools/command' Text
-' '           Text
+' '           Text.Whitespace
 'setuptools/tests' Text
-' '           Text
+' '           Text.Whitespace
 'setuptools.egg-info' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'curses'      Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MACHDEPS'    Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'libinstall'  Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'BUILDPYTHON' Name.Variable
 ')'           Keyword
@@ -4582,29 +4582,29 @@
 '$('          Keyword
 'PLATDIR'     Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SCRIPTDIR'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\tif test ! -d $(DESTDIR)$$i; then \\\n' Comment.Preproc
@@ -4619,26 +4619,26 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'd'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBSUBDIRS'  Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'a'           Name.Variable
 '='           Operator
 '$('          Keyword
@@ -4648,7 +4648,7 @@
 '$$'          Name.Variable
 'd'           Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\tif test ! -d $$a; then continue; else true; fi; \\\n' Comment.Preproc
@@ -4667,35 +4667,35 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib/*.py'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib/*.doc'  Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib/*.egg-info' Text
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\tif test -x $$i; then \\\n' Comment.Preproc
@@ -4714,26 +4714,26 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'd'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBSUBDIRS'  Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'a'           Name.Variable
 '='           Operator
 '$('          Keyword
@@ -4743,7 +4743,7 @@
 '$$'          Name.Variable
 'd'           Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\tif test ! -d $$a; then continue; else true; fi; \\\n' Comment.Preproc
@@ -4790,16 +4790,16 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/LICENSE'    Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4807,7 +4807,7 @@
 'LIBDEST'     Text
 ')'           Keyword
 '/LICENSE.txt' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'PYTHONPATH'  Name.Variable
 '='           Operator
 '$('          Keyword
@@ -4816,23 +4816,23 @@
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
-'  '          Text
+'  '          Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-Wi'         Text
-' '           Text
+' '           Text.Whitespace
 '-tt'         Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4840,32 +4840,32 @@
 'LIBDEST'     Text
 ')'           Keyword
 '/compileall.py' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-x'          Text
-' '           Text
+' '           Text.Whitespace
 "'bad_coding|badsyntax|site-packages'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'PYTHONPATH'  Name.Variable
 '='           Operator
 '$('          Keyword
@@ -4874,25 +4874,25 @@
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-Wi'         Text
-' '           Text
+' '           Text.Whitespace
 '-tt'         Text
-' '           Text
+' '           Text.Whitespace
 '-O'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4900,32 +4900,32 @@
 'LIBDEST'     Text
 ')'           Keyword
 '/compileall.py' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-x'          Text
-' '           Text
+' '           Text.Whitespace
 "'bad_coding|badsyntax|site-packages'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-PYTHONPATH' Text
 '='           Operator
 '$('          Keyword
@@ -4934,23 +4934,23 @@
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
-'  '          Text
+'  '          Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-Wi'         Text
-' '           Text
+' '           Text.Whitespace
 '-t'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4958,26 +4958,26 @@
 'LIBDEST'     Text
 ')'           Keyword
 '/compileall.py' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
 '/site-packages' Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-x'          Text
-' '           Text
+' '           Text.Whitespace
 'badsyntax'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -4985,7 +4985,7 @@
 'LIBDEST'     Text
 ')'           Keyword
 '/site-packages' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-PYTHONPATH' Text
 '='           Operator
 '$('          Keyword
@@ -4994,25 +4994,25 @@
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-Wi'         Text
-' '           Text
+' '           Text.Whitespace
 '-t'          Text
-' '           Text
+' '           Text.Whitespace
 '-O'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5020,26 +5020,26 @@
 'LIBDEST'     Text
 ')'           Keyword
 '/compileall.py' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBDEST'     Text
 ')'           Keyword
 '/site-packages' Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-x'          Text
-' '           Text
+' '           Text.Whitespace
 'badsyntax'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5047,17 +5047,17 @@
 'LIBDEST'     Text
 ')'           Keyword
 '/site-packages' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# Create the PLATDIR source directory, if one wasn't distributed..\n" Comment
 
 '$(srcdir)/Lib/$(PLATDIR)' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'mkdir'       Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
@@ -5065,14 +5065,14 @@
 '$('          Keyword
 'PLATDIR'     Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'cp'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib/plat-generic/regen' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
@@ -5081,12 +5081,12 @@
 'PLATDIR'     Text
 ')'           Keyword
 '/regen'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'export'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'PATH'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PATH'        Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5095,41 +5095,41 @@
 'PATH'        Literal.String.Double
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'export'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'PYTHONPATH'  Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PYTHONPATH'  Name.Variable
 '='           Operator
 '"`pwd`/Lib"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'export'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'DYLD_FRAMEWORK_PATH' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'DYLD_FRAMEWORK_PATH' Name.Variable
 '='           Operator
 '"`pwd`"'     Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'export'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'EXE'         Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'EXE'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -5138,12 +5138,12 @@
 ')'           Keyword
 '"'           Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
@@ -5152,9 +5152,9 @@
 'PLATDIR'     Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 './regen'     Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Install the include files\n' Comment
 
@@ -5163,41 +5163,41 @@
 '$('          Keyword
 'INCLUDEDIR'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'CONFINCLUDEDIR' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'INCLUDEPY'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'CONFINCLUDEPY' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'inclinstall' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'INCLDIRSTOMAKE' Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\tif test ! -d $(DESTDIR)$$i; then \\\n' Comment.Preproc
@@ -5212,51 +5212,51 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Include/*.h' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'INCLUDEPY'   Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5264,18 +5264,18 @@
 'INCLUDEPY'   Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'done'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'pyconfig.h'  Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5283,7 +5283,7 @@
 'CONFINCLUDEPY' Text
 ')'           Keyword
 '/pyconfig.h' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Install the library and miscellaneous stuff needed for extending/embedding\n' Comment
 
@@ -5291,44 +5291,44 @@
 
 'LIBPL'       Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'LIBP'        Text
 ')'           Keyword
 '/config'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'libainstall' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'all'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBDIR'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBP'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBPL'       Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\tif test ! -d $(DESTDIR)$$i; then \\\n' Comment.Preproc
@@ -5343,25 +5343,25 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@if'         Text
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '-d'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBRARY'     Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t\tif test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \\\n' Comment.Preproc
@@ -5386,13 +5386,13 @@
 
 '\tfi\n'      Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Modules/config.c' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5400,13 +5400,13 @@
 'LIBPL'       Text
 ')'           Keyword
 '/config.c'   Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Modules/python.o' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5414,16 +5414,16 @@
 'LIBPL'       Text
 ')'           Keyword
 '/python.o'   Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Modules/config.c.in' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5431,13 +5431,13 @@
 'LIBPL'       Text
 ')'           Keyword
 '/config.c.in' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Makefile'    Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5445,13 +5445,13 @@
 'LIBPL'       Text
 ')'           Keyword
 '/Makefile'   Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Modules/Setup' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5459,13 +5459,13 @@
 'LIBPL'       Text
 ')'           Keyword
 '/Setup'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Modules/Setup.local' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5473,13 +5473,13 @@
 'LIBPL'       Text
 ')'           Keyword
 '/Setup.local' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Modules/Setup.config' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5487,16 +5487,16 @@
 'LIBPL'       Text
 ')'           Keyword
 '/Setup.config' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_SCRIPT' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Modules/makesetup' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5504,16 +5504,16 @@
 'LIBPL'       Text
 ')'           Keyword
 '/makesetup'  Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_SCRIPT' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/install-sh' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5521,17 +5521,17 @@
 'LIBPL'       Text
 ')'           Keyword
 '/install-sh' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t# Substitution happens here, as the completely-expanded BINDIR\n' Comment
 
 '\t# is not available in configure\n' Comment
 
-'\t'          Text
+'\t'          Text.Whitespace
 'sed'         Text
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 's,@EXENAME@,' Literal.String.Double
 '$('          Keyword
@@ -5546,22 +5546,22 @@
 ')'           Keyword
 ','           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '<'           Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Misc/python-config.in' Text
-' '           Text
+' '           Text.Whitespace
 '>python-config' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_SCRIPT' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'python-config' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5573,24 +5573,24 @@
 'VERSION'     Text
 ')'           Keyword
 '-config'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 'python-config' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@if'         Text
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '-s'          Text
-' '           Text
+' '           Text.Whitespace
 'Modules/python.exp' Text
-' '           Text
+' '           Text.Whitespace
 '-a'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '"'           Literal.String.Double
 '`echo '      Literal.String.Double
 '$('          Keyword
@@ -5598,39 +5598,39 @@
 ')'           Keyword
 " | sed 's/^\\(...\\).*/\\1/'`" Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"aix"'       Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"Installing support files for building shared extension modules on AIX:"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Modules/python.exp' Text
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5639,15 +5639,15 @@
 ')'           Keyword
 '/python.exp' Text
 ';'           Punctuation
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$('          Keyword
 'LIBPL'       Text
@@ -5655,22 +5655,22 @@
 '/python.exp' Literal.String.Double
 '"'           Literal.String.Double
 ';'           Punctuation
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_SCRIPT' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Modules/makexp_aix' Text
-'\t'          Text
+'\t'          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5679,12 +5679,12 @@
 ')'           Keyword
 '/makexp_aix' Text
 ';'           Punctuation
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$('          Keyword
 'LIBPL'       Text
@@ -5692,22 +5692,22 @@
 '/makexp_aix' Literal.String.Double
 '"'           Literal.String.Double
 ';'           Punctuation
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_SCRIPT' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Modules/ld_so_aix' Text
-'\t'          Text
+'\t'          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5716,12 +5716,12 @@
 ')'           Keyword
 '/ld_so_aix'  Text
 ';'           Punctuation
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$('          Keyword
 'LIBPL'       Text
@@ -5729,58 +5729,58 @@
 '/ld_so_aix'  Literal.String.Double
 '"'           Literal.String.Double
 ';'           Punctuation
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"See Misc/AIX-NOTES for details."' Literal.String.Double
 ';'           Punctuation
-'\t'          Text
+'\t'          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\telse true; \\\n' Comment.Preproc
 
 '\tfi\n'      Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@case'       Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$('          Keyword
 'MACHDEP'     Text
 ')'           Keyword
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'beos*'       Text
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"Installing support files for building shared extension modules on BeOS:"' Literal.String.Double
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Misc/BeOS-NOTES' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5789,15 +5789,15 @@
 ')'           Keyword
 '/README'     Text
 ';'           Punctuation
-'\t'          Text
+'\t'          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$('          Keyword
 'LIBPL'       Text
@@ -5805,16 +5805,16 @@
 '/README'     Literal.String.Double
 '"'           Literal.String.Double
 ';'           Punctuation
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_SCRIPT' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Modules/ar_beos' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5823,12 +5823,12 @@
 ')'           Keyword
 '/ar_beos'    Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$('          Keyword
 'LIBPL'       Text
@@ -5836,16 +5836,16 @@
 '/ar_beos'    Literal.String.Double
 '"'           Literal.String.Double
 ';'           Punctuation
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_SCRIPT' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'Modules/ld_so_beos' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -5854,12 +5854,12 @@
 ')'           Keyword
 '/ld_so_beos' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$('          Keyword
 'LIBPL'       Text
@@ -5867,29 +5867,29 @@
 '/ld_so_beos' Literal.String.Double
 '"'           Literal.String.Double
 ';'           Punctuation
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"See Misc/BeOS-NOTES for details."' Literal.String.Double
 ';'           Punctuation
-'\t'          Text
+'\t'          Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 ';'           Punctuation
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'esac'        Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Install the dynamically loadable modules\n' Comment
 
@@ -5897,64 +5897,64 @@
 
 'sharedinstall' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-E'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/setup.py'   Text
-' '           Text
+' '           Text.Whitespace
 'install'     Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t   \t'     Text
+'\t   \t'     Text.Whitespace
 '--prefix'    Text
 '='           Operator
 '$('          Keyword
 'prefix'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '--install-scripts' Text
 '='           Operator
 '$('          Keyword
 'BINDIR'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '--install-platlib' Text
 '='           Operator
 '$('          Keyword
 'DESTSHARED'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '--root'      Text
 '='           Operator
 '/'           Text
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Here are a couple of targets for MacOSX again, to install a full\n' Comment
 
@@ -5974,11 +5974,11 @@
 
 'frameworkinstall' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'install'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# On install, we re-make the framework\n' Comment
 
@@ -5990,92 +5990,92 @@
 
 '# only have to cater for the structural bits of the framework.\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'frameworkinstallframework' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'frameworkinstallstructure' Name
 ' '           Text
 'install'     Name
 ' '           Text
 'frameworkinstallmaclib' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'frameworkinstallstructure' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'LDLIBRARY'   Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@if'         Text
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'no-framework' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'Not'         Text
-' '           Text
+' '           Text.Whitespace
 'configured'  Text
-' '           Text
+' '           Text.Whitespace
 'with'        Text
-' '           Text
+' '           Text.Whitespace
 '--enable-framework' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\telse true; \\\n' Comment.Preproc
 
 '\tfi\n'      Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@for'        Text
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'prefix'      Text
 ')'           Keyword
 '/Resources/English.lproj' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'prefix'      Text
 ')'           Keyword
 '/lib'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
 '\\\n'        Literal.String.Escape
 
@@ -6091,18 +6091,18 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-fsn'        Text
-' '           Text
+' '           Text.Whitespace
 'include/python' Text
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -6110,16 +6110,16 @@
 'prefix'      Text
 ')'           Keyword
 '/Headers'    Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RESSRCDIR'   Text
 ')'           Keyword
 '/Info.plist' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -6127,16 +6127,16 @@
 'prefix'      Text
 ')'           Keyword
 '/Resources/Info.plist' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RESSRCDIR'   Text
 ')'           Keyword
 '/version.plist' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -6144,19 +6144,19 @@
 'prefix'      Text
 ')'           Keyword
 '/Resources/version.plist' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_DATA' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RESSRCDIR'   Text
 ')'           Keyword
 '/English.lproj/InfoPlist.strings' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -6164,17 +6164,17 @@
 'prefix'      Text
 ')'           Keyword
 '/Resources/English.lproj/InfoPlist.strings' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-fsn'        Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'VERSION'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -6182,15 +6182,15 @@
 'PYTHONFRAMEWORKINSTALLDIR' Text
 ')'           Keyword
 '/Versions/Current' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-fsn'        Text
-' '           Text
+' '           Text.Whitespace
 'Versions/Current/Python' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -6198,15 +6198,15 @@
 'PYTHONFRAMEWORKINSTALLDIR' Text
 ')'           Keyword
 '/Python'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-fsn'        Text
-' '           Text
+' '           Text.Whitespace
 'Versions/Current/Headers' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -6214,15 +6214,15 @@
 'PYTHONFRAMEWORKINSTALLDIR' Text
 ')'           Keyword
 '/Headers'    Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'LN'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-fsn'        Text
-' '           Text
+' '           Text.Whitespace
 'Versions/Current/Resources' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -6230,15 +6230,15 @@
 'PYTHONFRAMEWORKINSTALLDIR' Text
 ')'           Keyword
 '/Resources'  Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'INSTALL_SHARED' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LDLIBRARY'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -6249,7 +6249,7 @@
 '$('          Keyword
 'LDLIBRARY'   Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This installs Mac/Lib into the framework\n' Comment
 
@@ -6259,15 +6259,15 @@
 
 'frameworkinstallmaclib' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'ln'          Text
-' '           Text
+' '           Text.Whitespace
 '-fs'         Text
-' '           Text
+' '           Text.Whitespace
 '"../../../Python"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$('          Keyword
 'DESTDIR'     Text
@@ -6285,19 +6285,19 @@
 ')'           Keyword
 '.a'          Literal.String.Double
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'Mac'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'installmacsubtree' Text
-' '           Text
+' '           Text.Whitespace
 'DESTDIR'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -6305,27 +6305,27 @@
 'DESTDIR'     Text
 ')'           Keyword
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This installs the IDE, the Launcher and other apps into /Applications\n' Comment
 
 'frameworkinstallapps' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'Mac'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'installapps' Text
-' '           Text
+' '           Text.Whitespace
 'DESTDIR'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -6333,27 +6333,27 @@
 'DESTDIR'     Text
 ')'           Keyword
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This install the unix python and pythonw tools in /usr/local/bin\n' Comment
 
 'frameworkinstallunixtools' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'Mac'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'installunixtools' Text
-' '           Text
+' '           Text.Whitespace
 'DESTDIR'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -6361,25 +6361,25 @@
 'DESTDIR'     Text
 ')'           Keyword
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'frameworkaltinstallunixtools' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'Mac'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'altinstallunixtools' Text
-' '           Text
+' '           Text.Whitespace
 'DESTDIR'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -6387,7 +6387,7 @@
 'DESTDIR'     Text
 ')'           Keyword
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This installs the Demos and Tools into the applications directory.\n' Comment
 
@@ -6395,19 +6395,19 @@
 
 'frameworkinstallextras' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'Mac'         Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'Make'        Text
-' '           Text
+' '           Text.Whitespace
 'installextras' Text
-' '           Text
+' '           Text.Whitespace
 'DESTDIR'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -6415,74 +6415,74 @@
 'DESTDIR'     Text
 ')'           Keyword
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This installs a few of the useful scripts in Tools/scripts\n' Comment
 
 'scriptsinstall' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'SRCDIR'      Name.Variable
 '='           Operator
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'RUNSHARED'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 './'          Text
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Tools/scripts/setup.py' Text
-' '           Text
+' '           Text.Whitespace
 'install'     Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '--prefix'    Text
 '='           Operator
 '$('          Keyword
 'prefix'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '--install-scripts' Text
 '='           Operator
 '$('          Keyword
 'BINDIR'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '--root'      Text
 '='           Operator
 '/'           Text
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Build the toplevel Makefile\n' Comment
 
 'Makefile.pre' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Makefile'    Name
 '.'           Text
 'pre'         Name
@@ -6492,63 +6492,63 @@
 'config'      Name
 '.'           Text
 'status'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'CONFIG_FILES' Name.Variable
 '='           Operator
 'Makefile.pre' Text
-' '           Text
+' '           Text.Whitespace
 'CONFIG_HEADERS' Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SHELL'       Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'config.status' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 'Makefile.pre' Text
-' '           Text
+' '           Text.Whitespace
 'Makefile'    Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Run the configure script.\n' Comment
 
 'config.status' Name.Function
 ':'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
 '/'           Text
 'configure'   Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'SHELL'       Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/configure'  Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'CONFIG_ARGS' Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '.PRECIOUS'   Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'config'      Name
 '.'           Text
 'status'      Name
@@ -6562,59 +6562,59 @@
 'Makefile'    Name
 '.'           Text
 'pre'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Some make's put the object file in the current directory\n" Comment
 
 '.c.o'        Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PY_CFLAGS'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$'           Text
 '<'           Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Run reindent on the library\n' Comment
 
 'reindent'    Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 './python'    Text
 '$('          Keyword
 'EXEEXT'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Tools/scripts/reindent.py' Text
-' '           Text
+' '           Text.Whitespace
 '-r'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/Lib'        Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Rerun configure with the same options as it was run last time,\n' Comment
 
@@ -6622,180 +6622,180 @@
 
 'recheck'     Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'SHELL'       Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'config.status' Text
-' '           Text
+' '           Text.Whitespace
 '--recheck'   Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'SHELL'       Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'config.status' Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Rebuild the configure script from configure.in; also rebuild pyconfig.h.in\n' Comment
 
 'autoconf'    Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '('           Operator
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'autoconf'    Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '('           Operator
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'autoheader'  Text
 ')'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Create a tags file for vi\n' Comment
 
 'tags'        Name.Function
 '::'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'ctags'       Text
-' '           Text
+' '           Text.Whitespace
 '-w'          Text
-' '           Text
+' '           Text.Whitespace
 '-t'          Text
-' '           Text
+' '           Text.Whitespace
 'Include/*.h' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SRCDIRS'     Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ctags'       Text
-' '           Text
+' '           Text.Whitespace
 '-w'          Text
-' '           Text
+' '           Text.Whitespace
 '-t'          Text
-' '           Text
+' '           Text.Whitespace
 '-a'          Text
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable
 'i/*.'        Text
 '['           Operator
 'ch'          Text
 ']'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'done'        Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'sort'        Text
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 'tags'        Text
-' '           Text
+' '           Text.Whitespace
 'tags'        Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Create a tags file for GNU Emacs\n' Comment
 
 'TAGS'        Name.Function
 '::'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'etags'       Text
-' '           Text
+' '           Text.Whitespace
 'Include/*.h' Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SRCDIRS'     Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 'etags'       Text
-' '           Text
+' '           Text.Whitespace
 '-a'          Text
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable
 'i/*.'        Text
 '['           Operator
 'ch'          Text
 ']'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'done'        Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Sanitation targets -- clean leaves libraries, executables and tags\n' Comment
 
@@ -6803,194 +6803,194 @@
 
 'pycremoval'  Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.py[co]'"  Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 "';'"         Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'clean'       Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'pycremoval'  Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.o'"       Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 "';'"         Literal.String.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.s[ol]'"   Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 "';'"         Literal.String.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/build'      Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'fficonfig.h'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 "';'"         Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Name.Builtin
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
 '/build'      Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'fficonfig.py'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 "';'"         Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Name.Builtin
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'clobber'     Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'clean'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '-rm'         Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'BUILDPYTHON' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PGEN'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBRARY'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LDLIBRARY'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DLLLIBRARY'  Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'tags'        Text
-' '           Text
+' '           Text.Whitespace
 'TAGS'        Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'config.cache' Text
-' '           Text
+' '           Text.Whitespace
 'config.log'  Text
-' '           Text
+' '           Text.Whitespace
 'pyconfig.h'  Text
-' '           Text
+' '           Text.Whitespace
 'Modules/config.c' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-rm'         Text
-' '           Text
+' '           Text.Whitespace
 '-rf'         Text
-' '           Text
+' '           Text.Whitespace
 'build'       Text
-' '           Text
+' '           Text.Whitespace
 'platform'    Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-rm'         Text
-' '           Text
+' '           Text.Whitespace
 '-rf'         Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'PYTHONFRAMEWORKDIR' Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Make things extra clean, before making a distribution:\n' Comment
 
@@ -7000,401 +7000,401 @@
 
 'distclean'   Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'clobber'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '-rm'         Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 'core'        Text
-' '           Text
+' '           Text.Whitespace
 'Makefile'    Text
-' '           Text
+' '           Text.Whitespace
 'Makefile.pre' Text
-' '           Text
+' '           Text.Whitespace
 'config.status' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'Modules/Setup' Text
-' '           Text
+' '           Text.Whitespace
 'Modules/Setup.local' Text
-' '           Text
+' '           Text.Whitespace
 'Modules/Setup.config' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 "'('"         Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.fdc'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*~'"        Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t   '   Text
+'\t\t\t   '   Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'[@,#]*'"    Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.old'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t   '   Text
+'\t\t\t   '   Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.orig'"    Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.rej'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t   '   Text
+'\t\t\t   '   Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.bak'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 "')'"         Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t\t   '   Text
+'\t\t\t   '   Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 "';'"         Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Check for smelly exported symbols (not starting with Py/_Py)\n' Comment
 
 'smelly'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'all'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'nm'          Text
-' '           Text
+' '           Text.Whitespace
 '-p'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LIBRARY'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'sed'         Text
-' '           Text
+' '           Text.Whitespace
 '-n'          Text
-' '           Text
+' '           Text.Whitespace
 '"/ [TDB] /s/.* //p"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'grep'        Text
-' '           Text
+' '           Text.Whitespace
 '-v'          Text
-' '           Text
+' '           Text.Whitespace
 '"^_*Py"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sort'        Text
-' '           Text
+' '           Text.Whitespace
 '-u'          Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Find files with funny names\n' Comment
 
 'funny'       Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'find'        Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DISTDIRS'    Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-type'       Text
-' '           Text
+' '           Text.Whitespace
 'd'           Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.[chs]'"   Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.py'"      Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.doc'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.sty'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.bib'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.dat'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.el'"      Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.fd'"      Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.in'"      Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*.tex'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'*,[vpt]'"   Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'Setup'"     Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 "'Setup.*'"   Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'README'      Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'Makefile'    Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'ChangeLog'   Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'Repository'  Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'Root'        Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'Entries'     Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'Tag'         Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'tags'        Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'TAGS'        Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '.cvsignore'  Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 'MANIFEST'    Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-print'      Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Dependencies\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Python/thread.o' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -7515,15 +7515,15 @@
 'thread_wince' Name
 '.'           Text
 'h'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Declare targets that aren't real files\n" Comment
 
 '.PHONY'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'all'         Name
 ' '           Text
 'sharedmods'  Name
@@ -7535,11 +7535,11 @@
 'quicktest'   Name
 ' '           Text
 'memtest'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.PHONY'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'install'     Name
 ' '           Text
 'altinstall'  Name
@@ -7549,11 +7549,11 @@
 'bininstall'  Name
 ' '           Text
 'altbininstall' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.PHONY'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'maninstall'  Name
 ' '           Text
 'libinstall'  Name
@@ -7563,31 +7563,31 @@
 'libainstall' Name
 ' '           Text
 'sharedinstall' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.PHONY'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'frameworkinstall' Name
 ' '           Text
 'frameworkinstallframework' Name
 ' '           Text
 'frameworkinstallstructure' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.PHONY'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'frameworkinstallmaclib' Name
 ' '           Text
 'frameworkinstallapps' Name
 ' '           Text
 'frameworkinstallunixtools' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.PHONY'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'frameworkaltinstallunixtools' Name
 ' '           Text
 'recheck'     Name
@@ -7600,29 +7600,29 @@
 ' '           Text
 'distclean'   Name
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.PHONY'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'smelly'      Name
 ' '           Text
 'funny'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Rules appended by makedepend\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/threadmodule.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -7664,11 +7664,11 @@
 'threadmodule' Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/threadmodule$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 'threadmodule' Name
@@ -7698,11 +7698,11 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/signalmodule.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -7744,11 +7744,11 @@
 'signalmodule' Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/signalmodule$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 'signalmodule' Name
@@ -7778,11 +7778,11 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/posixmodule.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -7824,11 +7824,11 @@
 'posixmodule' Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/posixmodule$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 'posixmodule' Name
@@ -7858,11 +7858,11 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/errnomodule.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -7904,11 +7904,11 @@
 'errnomodule' Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/errnomodule$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 'errnomodule' Name
@@ -7938,11 +7938,11 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/pwdmodule.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -7984,11 +7984,11 @@
 'pwdmodule'   Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/pwdmodule$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 'pwdmodule'   Name
@@ -8018,11 +8018,11 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/_sre.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -8064,11 +8064,11 @@
 '_sre'        Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/_sre$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 '_sre'        Name
@@ -8098,11 +8098,11 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/_codecsmodule.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -8144,11 +8144,11 @@
 '_codecsmodule' Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/_codecsmodule$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 '_codecsmodule' Name
@@ -8178,11 +8178,11 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/zipimport.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -8224,11 +8224,11 @@
 'zipimport'   Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/zipimport$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 'zipimport'   Name
@@ -8258,11 +8258,11 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/symtablemodule.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -8304,11 +8304,11 @@
 'symtablemodule' Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/_symtablemodule$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 'symtablemodule' Name
@@ -8338,11 +8338,11 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/xxsubtype.o' Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'srcdir'      Name.Variable
 ')'           Keyword
@@ -8384,11 +8384,11 @@
 'xxsubtype'   Name
 '.'           Text
 'o'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modules/xxsubtype$(SO)' Name.Function
 ':'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'Modules'     Name
 '/'           Text
 'xxsubtype'   Name
@@ -8418,4 +8418,4 @@
 '$('          Keyword
 'SO'          Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/make/automake.mk.output b/tests/examplefiles/make/automake.mk.output
index 935e0ebc1e..5e4c3f640e 100644
--- a/tests/examplefiles/make/automake.mk.output
+++ b/tests/examplefiles/make/automake.mk.output
@@ -1,26 +1,26 @@
 'if DEBUG\n'  Comment.Preproc
 
 'DBG'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'debug'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else\n'      Comment.Preproc
 
 'DBG'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'noinst_PROGRAMS' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DBG'         Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/make/firefox.mak.output b/tests/examplefiles/make/firefox.mak.output
index d35d246378..fa4ce11159 100644
--- a/tests/examplefiles/make/firefox.mak.output
+++ b/tests/examplefiles/make/firefox.mak.output
@@ -70,45 +70,45 @@
 
 '# ***** END LICENSE BLOCK *****\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DEPTH'       Name.Variable
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'topsrcdir'   Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@top_srcdir@' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'srcdir'      Name.Variable
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@srcdir@'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'VPATH'       Name.Variable
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@srcdir@'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'include $(DEPTH)/config/autoconf.mk\n' Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'include $(topsrcdir)/build/unix/modules.mk\n' Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifeq ($(BUILD_MODULES),all)\n' Comment.Preproc
 
@@ -123,176 +123,176 @@
 '#\n'         Comment
 
 'SUPPRESS_DEFAULT_RULES' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'default alldep all' Name.Function
 '::'          Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SUBMAKEFILES' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'RM'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-rf'         Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
 '/sdk'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'RM'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-rf'         Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
 '/include'    Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'config'      Text
-' '           Text
+' '           Text.Whitespace
 'export'      Name.Builtin
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'nspr'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'ldap'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'tier_0'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'tier_1'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'tier_2'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'tier_9'      Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'tier_50'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'tier_99'     Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Make sure that the existing rulesets work\n' Comment
 
 'DIRS'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'tier_0_dirs' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'tier_1_dirs' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'tier_2_dirs' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'tier_9_dirs' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'tier_50_dirs' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ifdef GC_LEAK_DETECTOR\n' Comment.Preproc
 
 'DIRS'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'gc/boehm'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DIRS'        Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'tier_99_dirs' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#\n'         Comment
 
@@ -301,26 +301,26 @@
 '# \n'        Comment
 
 'tier_0_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'config'      Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'build'       Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '#\n'         Comment
 
@@ -329,87 +329,87 @@
 '#\n'         Comment
 
 'tier_1_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'dbm'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifndef MOZ_NATIVE_JPEG\n' Comment.Preproc
 
 'tier_1_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'jpeg'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifndef MOZ_NATIVE_ZLIB\n' Comment.Preproc
 
 'tier_1_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'modules/zlib' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Installer needs standalone libjar, hence standalone zlib\n' Comment
 
 'ifdef MOZ_INSTALLER\n' Comment.Preproc
 
 'tier_1_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'modules/zlib/standalone' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_UPDATER\n' Comment.Preproc
 
 'tier_1_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'modules/libbz2' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tier_1_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'modules/libmar' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_SVG_RENDERER_LIBART\n' Comment.Preproc
 
 'tier_1_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'other-licenses/libart_lgpl' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#\n'         Comment
 
@@ -418,54 +418,54 @@
 '# \n'        Comment
 
 'tier_2_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'js'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'xpcom'       Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ifndef MOZ_NO_XPCOM_OBSOLETE\n' Comment.Preproc
 
 'tier_2_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'modules/libreg' Text
-' '           Text
+' '           Text.Whitespace
 'xpcom/obsolete' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef NS_TRACE_MALLOC\n' Comment.Preproc
 
 'tier_2_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'tools/trace-malloc/lib' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#\n'         Comment
 
@@ -473,299 +473,299 @@
 
 '#\n'         Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tier_9_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'js/src/xpconnect' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'intl'        Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'db'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ifdef MOZ_STORAGE\n' Comment.Preproc
 
 'tier_9_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'storage'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_ENABLE_XLIB\n' Comment.Preproc
 
 'tier_9_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'gfx/src/xlibrgb' Text
-' '           Text
+' '           Text.Whitespace
 'widget/src/xlibxtbin' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_ENABLE_GTK\n' Comment.Preproc
 
 'tier_9_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'widget/src/gtksuperwin' Text
-' '           Text
+' '           Text.Whitespace
 'widget/src/gtkxtbin' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_ENABLE_GTK2\n' Comment.Preproc
 
 'tier_9_dirs' Name.Variable
-'     '       Text
+'     '       Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'widget/src/gtkxtbin' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_IPCD\n' Comment.Preproc
 
 'tier_9_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'ipc/ipcd'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_JSDEBUGGER\n' Comment.Preproc
 
 'tier_9_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'js/jsd'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tier_9_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'modules/libutil' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'netwerk'     Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'modules/libjar' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'uriloader'   Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'modules/libpref' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'modules/libimg' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'caps'        Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'rdf'         Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'parser/expat' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'parser/xml'  Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'parser/htmlparser' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'gfx'         Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'modules/libpr0n' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'sun-java'    Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'modules/plugin' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'dom'         Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'view'        Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'widget'      Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'content'     Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'layout'      Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'xpfe/components/shistory' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'docshell'    Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'webshell'    Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'embedding'   Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'editor'      Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'xpfe/appshell' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ifdef MOZ_OJI\n' Comment.Preproc
 
 'tier_9_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'js/src/liveconnect' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'modules/oji' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef ACCESSIBILITY\n' Comment.Preproc
 
 'tier_9_dirs' Name.Variable
-'    '        Text
+'    '        Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'accessible'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \n'        Comment
 
@@ -773,261 +773,261 @@
 
 '#\n'         Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_XUL\n' Comment.Preproc
 
 'ifdef MOZ_XUL_APP\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'chrome'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else\n'      Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'rdf/chrome'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'else\n'      Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'embedding/minimo/chromelite' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tier_50_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'profile'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# This must preceed xpfe\n' Comment
 
 'ifdef MOZ_JPROF\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'        '    Text
+'        '    Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'tools/jprof' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'xpfe/bootstrap/appleevents' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tier_50_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'xpfe'        Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'toolkit/components' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ifndef MOZ_XUL_APP\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'themes'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_ENABLE_XREMOTE\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'widget/src/xremoteclient' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_XUL_APP\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'toolkit'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_PHOENIX\n' Comment.Preproc
 
 "#XXXBlake this shell path is a temp hack; toolkit shouldn't depend on browser\n" Comment
 
 'tier_50_dirs' Name.Variable
-'    '        Text
+'    '        Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'browser/components/shell/public' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_XPINSTALL\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'     '       Text
+'     '       Text.Whitespace
 '+='          Operator
-'  '          Text
+'  '          Text.Whitespace
 'xpinstall'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# JavaXPCOM JNI code is compiled into libXUL\n' Comment
 
 'ifdef MOZ_JAVAXPCOM\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'extensions/java/xpcom/src' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_ENABLE_LIBXUL\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'toolkit/library' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'xpcom/stub'  Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef NS_TRACE_MALLOC\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'tools/trace-malloc' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_PSM\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'security/manager' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else\n'      Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'security/manager/boot/public' Text
-' '           Text
+' '           Text.Whitespace
 'security/manager/ssl/public' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_LDAP_XPCOM\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'directory/xpcom' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifndef MINIMO\n' Comment.Preproc
 
@@ -1036,11 +1036,11 @@
 'ifdef MOZ_ENABLE_GTK2\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'    '        Text
+'    '        Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'toolkit/components/gnome' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
@@ -1048,33 +1048,33 @@
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_LEAKY\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'        '    Text
+'        '    Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'tools/leaky' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_MAPINFO\n' Comment.Preproc
 
 'tier_50_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'tools/codesighs' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#\n'         Comment
 
@@ -1082,59 +1082,59 @@
 
 '#\n'         Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_MAIL_NEWS\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'mailnews'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_CALENDAR\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'calendar'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_EXTENSIONS\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'extensions'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_JAVAXPCOM\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'extensions/java' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# axcontrol\n' Comment
 
@@ -1143,194 +1143,194 @@
 'ifndef MOZ_NO_ACTIVEX_SUPPORT\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'embedding/browser/activex/src/control' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'embedding/browser/activex/src/control_kicker' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Java Embedding Plugin\n' Comment
 
 'ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'plugin/oji/JEP' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifneq (,$(filter browser suite,$(MOZ_BUILD_APP)))\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'xpfe/components/search' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_BRANDING_DIRECTORY\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'MOZ_BRANDING_DIRECTORY' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_PHOENIX\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'browser'     Text
-' '           Text
+' '           Text.Whitespace
 'xpfe/bootstrap/init.d' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_XULRUNNER\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'xulrunner'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_COMPOSER\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'editor/ui'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_THUNDERBIRD\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'mail'        Text
-' '           Text
+' '           Text.Whitespace
 'xpfe/bootstrap/init.d' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_STANDALONE_COMPOSER\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'composer'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_SUNBIRD\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'calendar/sunbird' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_SUITE\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'suite'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MINIMO\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'minimo'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_XUL_APP\n' Comment.Preproc
 
 'ifdef MOZ_INSTALLER\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'     '       Text
+'     '       Text.Whitespace
 '+='          Operator
-'  '          Text
+'  '          Text.Whitespace
 'toolkit/mozapps/installer' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
@@ -1341,11 +1341,11 @@
 'ifndef MINIMO\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'xpfe/bootstrap' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
@@ -1353,20 +1353,20 @@
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2))\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'embedding/browser/gtk' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# viewer\n'  Comment
 
@@ -1375,17 +1375,17 @@
 'ifndef MOZ_ENABLE_LIBXUL\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'webshell/tests' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# winembed, mfcembed\n' Comment
 
@@ -1394,17 +1394,17 @@
 'ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL))\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'embedding/tests' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# os2embed\n' Comment
 
@@ -1413,79 +1413,79 @@
 'ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL))\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'embedding/tests' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifeq ($(MOZ_BUILD_APP),macbrowser)\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'embedding/config' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'camino'      Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'NULL'        Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# test harnesses \n' Comment
 
 'ifdef ENABLE_TESTS\n' Comment.Preproc
 
 'tier_99_dirs' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'tools/test-harness' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else\n'      Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Standalone build\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DIRS'        Name.Variable
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'BUILD_MODULE_DIRS' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Hack to generate xpidl Makefile\n' Comment
 
@@ -1494,231 +1494,231 @@
 'ifneq (,$(findstring xpcom, $(BUILD_MODULE_DIRS)))\n' Comment.Preproc
 
 'DIRS'        Name.Variable
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 ':='          Operator
-' '           Text
+' '           Text.Whitespace
 'xpcom/typelib' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIRS'        Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SUBMAKEFILES' Name.Variable
-'\t'          Text
+'\t'          Text.Whitespace
 ':='          Operator
-' '           Text
+' '           Text.Whitespace
 'xpcom/typelib/Makefile' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'default'     Name.Function
 '::'          Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SUBMAKEFILES' Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'export'      Name.Builtin
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'libs'        Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'endif # BUILD_MODULES == all\n' Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'STATIC_MAKEFILES' Name.Variable
-' '           Text
+' '           Text.Whitespace
 ':='          Operator
-' '           Text
+' '           Text.Whitespace
 'nsprpub'     Text
-' '           Text
+' '           Text.Whitespace
 'directory/c-sdk' Text
-' '           Text
+' '           Text.Whitespace
 'security/nss' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GARBAGE_DIRS' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'dist'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DIST_GARBAGE' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'config.cache' Text
-' '           Text
+' '           Text.Whitespace
 'config.log'  Text
-' '           Text
+' '           Text.Whitespace
 'config.status' Text
-' '           Text
+' '           Text.Whitespace
 'config-defs.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'   '         Text
+'   '         Text.Whitespace
 'dependencies.beos' Text
-' '           Text
+' '           Text.Whitespace
 'config/autoconf.mk' Text
-' '           Text
+' '           Text.Whitespace
 'config/myrules.mk' Text
-' '           Text
+' '           Text.Whitespace
 'config/myconfig.mk' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'   '         Text
+'   '         Text.Whitespace
 'unallmakefiles' Text
-' '           Text
+' '           Text.Whitespace
 'mozilla-config.h' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'   '         Text
+'   '         Text.Whitespace
 '$('          Keyword
 'topsrcdir'   Text
 ')'           Keyword
 '/.mozconfig.mk' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'topsrcdir'   Text
 ')'           Keyword
 '/.mozconfig.out' Text
-' \n\n'       Text
+' \n\n'       Text.Whitespace
 
 '# Build pseudo-external modules first when export is explicitly called\n' Comment
 
 'export'      Name.Function
 '::'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'RM'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-rf'         Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
 '/sdk'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'config'      Text
-' '           Text
+' '           Text.Whitespace
 'export'      Name.Builtin
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'nspr'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'ldap'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifneq ($(BUILD_MODULES),all)\n' Comment.Preproc
 
 'ifneq (,$(findstring xpcom, $(BUILD_MODULE_DIRS)))\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'xpcom/typelib' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'export-idl'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'install'     Name.Function
 '::'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifndef MOZ_NATIVE_NSPR\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'nsprpub'     Text
-' '           Text
+' '           Text.Whitespace
 'real_install' Text
-' '           Text
+' '           Text.Whitespace
 'DESTDIR'     Name.Variable
 '='           Operator
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'libdir'      Name.Variable
 '='           Operator
 '$('          Keyword
 'mozappdir'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'includedir'  Name.Variable
 '='           Operator
 '$('          Keyword
 'includedir'  Text
 ')'           Keyword
 '/nspr'       Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'RM'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'addprefix'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -1730,33 +1730,33 @@
 'LIB_PREFIX'  Text
 ')'           Keyword
 ','           Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'addsuffix'   Text
-' '           Text
+' '           Text.Whitespace
 '.'           Text
 '$('          Keyword
 'LIB_SUFFIX'  Text
 ')'           Keyword
 ','           Text
-' '           Text
+' '           Text.Whitespace
 'nspr4'       Text
-' '           Text
+' '           Text.Whitespace
 'plds4'       Text
-' '           Text
+' '           Text.Whitespace
 'plc4'        Text
 ')'           Keyword
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$('          Keyword
 'RM'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'addprefix'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
@@ -1764,95 +1764,95 @@
 'bindir'      Text
 ')'           Keyword
 '/,nspr-config' Text
-' '           Text
+' '           Text.Whitespace
 'compile-et.pl' Text
-' '           Text
+' '           Text.Whitespace
 'prerr.properties' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'ifdef MOZ_LDAP_XPCOM\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'directory/c-sdk' Text
-' '           Text
+' '           Text.Whitespace
 'real_install' Text
-' '           Text
+' '           Text.Whitespace
 'DESTDIR'     Name.Variable
 '='           Operator
 '$('          Keyword
 'DESTDIR'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'libdir'      Name.Variable
 '='           Operator
 '$('          Keyword
 'mozappdir'   Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'includedir'  Name.Variable
 '='           Operator
 '$('          Keyword
 'includedir'  Text
 ')'           Keyword
 '/ldap'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'include $(topsrcdir)/config/rules.mk\n' Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Clean up after pseudo-external modules\n' Comment
 
 'clean clobber realclean clobber_all distclean' Name.Function
 '::'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifndef MOZ_NATIVE_NSPR\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'nsprpub'     Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
 'ifdef MOZ_LDAP_XPCOM\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'directory/c-sdk' Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Map mozilla targets to standard automake target\n' Comment
 
@@ -1860,7 +1860,7 @@
 
 'tier_50'     Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'addsuffix'   Name.Variable
 ' /'          Text
@@ -1883,46 +1883,46 @@
 ')'           Keyword
 ')'           Keyword
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@echo'       Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'tier_50: '   Literal.String.Double
 '$('          Keyword
 'tier_50_dirs' Text
 ')'           Keyword
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@'           Text
 '$('          Keyword
 'EXIT_ON_ERROR' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'd'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'tier_50_dirs' Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '$('          Keyword
 'UPDATE_TITLE' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t    if test ! -f $$d/Makefile; then \\\n' Comment.Preproc
@@ -1943,80 +1943,80 @@
 
 '\tdone\n'    Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@echo'       Text
-' '           Text
+' '           Text.Whitespace
 '"Building tools from tier 2/9/50"' Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@'           Text
 '$('          Keyword
 'EXIT_ON_ERROR' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'd'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'tier_2_dirs' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'tier_9_dirs' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'tier_50_dirs' Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '$('          Keyword
 'UPDATE_TITLE' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable
 'd'           Text
-' '           Text
+' '           Text.Whitespace
 'tools'       Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'done'        Keyword
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tier_%'      Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@echo'       Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$@'          Name.Variable
 ': '          Literal.String.Double
@@ -2025,36 +2025,36 @@
 '_dirs'       Text
 ')'           Keyword
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@'           Text
 '$('          Keyword
 'EXIT_ON_ERROR' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t  '        Text
+'\t  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'd'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 '$@'          Name.Variable
 '_dirs'       Text
 ')'           Keyword
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t    '      Text
+'\t    '      Text.Whitespace
 '$('          Keyword
 'UPDATE_TITLE' Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '\t    if test ! -f $$d/Makefile; then \\\n' Comment.Preproc
@@ -2073,7 +2073,7 @@
 
 '\t  done\n'  Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#\n'         Comment
 
@@ -2083,171 +2083,171 @@
 
 'boehm'       Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef GC_LEAK_DETECTOR\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'gc/boehm'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'nspr'        Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'boehm'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifndef MOZ_NATIVE_NSPR\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'nsprpub'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ldap'        Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZ_LDAP_XPCOM\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '$('          Keyword
 'MAKE'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 'directory/c-sdk' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'distclean'   Name.Function
 '::'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 'unallmakefiles' Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'XARGS'       Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 'unallmakefiles' Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST_GARBAGE' Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ifeq ($(OS_ARCH),WINNT)\n' Comment.Preproc
 
 'rebase'      Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZILLA_OFFICIAL\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'rebasing'    Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '/bin/find'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '"*.dll"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 'rebase.lst'  Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'rebase'      Text
-' '           Text
+' '           Text.Whitespace
 '-b'          Text
-' '           Text
+' '           Text.Whitespace
 '60000000'    Literal.Number
-' '           Text
+' '           Text.Whitespace
 '-R'          Text
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '-G'          Text
-' '           Text
+' '           Text.Whitespace
 'rebase.lst'  Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'rm'          Text
-' '           Text
+' '           Text.Whitespace
 'rebase.lst'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif\n'     Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'splitsymbols' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZILLA_OFFICIAL\n' Comment.Preproc
 
 'ifdef MOZ_DEBUG_SYMBOLS\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'finding'     Text
-' '           Text
+' '           Text.Whitespace
 'pdb'         Text
-' '           Text
+' '           Text.Whitespace
 'files'       Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'mkdir'       Text
-' '           Text
+' '           Text.Whitespace
 '-p'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
@@ -2255,41 +2255,41 @@
 '$('          Keyword
 'BUILDID'     Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-cp'         Text
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 '/bin/find'   Text
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '-path'       Text
-' '           Text
+' '           Text.Whitespace
 '"./dist"'    Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-prune'      Text
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '"*.dll"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sed'         Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 's/\\.dll'    Literal.String.Double
 '$$'          Name.Variable
 '/\\.pdb/'    Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xargs'       Text
 '`'           Literal.String.Backtick
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
@@ -2297,41 +2297,41 @@
 '$('          Keyword
 'BUILDID'     Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-cp'         Text
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 '/bin/find'   Text
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '-path'       Text
-' '           Text
+' '           Text.Whitespace
 '"./dist"'    Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-prune'      Text
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '"*.exe"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sed'         Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 's/\\.exe'    Literal.String.Double
 '$$'          Name.Variable
 '/\\.pdb/'    Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xargs'       Text
 '`'           Literal.String.Backtick
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
@@ -2339,41 +2339,41 @@
 '$('          Keyword
 'BUILDID'     Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '-cp'         Text
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 '/bin/find'   Text
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '-path'       Text
-' '           Text
+' '           Text.Whitespace
 '"./dist"'    Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-prune'      Text
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '"*.EXE"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sed'         Text
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 's/\\.EXE'    Literal.String.Double
 '$$'          Name.Variable
 '/\\.pdb/'    Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'xargs'       Text
 '`'           Literal.String.Backtick
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
@@ -2381,86 +2381,86 @@
 '$('          Keyword
 'BUILDID'     Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif # MOZ_DEBUG_SYMBOLS\n' Comment.Preproc
 
 'ifdef MOZ_PROFILE\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'splitting'   Text
-' '           Text
+' '           Text.Whitespace
 'symbols'     Text
-' '           Text
+' '           Text.Whitespace
 'out'         Text
-' '           Text
+' '           Text.Whitespace
 'of'          Text
-' '           Text
+' '           Text.Whitespace
 'binaries'    Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '/bin/find'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '"*.dll"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'splitsym'    Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\;'         Literal.String.Escape
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '/bin/find'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '"*.exe"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'splitsym'    Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\;'         Literal.String.Escape
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '/bin/find'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '"*.EXE"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'splitsym'    Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\;'         Literal.String.Escape
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'mkdir'       Text
-' '           Text
+' '           Text.Whitespace
 '-p'          Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
@@ -2468,24 +2468,24 @@
 '$('          Keyword
 'BUILDID'     Text
 ')'           Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '/bin/find'   Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-name'       Text
-' '           Text
+' '           Text.Whitespace
 '"*.dbg"'     Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-exec'       Text
-' '           Text
+' '           Text.Whitespace
 'mv'          Text
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
@@ -2493,94 +2493,94 @@
 '$('          Keyword
 'BUILDID'     Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '\\;'         Literal.String.Escape
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif # MOZ_PROFILE\n' Comment.Preproc
 
 'endif # MOZILLA_OFFICIAL\n' Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'signnss'     Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ifdef MOZILLA_OFFICIAL\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'signing'     Text
-' '           Text
+' '           Text.Whitespace
 'NSS'         Text
-' '           Text
+' '           Text.Whitespace
 'libs'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
 '/bin'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 './shlibsign.exe' Text
-' '           Text
+' '           Text.Whitespace
 '-v'          Text
-' '           Text
+' '           Text.Whitespace
 '-i'          Text
-' '           Text
+' '           Text.Whitespace
 'softokn3.dll' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DIST'        Text
 ')'           Keyword
 '/bin'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 './shlibsign.exe' Text
-' '           Text
+' '           Text.Whitespace
 '-v'          Text
-' '           Text
+' '           Text.Whitespace
 '-i'          Text
-' '           Text
+' '           Text.Whitespace
 'freebl3.dll' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif # MOZILLA_OFFICIAL\n' Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'BUILDID'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'shell'       Text
-' '           Text
+' '           Text.Whitespace
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'DEPTH'       Text
 ')'           Keyword
 '/config/build_number' Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'deliver'     Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'splitsymbols' Name
 ' '           Text
 'rebase'      Name
 ' '           Text
 'signnss'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif # WINNT\n' Comment.Preproc
diff --git a/tests/examplefiles/make/python25-bsd.mak.output b/tests/examplefiles/make/python25-bsd.mak.output
index d8ccfb393a..fdc4b44eb9 100644
--- a/tests/examplefiles/make/python25-bsd.mak.output
+++ b/tests/examplefiles/make/python25-bsd.mak.output
@@ -8,111 +8,111 @@
 
 '# $FreeBSD: ports/lang/python25/Makefile,v 1.145 2007/10/03 23:22:04 edwin Exp $\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PORTNAME'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'python25'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PORTVERSION' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '2'           Literal.Number
 '.5.1'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'CATEGORIES'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'lang'        Text
-' '           Text
+' '           Text.Whitespace
 'python'      Text
-' '           Text
+' '           Text.Whitespace
 'ipv6'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MASTER_SITES' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_MASTER_SITES' Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MASTER_SITE_SUBDIR' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_MASTER_SITE_SUBDIR' Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DISTFILES'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_DISTFILE' Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MAINTAINER'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'python@FreeBSD.org' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'COMMENT'     Name.Variable
 '?='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'An'          Text
-' '           Text
+' '           Text.Whitespace
 'interpreted' Text
-' '           Text
+' '           Text.Whitespace
 'object-oriented' Text
-' '           Text
+' '           Text.Whitespace
 'programming' Text
-' '           Text
+' '           Text.Whitespace
 'language'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DIST_SUBDIR' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'python'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'WRKSRC'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/portbld.static' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PATCH_WRKSRC' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'GNU_CONFIGURE' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'yes'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'CONFIGURE_TARGET' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '--build'     Text
 '='           Operator
 '${'          Literal.String.Interpol
@@ -122,18 +122,18 @@
 '${'          Literal.String.Interpol
 'OSREL'       Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'CONFIGURE_SCRIPT' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '../configure' Text
-' '           Text
+' '           Text.Whitespace
 '# must be relative\n' Comment.Single
 
 'CONFIGURE_ENV' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'OPT'         Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -141,15 +141,15 @@
 'CFLAGS'      Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'SVNVERSION'  Name.Variable
 '='           Operator
 '"echo freebsd"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MAKE_ENV'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'VPATH'       Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -157,68 +157,68 @@
 'PYTHON_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'INSTALLS_SHLIB' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'yes'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'INSTALL_TARGET' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'altinstall'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'MAN1'        Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.1'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'USE_PYTHON'  Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'yes'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PYTHON_VERSION' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'python2.5'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PYTHON_NO_DEPENDS' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'yes'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SHARED_WRKSRC' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/portbld.shared' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PLIST'       Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
 '/PLIST'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PLIST_TEMPLATE' Name.Variable
 '?='          Operator
@@ -226,11 +226,11 @@
 'PKGDIR'      Name.Variable
 '}'           Literal.String.Interpol
 '/pkg-plist'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PLIST_SUB'   Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'PYVER'       Name.Variable
 '='           Operator
 '${'          Literal.String.Interpol
@@ -239,10 +239,10 @@
 'S'           Name.Variable
 '/python//'   Punctuation
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'PYVER_WITHPAT' Name.Variable
 '='           Operator
 '${'          Literal.String.Interpol
@@ -251,11 +251,11 @@
 'S'           Name.Variable
 '/.c/c/'      Punctuation
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DEMODIR'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
@@ -263,11 +263,11 @@
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TOOLSDIR'    Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
@@ -275,193 +275,193 @@
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'BIN_SCRIPTS' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'idle'        Text
-' '           Text
+' '           Text.Whitespace
 'pydoc'       Text
-' '           Text
+' '           Text.Whitespace
 'python'      Text
-' '           Text
+' '           Text.Whitespace
 'python-shared' Text
-' '           Text
+' '           Text.Whitespace
 'smtpd.py'    Text
-' '           Text
+' '           Text.Whitespace
 'python-config' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'python-shared-config' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'BINLINKS_SUB' Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s,smtpd,smtpd${PYTHON_VER},'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s,(idle|pydoc|python-shared|python),\\1${PYTHON_VER},'" Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'OPTIONS'     Name.Variable
 '='           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'THREADS'     Text
-' '           Text
+' '           Text.Whitespace
 '"Enable thread support"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'on'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'HUGE_STACK_SIZE' Text
-' '           Text
+' '           Text.Whitespace
 '"Use a larger thread stack"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'off'         Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'UCS4'        Text
-' '           Text
+' '           Text.Whitespace
 '"Use UCS4 for unicode support"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'on'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'PYMALLOC'    Text
-' '           Text
+' '           Text.Whitespace
 '"Use python\'s internal malloc"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'on'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'IPV6'        Text
-' '           Text
+' '           Text.Whitespace
 '"Enable IPv6 support"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'on'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'FPECTL'      Text
-' '           Text
+' '           Text.Whitespace
 '"Enable floating point exception handling"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'off'         Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '.include <bsd.port.pre.mk>\n' Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}\n' Comment.Preproc
 
 'MLINKS'      Name.Variable
 '='           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.1'          Text
-' '           Text
+' '           Text.Whitespace
 'python.1'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PLIST_SUB'   Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'IF_DEFAULT'  Name.Variable
 '='           Operator
 '""'          Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.else\n'     Comment.Preproc
 
 'PLIST_SUB'   Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'IF_DEFAULT'  Name.Variable
 '='           Operator
 '"@comment "' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# workaround for a bug in base curses.h.\n' Comment
 
 'CFLAGS'      Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '-D__wchar_t' Text
 '='           Operator
 'wchar_t'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if !defined(WITHOUT_THREADS)\n' Comment.Preproc
 
 'CONFIGURE_ARGS' Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '--with-threads' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'CFLAGS'      Name.Variable
 '+='          Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PTHREAD_CFLAGS' Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if defined(WITHOUT_HUGE_STACK_SIZE)\n' Comment.Preproc
 
 'CFLAGS'      Name.Variable
 '+='          Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-DTHREAD_STACK_SIZE' Text
 '='           Operator
 '0x20000'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.else\n'     Comment.Preproc
 
 'CFLAGS'      Name.Variable
 '+='          Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-DTHREAD_STACK_SIZE' Text
 '='           Operator
 '0x100000'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif # defined(WITHOUT_HUGE_STACK_SIZE)\n' Comment.Preproc
 
 'CONFIGURE_ENV' Name.Variable
 '+='          Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'LDFLAGS'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -473,21 +473,21 @@
 'LDFLAGS'     Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.else\n'     Comment.Preproc
 
 'CONFIGURE_ARGS' Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '--without-threads' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if defined(LDFLAGS)\n' Comment.Preproc
 
 'CONFIGURE_ENV' Name.Variable
 '+='          Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'LDFLAGS'     Name.Variable
 '='           Operator
 '"'           Literal.String.Double
@@ -495,59 +495,59 @@
 'LDFLAGS'     Name.Variable
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif # defined(LDFLAGS)\n' Comment.Preproc
 
 '.endif # !defined(WITHOUT_THREADS)\n' Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)\n' Comment.Preproc
 
 'CONFIGURE_ARGS' Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '--enable-unicode' Text
 '='           Operator
 'ucs4'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if defined(WITHOUT_PYMALLOC)\n' Comment.Preproc
 
 'CONFIGURE_ARGS' Name.Variable
 '+='          Operator
-'        '    Text
+'        '    Text.Whitespace
 '--without-pymalloc' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if ${ARCH} == i386\n' Comment.Preproc
 
 'PLIST_SUB'   Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'X86_ONLY'    Name.Variable
 '='           Operator
 '""'          Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.else\n'     Comment.Preproc
 
 'PLIST_SUB'   Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'X86_ONLY'    Name.Variable
 '='           Operator
 '"@comment "' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
@@ -555,21 +555,21 @@
 
 'PLIST_SUB'   Name.Variable
 '+='          Operator
-'     '       Text
+'     '       Text.Whitespace
 '32BIT_ONLY'  Name.Variable
 '='           Operator
 '"@comment "' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.else\n'     Comment.Preproc
 
 'PLIST_SUB'   Name.Variable
 '+='          Operator
-'     '       Text
+'     '       Text.Whitespace
 '32BIT_ONLY'  Name.Variable
 '='           Operator
 '""'          Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
@@ -577,290 +577,290 @@
 
 'CFLAGS'      Name.Variable
 '+='          Operator
-'        '    Text
+'        '    Text.Whitespace
 '-DPYTHON_DEFAULT_RECURSION_LIMIT' Text
 '='           Operator
 '900'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if !exists(/usr/bin/ypcat) # the world with NO_NIS\n' Comment.Preproc
 
 'PLIST_SUB'   Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'NO_NIS'      Name.Variable
 '='           Operator
 '"@comment "' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.else\n'     Comment.Preproc
 
 'PLIST_SUB'   Name.Variable
 '+='          Operator
-'\t'          Text
+'\t'          Text.Whitespace
 'NO_NIS'      Name.Variable
 '='           Operator
 '""'          Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if !defined(WITHOUT_IPV6)\n' Comment.Preproc
 
 'CONFIGURE_ARGS' Name.Variable
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '--enable-ipv6' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.else\n'     Comment.Preproc
 
 'CONFIGURE_ARGS' Name.Variable
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '--disable-ipv6' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if defined(WITH_FPECTL)\n' Comment.Preproc
 
 'CONFIGURE_ARGS' Name.Variable
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '--with-fpectl' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if ${OSVERSION} >= 700000\n' Comment.Preproc
 
 'PLATFORMS'   Name.Variable
 '='           Operator
 'plat-freebsd4' Text
-' '           Text
+' '           Text.Whitespace
 'plat-freebsd5' Text
-' '           Text
+' '           Text.Whitespace
 'plat-freebsd6' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.elif ${OSVERSION} >= 600000\n' Comment.Preproc
 
 'PLATFORMS'   Name.Variable
 '='           Operator
 'plat-freebsd4' Text
-' '           Text
+' '           Text.Whitespace
 'plat-freebsd5' Text
-' '           Text
+' '           Text.Whitespace
 'plat-freebsd7' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.else\n'     Comment.Preproc
 
 'PLATFORMS'   Name.Variable
 '='           Operator
 'plat-freebsd4' Text
-' '           Text
+' '           Text.Whitespace
 'plat-freebsd6' Text
-' '           Text
+' '           Text.Whitespace
 'plat-freebsd7' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pre-patch'   Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'MKDIR'       Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKSRC'      Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'SHARED_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Modules'    Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PATCH_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Tools/scripts/pydoc' Text
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
 '/pydoc2.5'   Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PATCH_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Tools/scripts/idle' Text
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
 '/idle2.5'    Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PATCH_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Lib/smtpd.py' Text
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
 '/smtpd2.5.py' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'REINPLACE_CMD' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 "'s,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PATCH_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Lib/pydoc.py' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'REINPLACE_CMD' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '\'s|^\\( *prefixes = .*\\)\\]$$|\\1, "${X11BASE}"]|g\'' Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PATCH_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Lib/site.py' Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'REINPLACE_CMD' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 "'s|^\t\\(..ASDLGEN.*\\)$$|\t${TRUE}|g'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PATCH_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Makefile.pre.in' Text
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '${'          Literal.String.Interpol
 'REINPLACE_CMD' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 "'s|*\\(..INSTALL_SCRIPT.*\\)python-config$$|#port \\1|'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PATCH_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Makefile.pre.in' Text
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PATCH_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Misc/python-config.in' Text
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
@@ -869,25 +869,25 @@
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '-config'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PATCH_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Misc/python-config.in' Text
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
@@ -899,238 +899,238 @@
 '/thon/thon-shared/' Punctuation
 '}'           Literal.String.Interpol
 '-config'     Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '.if defined(WITH_FPECTL) && ${ARCH} == i386\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'MKDIR'       Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKSRC'      Name.Variable
 '}'           Literal.String.Interpol
 '/Modules'    Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'ECHO'        Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '"fpectl fpectlmodule.c"' Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '>>'          Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKSRC'      Name.Variable
 '}'           Literal.String.Interpol
 '/Modules/Setup.dist' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'post-configure' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'TAR'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKSRC'      Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-cf'         Text
-' '           Text
+' '           Text.Whitespace
 '-'           Text
-' '           Text
+' '           Text.Whitespace
 '.'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'TAR'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-C'          Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'SHARED_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-xf'         Text
-' '           Text
+' '           Text.Whitespace
 '-'           Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'LN'          Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-sf'         Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Lib'        Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKSRC'      Name.Variable
 '}'           Literal.String.Interpol
 '/Lib'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s,^\\(LDLIBRARY=\\).*$$,\\1libpython$$(VERSION).so,'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s,^\\(BLDLIBRARY=\\).*$$,\\1-L. -lpython$$(VERSION),'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s,^\\(CFLAGSFORSHARED=\\).*$$,\\1$$(CCSHARED),'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s,^\\(Makefile Modules/config.c:.*\\)Makefile.pre,\\1,'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s,^\\(.(BUILDPYTHON)\\: .*\\).(LIBRARY),\\1,'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '-e'          Text
-' '           Text
+' '           Text.Whitespace
 "'s,^\\(.(BUILDPYTHON):.*\\).(LIBRARY),\\1,'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKSRC'      Name.Variable
 '}'           Literal.String.Interpol
 '/Makefile'   Text
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'SHARED_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Makefile'   Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'pre-build'   Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'SHARED_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'SETENV'      Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'MAKE_ENV'    Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'MAKE'        Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.so'         Text
-' '           Text
+' '           Text.Whitespace
 'python'      Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'LN'          Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.so'         Text
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.so.1'       Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'LN'          Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 'python'      Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 ':'           Punctuation
 'S'           Name.Variable
 '/thon/thon-shared/' Punctuation
 '}'           Literal.String.Interpol
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'pre-su-install' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.for platform in ${PLATFORMS}\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'MKDIR'       Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHONPREFIX_LIBDIR' Name.Variable
 '}'           Literal.String.Interpol
@@ -1138,15 +1138,15 @@
 '${'          Literal.String.Interpol
 'platform'    Name.Variable
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.for file in IN.py regen\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL_DATA' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKSRC'      Name.Variable
 '}'           Literal.String.Interpol
@@ -1158,10 +1158,10 @@
 '${'          Literal.String.Interpol
 'file'        Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHONPREFIX_LIBDIR' Name.Variable
 '}'           Literal.String.Interpol
@@ -1170,120 +1170,120 @@
 'platform'    Name.Variable
 '}'           Literal.String.Interpol
 '/'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endfor\n'   Comment.Preproc
 
 '.endfor\n'   Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pre-install' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'CAT'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PLIST_TEMPLATE' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'AWK'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '\'{ print $$0; } \\\n\t/LIBDIR.*\\.py$$/ && !/\\/bad/ { print $$0 "o"; print $$0 "c"; }\'' Literal.String.Single
-'\t'          Text
+'\t'          Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PLIST'       Name.Variable
 '}'           Literal.String.Interpol
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "\t@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed\n" Comment
 
-'\t'          Text
+'\t'          Text.Whitespace
 '('           Operator
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKSRC'      Name.Variable
 '}'           Literal.String.Interpol
 '/.without_own_sha' Text
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'GREP'        Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-v'          Text
-' '           Text
+' '           Text.Whitespace
 "'lib-dynload/_sha'" Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PLIST'       Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PLIST'       Name.Variable
 '}'           Literal.String.Interpol
 '.tmp'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'CAT'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PLIST'       Name.Variable
 '}'           Literal.String.Interpol
 '.tmp'        Text
-' '           Text
+' '           Text.Whitespace
 '>'           Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PLIST'       Name.Variable
 '}'           Literal.String.Interpol
 ')'           Operator
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'TRUE'        Name.Variable
 '}'           Literal.String.Interpol
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'post-install' Name.Function
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t@# install config providers\n' Comment
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL_SCRIPT' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
@@ -1292,16 +1292,16 @@
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '-config'     Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
 '/bin'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL_SCRIPT' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
@@ -1313,20 +1313,20 @@
 '/thon/thon-shared/' Punctuation
 '}'           Literal.String.Interpol
 '-config'     Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
 '/bin'        Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '\t@# shared version of executable and library\n' Comment
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL_PROGRAM' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'SHARED_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
@@ -1335,50 +1335,50 @@
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.so.1'       Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
 '/lib'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
 '/lib'        Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'LN'          Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-sf'         Text
-' '           Text
+' '           Text.Whitespace
 'lib'         Text
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.so.1'       Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'lib'         Text
 '${'          Literal.String.Interpol
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.so'         Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'LN'          Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-sf'         Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
@@ -1387,19 +1387,19 @@
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.so'         Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHONPREFIX_LIBDIR' Name.Variable
 '}'           Literal.String.Interpol
 '/config'     Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL_PROGRAM' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'SHARED_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
@@ -1410,68 +1410,68 @@
 'S'           Name.Variable
 '/thon/thon-shared/' Punctuation
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
 '/bin'        Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '\t@# additional files installing by ports\n' Comment
 
-'\t'          Text
+'\t'          Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL_SCRIPT' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
 '/pydoc2.5'   Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
 '/idle2.5'    Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'WRKDIR'      Name.Variable
 '}'           Literal.String.Interpol
 '/smtpd2.5.py' Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
 '/bin'        Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@'           Text
 '${'          Literal.String.Interpol
 'MKDIR'       Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'MANPREFIX'   Name.Variable
 '}'           Literal.String.Interpol
 '/man/man1'   Text
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'INSTALL_MAN' Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Misc/python.man' Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '${'          Literal.String.Interpol
 'MANPREFIX'   Name.Variable
 '}'           Literal.String.Interpol
@@ -1480,198 +1480,198 @@
 'PYTHON_VERSION' Name.Variable
 '}'           Literal.String.Interpol
 '.1'          Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'f'           Text
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'BIN_SCRIPTS' Name.Variable
 '}'           Literal.String.Interpol
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'TARGET'      Name.Variable
 '='           Operator
 '`'           Literal.String.Backtick
 '${'          Literal.String.Interpol
 'ECHO_CMD'    Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable
 'f'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'SED'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-E'          Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'BINLINKS_SUB' Name.Variable
 '}'           Literal.String.Interpol
 '`'           Literal.String.Backtick
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PREFIX'      Name.Variable
 '}'           Literal.String.Interpol
 '/bin'        Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'LN'          Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-f'          Text
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable
 'TARGET'      Text
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable
 'f'           Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t'          Text
+'\t'          Text.Whitespace
 'done'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.if !defined(NOPORTDOCS)\n' Comment.Preproc
 
-'\t'          Text
+'\t'          Text.Whitespace
 '@'           Text
 '${'          Literal.String.Interpol
 'MKDIR'       Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'TOOLSDIR'    Name.Variable
 '}'           Literal.String.Interpol
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@cd'         Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'TAR'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-cf'         Text
-' '           Text
+' '           Text.Whitespace
 '-'           Text
-' '           Text
+' '           Text.Whitespace
 'Tools'       Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '('           Operator
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'TOOLSDIR'    Name.Variable
 '}'           Literal.String.Interpol
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'TAR'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-xf'         Text
-' '           Text
+' '           Text.Whitespace
 '-'           Text
 ')'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@'           Text
 '${'          Literal.String.Interpol
 'MKDIR'       Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'DEMODIR'     Name.Variable
 '}'           Literal.String.Interpol
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@cd'         Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PYTHON_WRKSRC' Name.Variable
 '}'           Literal.String.Interpol
 '/Demo'       Text
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'TAR'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-cf'         Text
-' '           Text
+' '           Text.Whitespace
 '-'           Text
-' '           Text
+' '           Text.Whitespace
 '*'           Text
-' '           Text
+' '           Text.Whitespace
 '|'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '('           Operator
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'DEMODIR'     Name.Variable
 '}'           Literal.String.Interpol
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'TAR'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '-xf'         Text
-' '           Text
+' '           Text.Whitespace
 '-'           Text
 ')'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.endif\n'    Comment.Preproc
 
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '@'           Text
 '${'          Literal.String.Interpol
 'CAT'         Name.Variable
 '}'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'PKGMESSAGE'  Name.Variable
 '}'           Literal.String.Interpol
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '.include <bsd.port.post.mk>\n' Comment.Preproc
diff --git a/tests/examplefiles/make/vpath.mk.output b/tests/examplefiles/make/vpath.mk.output
index 2c89c3efa8..b1c4c78aec 100644
--- a/tests/examplefiles/make/vpath.mk.output
+++ b/tests/examplefiles/make/vpath.mk.output
@@ -5,103 +5,103 @@
 'EXEC'        Name.Variable
 '='           Operator
 'hello'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SRC'         Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'hello.c'     Text
-' '           Text
+' '           Text.Whitespace
 'main.c'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'OBJ'         Name.Variable
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'SRC:.c'      Text
 '='           Operator
 '.o'          Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'all'         Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'EXEC'        Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'hello'       Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'OBJ'         Name.Variable
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$'           Text
 '^'           Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'LDFLAGS'     Text
 ')'           Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'main.o'      Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'hello'       Name
 '.'           Text
 'h'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%.o'         Name.Function
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '%'           Text
 '.'           Text
 'c'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 '$('          Keyword
 'CC'          Text
 ')'           Keyword
-' '           Text
+' '           Text.Whitespace
 '-I'          Text
-' '           Text
+' '           Text.Whitespace
 'header'      Text
-' '           Text
+' '           Text.Whitespace
 '-o'          Text
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'        '    Text
+'        '    Text.Whitespace
 '-c'          Text
-' '           Text
+' '           Text.Whitespace
 '$'           Text
 '<'           Text
-' '           Text
+' '           Text.Whitespace
 '$('          Keyword
 'CFLAGS'      Text
 ')'           Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/mcschema/actor_animation.mcschema b/tests/examplefiles/mcschema/actor_animation.mcschema
new file mode 100644
index 0000000000..e8b229ff95
--- /dev/null
+++ b/tests/examplefiles/mcschema/actor_animation.mcschema
@@ -0,0 +1,145 @@
+actor_animation:1.8.0:{
+    version "format_version"
+    object "animations"
+    {
+        object "animation.<identifier>"
+        {
+            bool "loop" : opt // should this animation stop, loop, or stay on the last frame when finished (true, false, "hold_on_last_frame"
+            string "loop"<"hold_on_last_frame"> : opt // should this animation stop, loop, or stay on the last frame when finished (true, false, "hold_on_last_frame"
+            molang "start_delay" : opt // How long to wait in seconds before playing this animation.  Note that this expression is evaluated once before playing, and only re-evaluated if asked to play from the beginning again.  A looping animation should use 'loop_delay' if it wants a delay between loops.
+            molang "loop_delay" : opt // How long to wait in seconds before looping this animation.  Note that this expression is evaluated after each loop and on looping animation only.
+            molang "anim_time_update" : opt // how does time pass when playing the animation.  Defaults to "query.anim_time + query.delta_time" which means advance in seconds.
+            molang "blend_weight" : opt
+            bool "override_previous_animation" : opt // reset bones in this animation to the default pose before applying this animation
+            object "bones" : opt
+            {
+                object "<identifier>"
+                {
+                    object "relative_to" : opt
+                    {
+                        string "rotation"<"entity"> : opt // if set, makes the bone rotation relative to the entity instead of the bone's parent
+                    }
+                    molang "position" : opt
+                    array "position" : opt
+                    {
+                        molang "<any array element>"
+                    }
+                    object "position" : opt
+                    {
+                        array "<time_stamp>"[3]
+                        {
+                            molang "<any array element>"
+                        }
+                        object "<time_stamp>"
+                        {
+                            enumerated_value "lerp_mode"<"linear", "catmullrom"> : opt
+                            array "pre"[3] : opt
+                            {
+                                molang "<any array element>"
+                            }
+                            array "post"[3] : opt
+                            {
+                                molang "<any array element>"
+                            }
+                        }
+                    }
+                    molang "rotation" : opt
+                    array "rotation" : opt
+                    {
+                        molang "<any array element>"
+                        object "<any array element>"
+                        {
+                            molang "[xyz]"
+                        }
+                    }
+                    object "rotation" : opt
+                    {
+                        array "<time_stamp>"[3]
+                        {
+                            molang "<any array element>"
+                        }
+                        object "<time_stamp>"
+                        {
+                            enumerated_value "lerp_mode"<"linear", "catmullrom"> : opt
+                            array "pre"[3] : opt
+                            {
+                                molang "<any array element>"
+                            }
+                            array "post"[3] : opt
+                            {
+                                molang "<any array element>"
+                            }
+                        }
+                    }
+                    molang "scale" : opt
+                    array "scale" : opt
+                    {
+                        molang "<any array element>"
+                    }
+                    object "scale" : opt
+                    {
+                        array "<time_stamp>"[3]
+                        {
+                            molang "<any array element>"
+                        }
+                        object "<time_stamp>"
+                        {
+                            enumerated_value "lerp_mode"<"linear", "catmullrom"> : opt
+                            array "pre"[3] : opt
+                            {
+                                molang "<any array element>"
+                            }
+                            array "post"[3] : opt
+                            {
+                                molang "<any array element>"
+                            }
+                        }
+                    }
+                }
+            }
+            object "particle_effects" : opt
+            {
+                object "<time_stamp>" : opt
+                {
+                    string "effect" // The name of a particle effect that should be played
+                    string "locator" : opt // The name of a locator on the actor where the effect should be located
+                    molang "pre_effect_script" : opt // A Molang script that will be run when the particle emitter is initialized
+                    bool "bind_to_actor" : opt // Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor).
+                }
+                array "<time_stamp>" : opt
+                {
+                    object "<any array element>" : opt
+                    {
+                        string "effect" // The name of a particle effect that should be played
+                        string "locator" : opt // The name of a locator on the actor where the effect should be located
+                        molang "pre_effect_script" : opt // A Molang script that will be run when the particle emitter is initialized
+                        bool "bind_to_actor" : opt // Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor).
+                    }
+                }
+            }
+            object "sound_effects" : opt // sound effects to trigger as this animation plays, keyed by time
+            {
+                object "<time_stamp>" : opt
+                {
+                    string "effect" // Valid sound effect names should be listed in the entity's resource_definition json file.
+                }
+                array "<time_stamp>" : opt
+                {
+                    object "<any array element>" : opt
+                    {
+                        string "effect" // Valid sound effect names should be listed in the entity's resource_definition json file.
+                    }
+                }
+            }
+            object "timeline" : opt
+            {
+                string "<time_stamp>" : opt
+                array "<time_stamp>" : opt
+                {
+                    string "<any array element>" : opt
+                }
+            }
+            float "animation_length" : opt // override calculated value (set as the max keyframe or event time) and set animation length in seconds.
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/examplefiles/mcschema/actor_animation.mcschema.output b/tests/examplefiles/mcschema/actor_animation.mcschema.output
new file mode 100644
index 0000000000..72181d8718
--- /dev/null
+++ b/tests/examplefiles/mcschema/actor_animation.mcschema.output
@@ -0,0 +1,892 @@
+'actor_animation' Literal.String.Symbol
+':'           Operator
+'1'           Literal.Number.Integer
+'.'           Operator
+'8'           Literal.Number.Integer
+'.'           Operator
+'0'           Literal.Number.Integer
+':'           Operator
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'version'     Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'format_version' Literal.String.Double
+'"'           Literal.String.Double
+'\n    '      Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'animations'  Literal.String.Double
+'"'           Literal.String.Double
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'animation.<identifier>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'loop'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// should this animation stop, loop, or stay on the last frame when finished (true, false, "hold_on_last_frame"' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'loop'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'hold_on_last_frame' Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// should this animation stop, loop, or stay on the last frame when finished (true, false, "hold_on_last_frame"' Comment.Single
+'\n            ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'start_delay' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// How long to wait in seconds before playing this animation.  Note that this expression is evaluated once before playing, and only re-evaluated if asked to play from the beginning again.  A looping animation should use 'loop_delay' if it wants a delay between loops." Comment.Single
+'\n            ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'loop_delay'  Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// How long to wait in seconds before looping this animation.  Note that this expression is evaluated after each loop and on looping animation only.' Comment.Single
+'\n            ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'anim_time_update' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// how does time pass when playing the animation.  Defaults to "query.anim_time + query.delta_time" which means advance in seconds.' Comment.Single
+'\n            ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'blend_weight' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n            ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'override_previous_animation' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// reset bones in this animation to the default pose before applying this animation' Comment.Single
+'\n            ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'bones'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n            ' Text.Whitespace
+'{'           Punctuation
+'\n                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<identifier>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                ' Text.Whitespace
+'{'           Punctuation
+'\n                    ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'relative_to' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'rotation'    Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'entity'      Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// if set, makes the bone rotation relative to the entity instead of the bone's parent" Comment.Single
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'position'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'position'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'position'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'lerp_mode'   Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'linear'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'catmullrom'  Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pre'         Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'post'        Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'rotation'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'rotation'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'[xyz]'       Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'rotation'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'lerp_mode'   Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'linear'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'catmullrom'  Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pre'         Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'post'        Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'scale'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'scale'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'scale'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'lerp_mode'   Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'linear'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'catmullrom'  Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pre'         Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'post'        Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'particle_effects' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n            ' Text.Whitespace
+'{'           Punctuation
+'\n                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                ' Text.Whitespace
+'{'           Punctuation
+'\n                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'effect'      Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The name of a particle effect that should be played' Comment.Single
+'\n                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'locator'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// The name of a locator on the actor where the effect should be located' Comment.Single
+'\n                    ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pre_effect_script' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// A Molang script that will be run when the particle emitter is initialized' Comment.Single
+'\n                    ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'bind_to_actor' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor).' Comment.Single
+'\n                ' Text.Whitespace
+'}'           Punctuation
+'\n                ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                ' Text.Whitespace
+'{'           Punctuation
+'\n                    ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'effect'      Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The name of a particle effect that should be played' Comment.Single
+'\n                        ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'locator'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// The name of a locator on the actor where the effect should be located' Comment.Single
+'\n                        ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pre_effect_script' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// A Molang script that will be run when the particle emitter is initialized' Comment.Single
+'\n                        ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'bind_to_actor' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor).' Comment.Single
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'sound_effects' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// sound effects to trigger as this animation plays, keyed by time' Comment.Single
+'\n            ' Text.Whitespace
+'{'           Punctuation
+'\n                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                ' Text.Whitespace
+'{'           Punctuation
+'\n                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'effect'      Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+"// Valid sound effect names should be listed in the entity's resource_definition json file." Comment.Single
+'\n                ' Text.Whitespace
+'}'           Punctuation
+'\n                ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                ' Text.Whitespace
+'{'           Punctuation
+'\n                    ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'effect'      Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+"// Valid sound effect names should be listed in the entity's resource_definition json file." Comment.Single
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'timeline'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n            ' Text.Whitespace
+'{'           Punctuation
+'\n                ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<time_stamp>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                ' Text.Whitespace
+'{'           Punctuation
+'\n                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'animation_length' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// override calculated value (set as the max keyframe or event time) and set animation length in seconds.' Comment.Single
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/mcschema/attribute.mcschema b/tests/examplefiles/mcschema/attribute.mcschema
new file mode 100644
index 0000000000..95cb6151eb
--- /dev/null
+++ b/tests/examplefiles/mcschema/attribute.mcschema
@@ -0,0 +1,7 @@
+shared_attribute:1.16.100-alpha+beta:
+object
+{
+    float_range "value" : opt
+    float "min" : opt
+    float "max" : opt
+}
\ No newline at end of file
diff --git a/tests/examplefiles/mcschema/attribute.mcschema.output b/tests/examplefiles/mcschema/attribute.mcschema.output
new file mode 100644
index 0000000000..98c9cad1a9
--- /dev/null
+++ b/tests/examplefiles/mcschema/attribute.mcschema.output
@@ -0,0 +1,52 @@
+'shared_attribute' Literal.String.Symbol
+':'           Operator
+'1'           Literal.Number.Integer
+'.'           Operator
+'16'          Literal.Number.Integer
+'.'           Operator
+'100'         Literal.Number.Integer
+'-'           Operator
+'alpha'       Literal.String
+'+'           Operator
+'beta'        Literal.String
+':'           Operator
+'\n'          Text.Whitespace
+
+'object'      Keyword.Declaration
+'\n'          Text.Whitespace
+
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'float_range' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'value'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n    '      Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'min'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n    '      Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'max'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/mcschema/geometry.mcschema b/tests/examplefiles/mcschema/geometry.mcschema
new file mode 100644
index 0000000000..d7ee3267cb
--- /dev/null
+++ b/tests/examplefiles/mcschema/geometry.mcschema
@@ -0,0 +1,225 @@
+geometry:1.16.0:{
+    version "format_version"
+    bool "debug" : opt
+    array "minecraft:geometry"[1,*]
+    {
+        object "<any array element>"
+        {
+            object "description"
+            {
+                string "identifier" // Entity definition and Client Block definition files refer to this geometry via this identifier.
+                float "visible_bounds_width" : opt // Width of the visibility bounding box (in model space units).
+                float "visible_bounds_height" : opt // Height of the visible bounding box (in model space units).
+                array "visible_bounds_offset"[3] : opt
+                {
+                    float "<any array element>" // Offset of the visibility bounding box from the entity location point (in model space units).
+                }
+                int "texture_width" : opt // Assumed width in texels of the texture that will be bound to this geometry.
+                int "texture_height" : opt // Assumed height in texels of the texture that will be bound to this geometry.
+            }
+            string "cape" : opt
+            array "bones" : opt // Bones define the 'skeleton' of the mob: the parts that can be animated, and to which geometry and other bones are attached.
+            {
+                object "<any array element>" : opt
+                {
+                    string "name" // Animation files refer to this bone via this identifier.
+                    string "parent" : opt // Bone that this bone is relative to.  If the parent bone moves, this bone will move along with it.
+                    array "pivot"[3] : opt
+                    {
+                        float "<any array element>" // The bone pivots around this point (in model space units).
+                    }
+                    array "rotation"[3] : opt
+                    {
+                        float "<any array element>" // This is the initial rotation of the bone around the pivot, pre-animation (in degrees, x-then-y-then-z order).
+                    }
+                    bool "mirror" : opt // Mirrors the UV's of the unrotated cubes along the x axis, also causes the east/west faces to get flipped.
+                    float "inflate" : opt // Grow this box by this additive amount in all directions (in model space units).
+                    bool "debug" : opt
+                    int "render_group_id"<0-*> : opt
+                    array "cubes" : opt // This is the list of cubes associated with this bone.
+                    {
+                        object "<any array element>" : opt
+                        {
+                            array "origin"[3] : opt
+                            {
+                                float "<any array element>" // This point declares the unrotated lower corner of cube (smallest x/y/z value in model space units).
+                            }
+                            array "size"[3] : opt
+                            {
+                                float "<any array element>" // The cube extends this amount relative to its origin (in model space units).
+                            }
+                            array "rotation"[3] : opt
+                            {
+                                float "<any array element>" // The cube is rotated by this amount (in degrees, x-then-y-then-z order) around the pivot.
+                            }
+                            array "pivot"[3] : opt
+                            {
+                                float "<any array element>" // If this field is specified, rotation of this cube occurs around this point, otherwise its rotation is around the center of the box.
+                            }
+                            float "inflate" : opt // Grow this box by this additive amount in all directions (in model space units), this field overrides the bone's inflate field for this cube only.
+                            bool "mirror" : opt // Mirrors this cube about the unrotated x axis (effectively flipping the east / west faces), overriding the bone's 'mirror' setting for this cube.
+                            array "uv"[2] : opt
+                            {
+                                float "<any array element>" // Specifies the upper-left corner on the texture for the start of the texture mapping for this box.
+                            }
+                            object "uv" : opt // This is an alternate per-face uv mapping which specifies each face of the cube.  Omitting a face will cause that face to not get drawn.
+                            {
+                                object "north" : opt // Specifies the UV's for the face that stretches along the x and y axes, and faces the -z axis.
+                                {
+                                    array "uv"[2]
+                                    {
+                                        float "<any array element>" // Specifies the uv origin for the face. For this face, it is the upper-left corner, when looking at the face with y being up.
+                                    }
+                                    array "uv_size"[2] : opt
+                                    {
+                                        float "<any array element>" // The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.
+                                    }
+                                    string "material_instance" : opt
+                                }
+                                object "south" : opt // Specifies the UV's for the face that stretches along the x and y axes, and faces the z axis
+                                {
+                                    array "uv"[2]
+                                    {
+                                        float "<any array element>" // Specifies the uv origin for the face. For this face, it is the upper-left corner, when looking at the face with y being up.
+                                    }
+                                    array "uv_size"[2] : opt
+                                    {
+                                        float "<any array element>" // The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.
+                                    }
+                                    string "material_instance" : opt
+                                }
+                                object "east" : opt // Specifies the UV's for the face that stretches along the z and y axes, and faces the x axis
+                                {
+                                    array "uv"[2]
+                                    {
+                                        float "<any array element>" // Specifies the uv origin for the face. For this face, it is the upper-left corner, when looking at the face with y being up.
+                                    }
+                                    array "uv_size"[2] : opt
+                                    {
+                                        float "<any array element>" // The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.
+                                    }
+                                    string "material_instance" : opt
+                                }
+                                object "west" : opt // Specifies the UV's for the face that stretches along the z and y axes, and faces the -x axis
+                                {
+                                    array "uv"[2]
+                                    {
+                                        float "<any array element>" // Specifies the uv origin for the face. For this face, it is the upper-left corner, when looking at the face with y being up.
+                                    }
+                                    array "uv_size"[2] : opt
+                                    {
+                                        float "<any array element>" // The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.
+                                    }
+                                    string "material_instance" : opt
+                                }
+                                object "up" : opt // Specifies the UV's for the face that stretches along the x and z axes, and faces the y axis
+                                {
+                                    array "uv"[2]
+                                    {
+                                        float "<any array element>" // Specifies the uv origin for the face. For this face, it is the back-upper-left corner, assuming you're facing 'north' relative to the cube.
+                                    }
+                                    array "uv_size"[2] : opt
+                                    {
+                                        float "<any array element>" // The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.
+                                    }
+                                    string "material_instance" : opt
+                                }
+                                object "down" : opt // Specifies the UV's for the face that stretches along the x and z axes, and faces the -y axis
+                                {
+                                    array "uv"[2]
+                                    {
+                                        float "<any array element>" // Specifies the uv origin for the face. For this face, it is the back-down-right corner, assuming you're facing 'north' relative to the cube.
+                                    }
+                                    array "uv_size"[2] : opt
+                                    {
+                                        float "<any array element>" // The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.
+                                    }
+                                    string "material_instance" : opt
+                                }
+                            }
+                        }
+                    }
+                    molang "binding" : opt // useful for items.  A molang expression specifying the bone name of the parent skeletal hierarchy that this bone should use as the root transform.  Without this field it will look for a bone in the parent entity with the same name as this bone.  If both are missing, it will assume a local skeletal hierarchy (via the "parent" field).  If that is also missing, it will attach to the owning entity's root transform.
+                    object "locators" : opt
+                    {
+                        array "<identifier>" : opt // This is a list of locators associated with this bone.  A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation).
+                        {
+                            float "<any array element>" : opt // Position of the locator in model space.
+                        }
+                        object "<identifier>" : opt // This is a list of locators associated with this bone.  A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation).
+                        {
+                            array "offset"
+                            {
+                                float "<any array element>" : opt // Position of the locator in model space.
+                            }
+                            array "rotation"
+                            {
+                                float "<any array element>" : opt // Rotation of the locator in model space.
+                            }
+                            bool "ignore_inherited_scale" : opt // Discard scale inherited from parent bone.
+                        }
+                    }
+                    object "poly_mesh" : opt // ***EXPERIMENTAL*** A triangle or quad mesh object.  Can be used in conjunction with cubes and texture geometry.
+                    {
+                        bool "normalized_uvs" : opt // If true, UVs are assumed to be [0-1].  If false, UVs are assumed to be [0-texture_width] and [0-texture_height] respectively.
+                        array "positions" : opt
+                        {
+                            array "<any array element>"[3] : opt
+                            {
+                                float "<any array element>" // Vertex positions for the mesh.  Can be either indexed via the "polys" section, or be a quad-list if mapped 1-to-1 to the normals and UVs sections.
+                            }
+                        }
+                        array "normals" : opt
+                        {
+                            array "<any array element>"[3] : opt
+                            {
+                                float "<any array element>" // Vertex normals.  Can be either indexed via the "polys" section, or be a quad-list if mapped 1-to-1 to the positions and UVs sections.
+                            }
+                        }
+                        array "uvs" : opt
+                        {
+                            array "<any array element>"[2] : opt
+                            {
+                                float "<any array element>" // Vertex UVs.  Can be either indexed via the "polys" section, or be a quad-list if mapped 1-to-1 to the positions and normals sections.
+                            }
+                        }
+                        array "polys"
+                        {
+                            array "<any array element>"[3,4] : opt
+                            {
+                                array "<any array element>"[3]
+                                {
+                                    float "<any array element>" // Poly element indices, as an array of polygons, each an array of either three or four vertices, each an array of indices into positions, normals, and UVs (in that order).
+                                }
+                            }
+                        }
+                        string "polys"<"tri_list", "quad_list"> // If not specifying vertex indices, arrays of data must be a list of tris or quads, set by making this property either "tri_list" or "quad_list"
+                    }
+                    array "texture_meshes" : opt // ***EXPERIMENTAL*** Adds a mesh to the bone's geometry by converting texels in a texture into boxes
+                    {
+                        object "<any array element>"
+                        {
+                            string "texture" // The friendly-named texture to use.
+                            array "position"[3] : opt
+                            {
+                                float "<any array element>" // The position of the pivot point after rotation (in *entity space* not texture or bone space) of the texture geometry
+                            }
+                            array "local_pivot"[3] : opt
+                            {
+                                float "<any array element>" // The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry
+                            }
+                            array "rotation"[3] : opt
+                            {
+                                float "<any array element>" // The rotation (in degrees) of the texture geometry relative to the offset
+                            }
+                            array "scale"[3] : opt
+                            {
+                                float "<any array element>" // The scale (in degrees) of the texture geometry relative to the offset
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/examplefiles/mcschema/geometry.mcschema.output b/tests/examplefiles/mcschema/geometry.mcschema.output
new file mode 100644
index 0000000000..0a402b6e05
--- /dev/null
+++ b/tests/examplefiles/mcschema/geometry.mcschema.output
@@ -0,0 +1,1404 @@
+'geometry'    Literal.String.Symbol
+':'           Operator
+'1'           Literal.Number.Integer
+'.'           Operator
+'16'          Literal.Number.Integer
+'.'           Operator
+'0'           Literal.Number.Integer
+':'           Operator
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'version'     Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'format_version' Literal.String.Double
+'"'           Literal.String.Double
+'\n    '      Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'debug'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n    '      Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'minecraft:geometry' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'1'           Literal.Number.Integer
+','           Punctuation
+'*'           Operator
+']'           Punctuation
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'description' Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'{'           Punctuation
+'\n                ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'identifier'  Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Entity definition and Client Block definition files refer to this geometry via this identifier.' Comment.Single
+'\n                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'visible_bounds_width' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Width of the visibility bounding box (in model space units).' Comment.Single
+'\n                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'visible_bounds_height' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Height of the visible bounding box (in model space units).' Comment.Single
+'\n                ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'visible_bounds_offset' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                ' Text.Whitespace
+'{'           Punctuation
+'\n                    ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Offset of the visibility bounding box from the entity location point (in model space units).' Comment.Single
+'\n                ' Text.Whitespace
+'}'           Punctuation
+'\n                ' Text.Whitespace
+'int'         Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'texture_width' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Assumed width in texels of the texture that will be bound to this geometry.' Comment.Single
+'\n                ' Text.Whitespace
+'int'         Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'texture_height' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Assumed height in texels of the texture that will be bound to this geometry.' Comment.Single
+'\n            ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'cape'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'bones'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Bones define the 'skeleton' of the mob: the parts that can be animated, and to which geometry and other bones are attached." Comment.Single
+'\n            ' Text.Whitespace
+'{'           Punctuation
+'\n                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                ' Text.Whitespace
+'{'           Punctuation
+'\n                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Animation files refer to this bone via this identifier.' Comment.Single
+'\n                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'parent'      Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Bone that this bone is relative to.  If the parent bone moves, this bone will move along with it.' Comment.Single
+'\n                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pivot'       Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The bone pivots around this point (in model space units).' Comment.Single
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'rotation'    Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// This is the initial rotation of the bone around the pivot, pre-animation (in degrees, x-then-y-then-z order).' Comment.Single
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'mirror'      Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Mirrors the UV's of the unrotated cubes along the x axis, also causes the east/west faces to get flipped." Comment.Single
+'\n                    ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'inflate'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Grow this box by this additive amount in all directions (in model space units).' Comment.Single
+'\n                    ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'debug'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'int'         Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'render_group_id' Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'0'           Literal.Number.Integer
+'-'           Operator
+'*'           Operator
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'cubes'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// This is the list of cubes associated with this bone.' Comment.Single
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'origin'      Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// This point declares the unrotated lower corner of cube (smallest x/y/z value in model space units).' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'size'        Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The cube extends this amount relative to its origin (in model space units).' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'rotation'    Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The cube is rotated by this amount (in degrees, x-then-y-then-z order) around the pivot.' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pivot'       Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// If this field is specified, rotation of this cube occurs around this point, otherwise its rotation is around the center of the box.' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'inflate'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Grow this box by this additive amount in all directions (in model space units), this field overrides the bone's inflate field for this cube only." Comment.Single
+'\n                            ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'mirror'      Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Mirrors this cube about the unrotated x axis (effectively flipping the east / west faces), overriding the bone's 'mirror' setting for this cube." Comment.Single
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv'          Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Specifies the upper-left corner on the texture for the start of the texture mapping for this box.' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv'          Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// This is an alternate per-face uv mapping which specifies each face of the cube.  Omitting a face will cause that face to not get drawn.' Comment.Single
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'north'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Specifies the UV's for the face that stretches along the x and y axes, and faces the -z axis." Comment.Single
+'\n                                ' Text.Whitespace
+'{'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv'          Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Specifies the uv origin for the face. For this face, it is the upper-left corner, when looking at the face with y being up.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv_size'     Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'material_instance' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                ' Text.Whitespace
+'}'           Punctuation
+'\n                                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'south'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Specifies the UV's for the face that stretches along the x and y axes, and faces the z axis" Comment.Single
+'\n                                ' Text.Whitespace
+'{'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv'          Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Specifies the uv origin for the face. For this face, it is the upper-left corner, when looking at the face with y being up.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv_size'     Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'material_instance' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                ' Text.Whitespace
+'}'           Punctuation
+'\n                                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'east'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Specifies the UV's for the face that stretches along the z and y axes, and faces the x axis" Comment.Single
+'\n                                ' Text.Whitespace
+'{'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv'          Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Specifies the uv origin for the face. For this face, it is the upper-left corner, when looking at the face with y being up.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv_size'     Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'material_instance' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                ' Text.Whitespace
+'}'           Punctuation
+'\n                                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'west'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Specifies the UV's for the face that stretches along the z and y axes, and faces the -x axis" Comment.Single
+'\n                                ' Text.Whitespace
+'{'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv'          Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Specifies the uv origin for the face. For this face, it is the upper-left corner, when looking at the face with y being up.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv_size'     Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'material_instance' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                ' Text.Whitespace
+'}'           Punctuation
+'\n                                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'up'          Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Specifies the UV's for the face that stretches along the x and z axes, and faces the y axis" Comment.Single
+'\n                                ' Text.Whitespace
+'{'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv'          Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+"// Specifies the uv origin for the face. For this face, it is the back-upper-left corner, assuming you're facing 'north' relative to the cube." Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv_size'     Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'material_instance' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                ' Text.Whitespace
+'}'           Punctuation
+'\n                                ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'down'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// Specifies the UV's for the face that stretches along the x and z axes, and faces the -y axis" Comment.Single
+'\n                                ' Text.Whitespace
+'{'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv'          Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+"// Specifies the uv origin for the face. For this face, it is the back-down-right corner, assuming you're facing 'north' relative to the cube." Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uv_size'     Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                    ' Text.Whitespace
+'{'           Punctuation
+'\n                                        ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.' Comment.Single
+'\n                                    ' Text.Whitespace
+'}'           Punctuation
+'\n                                    ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'material_instance' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                                ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'molang'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'binding'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// useful for items.  A molang expression specifying the bone name of the parent skeletal hierarchy that this bone should use as the root transform.  Without this field it will look for a bone in the parent entity with the same name as this bone.  If both are missing, it will assume a local skeletal hierarchy (via the "parent" field).  If that is also missing, it will attach to the owning entity\'s root transform.' Comment.Single
+'\n                    ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'locators'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<identifier>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// This is a list of locators associated with this bone.  A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation)." Comment.Single
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Position of the locator in model space.' Comment.Single
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<identifier>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// This is a list of locators associated with this bone.  A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation)." Comment.Single
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'offset'      Literal.String.Double
+'"'           Literal.String.Double
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Position of the locator in model space.' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'rotation'    Literal.String.Double
+'"'           Literal.String.Double
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Rotation of the locator in model space.' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'ignore_inherited_scale' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// Discard scale inherited from parent bone.' Comment.Single
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'poly_mesh'   Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// ***EXPERIMENTAL*** A triangle or quad mesh object.  Can be used in conjunction with cubes and texture geometry.' Comment.Single
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'normalized_uvs' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// If true, UVs are assumed to be [0-1].  If false, UVs are assumed to be [0-texture_width] and [0-texture_height] respectively.' Comment.Single
+'\n                        ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'positions'   Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Vertex positions for the mesh.  Can be either indexed via the "polys" section, or be a quad-list if mapped 1-to-1 to the normals and UVs sections.' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'normals'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Vertex normals.  Can be either indexed via the "polys" section, or be a quad-list if mapped 1-to-1 to the positions and UVs sections.' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uvs'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Vertex UVs.  Can be either indexed via the "polys" section, or be a quad-list if mapped 1-to-1 to the positions and normals sections.' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'polys'       Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+','           Punctuation
+'4'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+'\n                                ' Text.Whitespace
+'{'           Punctuation
+'\n                                    ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// Poly element indices, as an array of polygons, each an array of either three or four vertices, each an array of indices into positions, normals, and UVs (in that order).' Comment.Single
+'\n                                ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'polys'       Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'tri_list'    Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'quad_list'   Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+'// If not specifying vertex indices, arrays of data must be a list of tris or quads, set by making this property either "tri_list" or "quad_list"' Comment.Single
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'texture_meshes' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+"// ***EXPERIMENTAL*** Adds a mesh to the bone's geometry by converting texels in a texture into boxes" Comment.Single
+'\n                    ' Text.Whitespace
+'{'           Punctuation
+'\n                        ' Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n                        ' Text.Whitespace
+'{'           Punctuation
+'\n                            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'texture'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The friendly-named texture to use.' Comment.Single
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'position'    Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The position of the pivot point after rotation (in *entity space* not texture or bone space) of the texture geometry' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'local_pivot' Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'rotation'    Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The rotation (in degrees) of the texture geometry relative to the offset' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'scale'       Literal.String.Double
+'"'           Literal.String.Double
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n                            ' Text.Whitespace
+'{'           Punctuation
+'\n                                ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// The scale (in degrees) of the texture geometry relative to the offset' Comment.Single
+'\n                            ' Text.Whitespace
+'}'           Punctuation
+'\n                        ' Text.Whitespace
+'}'           Punctuation
+'\n                    ' Text.Whitespace
+'}'           Punctuation
+'\n                ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'}'           Punctuation
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/mcschema/manifest.mcschema b/tests/examplefiles/mcschema/manifest.mcschema
new file mode 100644
index 0000000000..39feb62123
--- /dev/null
+++ b/tests/examplefiles/mcschema/manifest.mcschema
@@ -0,0 +1,136 @@
+manifest:2:
+object
+{
+    int "format_version" // 该文件的格式版本，此处应为`2`
+    object "header"
+    {
+        string "uuid"</[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/> // 该包的UUID，当解析内容出错时，引擎会报内容日志错误。当引擎最终使用的该包的UUID为`6989C411-4355-4756-9163-51C1DF5EF677`时，由于该UUID为保留的UUID，这会使该附加包从列表中隐藏
+        string "name" // 当不存在时引擎会报内容日志错误
+        string "description" : opt
+        bool "platform_locked" : opt // 默认为false
+        enumerated_value "pack_scope"<"global", "world", "any"> : opt // 默认为`any`
+        bool "lock_template_options" // 当该包是世界模板包时是必须字段，当不是世界模板包时有效的该字段值会导致内容日志警告。引擎中实际有三种值：未定义、启用和禁用，该字段不存在或解析出错时为未定义，`true`时为启用，`false`时为禁用
+        semver "version" // 该语义化版本字段不可为`*`，解析出错时报内容日志错误
+        semver "min_engine_version" // 当该包是资源包或行为包时是必须字段，当不是资源包且不是行为包时有效的该字段值会导致内容日志警告。该语义化版本字段只支持数组格式，且值必须大于或等于`1.13.0`，否则会报内容日志错误
+        semver "base_game_version" // 当该包是世界模板包时是必须字段，当不是世界模板包时有效的该字段值会导致内容日志警告。该语义化版本字段无限制，但不得大于当前游戏版本或小于`1.13.0`，否则会报内容日志错误
+    }
+    array "modules" // 若不存在，则会报内容日志错误
+    {
+        object "<any array element>"
+        {
+            string "uuid"</[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/> // 该模块的UUID，当解析内容出错时，引擎会报内容日志错误。如果包的UUID和某个模块的UUID重复，会报内容日志警告并以包的UUID的MD5杂凑值为种子通过一定算法生成新的包的UUID
+            semver "version" // 该语义化版本字段不可为`*`，解析出错时报内容日志错误
+            string "name" : opt
+            enumerated_value "type"<"invalid", "resourcepack", "resources", "data", "plugin", "client_data", "interface", "script", "client_script", "world_template", "worldtemplate", "skin_pack", "skinpack", "persona_piece"> // `invalid`和其他非法字符串会导致内容日志错误
+            enumerated_value "language"<"javascript"> : opt
+            string "entry" : opt
+        }
+    }
+    array "dependencies" : opt
+    {
+        object "<any array element>"
+        {
+            string "module_name" // 依赖的脚本API模块名，与`uuid`至少存在一个
+            string "uuid"</[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/> // 依赖的包或模块的UUID，当解析内容出错时，引擎会报内容日志错误。
+            string "version" // 该语义化版本字段不可为`*`，解析出错时报内容日志错误
+        }
+    }
+    object "metadata" : opt
+    {
+        string "url" : opt
+        string "license" : opt
+        array "authors" : opt
+        {
+            string "<any array element>"
+        }
+        object "generated_with" : opt
+        {
+            array "<any tool name>"
+            {
+                semver "<any array element>" // 该语义化版本字段不可为`*`
+            }
+        }
+    }
+    array "settings" : opt
+    {
+        object "<any label control>"
+        {
+            enumerated_value "type"<"label", "toggle", "slider", "step_slider", "dropdown", "input"> // 控件类型，当前应为`label`
+            string "text" // 控件显示的文本
+            string "name" // 该控件的名字，用于存值
+        }
+        object "<any toggle control>"
+        {
+            enumerated_value "type"<"label", "toggle", "slider", "step_slider", "dropdown", "input"> // 控件类型，当前应为`toggle`
+            string "text"
+            string "name"
+            bool "default" // 默认值
+            enumerated_value "control_locked"<"none", "pregame", "ingame"> : opt // 何时锁定该控件
+        }
+        object "<any slider control>"
+        {
+            enumerated_value "type"<"label", "toggle", "slider", "step_slider", "dropdown", "input"> // 控件类型，当前应为`slider`
+            string "text"
+            string "name"
+            float "default"
+            float "min"
+            float "max"
+            float "step" : opt // 步长，默认为`1`
+            enumerated_value "control_locked"<"none", "pregame", "ingame"> : opt
+        }
+        object "<any step slider control>"
+        {
+            enumerated_value "type"<"label", "toggle", "slider", "step_slider", "dropdown", "input"> // 控件类型，当前应为`step_slider`
+            string "text"
+            string "name"
+            int "default"<0-*>
+            array "steps"
+            {
+                string "<any array element>" // 滑块中每步的文本
+            }
+            enumerated_value "control_locked"<"none", "pregame", "ingame"> : opt
+        }
+        object "<any dropdown control>"
+        {
+            enumerated_value "type"<"label", "toggle", "slider", "step_slider", "dropdown", "input"> // 控件类型，当前应为`dropdown`
+            string "text"
+            string "name"
+            int "default"<0-*>
+            array "options"
+            {
+                string "<any array element>" // 下拉菜单中每项的文本
+            }
+        }
+        object "<any text input control>"
+        {
+            enumerated_value "type"<"label", "toggle", "slider", "step_slider", "dropdown", "input"> // 控件类型，当前应为`input`
+            string "text"
+            string "name"
+            string "default"
+            string "placeholder" : opt // 当用户尚未输入文本时输入框底部的暗文本
+            enumerated_value "control_locked"<"none", "pregame", "ingame"> : opt
+        }
+    }
+    array "legacy_module_dependencies" : opt // 等价于`0`格式版本下的依赖
+    {
+        object "<any array element>"
+        {
+            string "uuid" : opt
+            string "version" : opt
+        }
+    }
+    array "subpacks" : opt
+    {
+        object "<any array element>"
+        {
+            string "folder_name"
+            string "name"
+            int "memory_tier" : opt // 默认为`0`
+        }
+    }
+    array "capabilities" : opt
+    {
+        enumerated_value "<any array element>"<"chemistry", "raytraced", "script_eval">
+    }
+    bool "has_education_metadata" : opt // 默认为`0`
+}
\ No newline at end of file
diff --git a/tests/examplefiles/mcschema/manifest.mcschema.output b/tests/examplefiles/mcschema/manifest.mcschema.output
new file mode 100644
index 0000000000..cf7b09e455
--- /dev/null
+++ b/tests/examplefiles/mcschema/manifest.mcschema.output
@@ -0,0 +1,1158 @@
+'manifest'    Literal.String.Symbol
+':'           Operator
+'2'           Literal.Number.Integer
+':'           Operator
+'\n'          Text.Whitespace
+
+'object'      Keyword.Declaration
+'\n'          Text.Whitespace
+
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'int'         Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'format_version' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 该文件的格式版本，此处应为`2`' Comment.Single
+'\n    '      Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'header'      Literal.String.Double
+'"'           Literal.String.Double
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uuid'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'/[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/' Literal.String.Regex
+'>'           Operator
+' '           Text.Whitespace
+'// 该包的UUID，当解析内容出错时，引擎会报内容日志错误。当引擎最终使用的该包的UUID为`6989C411-4355-4756-9163-51C1DF5EF677`时，由于该UUID为保留的UUID，这会使该附加包从列表中隐藏' Comment.Single
+'\n        '  Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 当不存在时引擎会报内容日志错误' Comment.Single
+'\n        '  Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'description' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'platform_locked' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// 默认为false' Comment.Single
+'\n        '  Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pack_scope'  Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'global'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'world'       Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'any'         Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// 默认为`any`' Comment.Single
+'\n        '  Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'lock_template_options' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 当该包是世界模板包时是必须字段，当不是世界模板包时有效的该字段值会导致内容日志警告。引擎中实际有三种值：未定义、启用和禁用，该字段不存在或解析出错时为未定义，`true`时为启用，`false`时为禁用' Comment.Single
+'\n        '  Text.Whitespace
+'semver'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'version'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 该语义化版本字段不可为`*`，解析出错时报内容日志错误' Comment.Single
+'\n        '  Text.Whitespace
+'semver'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'min_engine_version' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 当该包是资源包或行为包时是必须字段，当不是资源包且不是行为包时有效的该字段值会导致内容日志警告。该语义化版本字段只支持数组格式，且值必须大于或等于`1.13.0`，否则会报内容日志错误' Comment.Single
+'\n        '  Text.Whitespace
+'semver'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'base_game_version' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 当该包是世界模板包时是必须字段，当不是世界模板包时有效的该字段值会导致内容日志警告。该语义化版本字段无限制，但不得大于当前游戏版本或小于`1.13.0`，否则会报内容日志错误' Comment.Single
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'modules'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 若不存在，则会报内容日志错误' Comment.Single
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uuid'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'/[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/' Literal.String.Regex
+'>'           Operator
+' '           Text.Whitespace
+'// 该模块的UUID，当解析内容出错时，引擎会报内容日志错误。如果包的UUID和某个模块的UUID重复，会报内容日志警告并以包的UUID的MD5杂凑值为种子通过一定算法生成新的包的UUID' Comment.Single
+'\n            ' Text.Whitespace
+'semver'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'version'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 该语义化版本字段不可为`*`，解析出错时报内容日志错误' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'type'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'invalid'     Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'resourcepack' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'resources'   Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'data'        Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'plugin'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'client_data' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'interface'   Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'script'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'client_script' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'world_template' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'worldtemplate' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'skin_pack'   Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'skinpack'    Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'persona_piece' Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+'// `invalid`和其他非法字符串会导致内容日志错误' Comment.Single
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'language'    Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'javascript'  Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'entry'       Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'dependencies' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'module_name' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 依赖的脚本API模块名，与`uuid`至少存在一个' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uuid'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'/[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/' Literal.String.Regex
+'>'           Operator
+' '           Text.Whitespace
+'// 依赖的包或模块的UUID，当解析内容出错时，引擎会报内容日志错误。' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'version'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 该语义化版本字段不可为`*`，解析出错时报内容日志错误' Comment.Single
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'metadata'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'url'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'license'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'authors'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'generated_with' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any tool name>' Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'{'           Punctuation
+'\n                ' Text.Whitespace
+'semver'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 该语义化版本字段不可为`*`' Comment.Single
+'\n            ' Text.Whitespace
+'}'           Punctuation
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'settings'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any label control>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'type'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'label'       Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'toggle'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'slider'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'step_slider' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'dropdown'    Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'input'       Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+'// 控件类型，当前应为`label`' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'text'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 控件显示的文本'  Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 该控件的名字，用于存值' Comment.Single
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any toggle control>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'type'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'label'       Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'toggle'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'slider'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'step_slider' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'dropdown'    Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'input'       Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+'// 控件类型，当前应为`toggle`' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'text'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'default'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 默认值'      Comment.Single
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'control_locked' Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'none'        Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pregame'     Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'ingame'      Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// 何时锁定该控件'  Comment.Single
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any slider control>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'type'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'label'       Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'toggle'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'slider'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'step_slider' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'dropdown'    Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'input'       Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+'// 控件类型，当前应为`slider`' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'text'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'default'     Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'min'         Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'max'         Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'float'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'step'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// 步长，默认为`1`' Comment.Single
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'control_locked' Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'none'        Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pregame'     Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'ingame'      Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any step slider control>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'type'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'label'       Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'toggle'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'slider'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'step_slider' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'dropdown'    Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'input'       Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+'// 控件类型，当前应为`step_slider`' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'text'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'int'         Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'default'     Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'0'           Literal.Number.Integer
+'-'           Operator
+'*'           Operator
+'>'           Operator
+'\n            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'steps'       Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'{'           Punctuation
+'\n                ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 滑块中每步的文本' Comment.Single
+'\n            ' Text.Whitespace
+'}'           Punctuation
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'control_locked' Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'none'        Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pregame'     Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'ingame'      Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any dropdown control>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'type'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'label'       Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'toggle'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'slider'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'step_slider' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'dropdown'    Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'input'       Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+'// 控件类型，当前应为`dropdown`' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'text'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'int'         Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'default'     Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'0'           Literal.Number.Integer
+'-'           Operator
+'*'           Operator
+'>'           Operator
+'\n            ' Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'options'     Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'{'           Punctuation
+'\n                ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'// 下拉菜单中每项的文本' Comment.Single
+'\n            ' Text.Whitespace
+'}'           Punctuation
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any text input control>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'type'        Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'label'       Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'toggle'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'slider'      Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'step_slider' Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'dropdown'    Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'input'       Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+'// 控件类型，当前应为`input`' Comment.Single
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'text'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'default'     Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'placeholder' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// 当用户尚未输入文本时输入框底部的暗文本' Comment.Single
+'\n            ' Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'control_locked' Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'none'        Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'pregame'     Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'ingame'      Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'legacy_module_dependencies' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// 等价于`0`格式版本下的依赖' Comment.Single
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'uuid'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'version'     Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'subpacks'    Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'object'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'\n        '  Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'folder_name' Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'string'      Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'name'        Literal.String.Double
+'"'           Literal.String.Double
+'\n            ' Text.Whitespace
+'int'         Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'memory_tier' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// 默认为`0`'   Comment.Single
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'array'       Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'capabilities' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+'\n    '      Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'enumerated_value' Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'<any array element>' Literal.String.Double
+'"'           Literal.String.Double
+'<'           Operator
+'"'           Literal.String.Double
+'chemistry'   Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'raytraced'   Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'script_eval' Literal.String.Double
+'"'           Literal.String.Double
+'>'           Operator
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'bool'        Keyword.Declaration
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'has_education_metadata' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'opt'         Operator.Word
+' '           Text.Whitespace
+'// 默认为`0`'   Comment.Single
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/md/example.md.output b/tests/examplefiles/md/example.md.output
index e027e5f30b..806f00857d 100644
--- a/tests/examplefiles/md/example.md.output
+++ b/tests/examplefiles/md/example.md.output
@@ -1,51 +1,51 @@
 '# this is a header' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## this is a 2nd level header' Generic.Subheading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 'list'        Text
 ' '           Text
 'item'        Text
 ' '           Text
 '1'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 'list'        Text
 ' '           Text
 'item'        Text
 ' '           Text
 '1.1'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 'list'        Text
 ' '           Text
 'item'        Text
 ' '           Text
 '2'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-'           Keyword
-' '           Text
+' '           Text.Whitespace
 'list'        Text
 ' '           Text
 'item'        Text
 ' '           Text
 '3'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1.'          Keyword
 ' '           Text
@@ -56,7 +56,7 @@
 'item'        Text
 ' '           Text
 '1'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1.'          Keyword
 ' '           Text
@@ -67,29 +67,29 @@
 'item'        Text
 ' '           Text
 '2'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '- '          Keyword
 '[ ]'         Keyword
 ' '           Text
 'todo'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '- '          Keyword
 '[x]'         Keyword
 ' '           Text
 'done'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '- '          Keyword
 '[X]'         Keyword
 ' '           Text
 'done'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -100,7 +100,7 @@
 'italic:'     Text
 ' '           Text
 '*italic*'    Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -111,9 +111,9 @@
 'italic:'     Text
 ' '           Text
 '_italic_'    Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -128,7 +128,7 @@
 '\\*'         Text
 'italic'      Text
 '\\*'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -143,9 +143,9 @@
 '\\_'         Text
 'italic'      Text
 '\\_'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -158,7 +158,7 @@
 'italic:'     Text
 ' '           Text
 'snake*case*word' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -171,9 +171,9 @@
 'italic:'     Text
 ' '           Text
 'snake_case_word' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -186,7 +186,7 @@
 '**bold**'    Generic.Strong
 ' '           Text
 '**two or more words**' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -199,9 +199,9 @@
 '__bold__'    Generic.Strong
 ' '           Text
 '__two or more words__' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -214,7 +214,7 @@
 'bold:'       Text
 ' '           Text
 'snake**case**word' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -227,9 +227,9 @@
 'bold:'       Text
 ' '           Text
 'snake__case__word' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -240,7 +240,7 @@
 'strikethrough:' Text
 ' '           Text
 '~~bold~~'    Generic.Deleted
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -253,9 +253,9 @@
 'strikethrough:' Text
 ' '           Text
 'snake~~case~~word' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -272,7 +272,7 @@
 'inside:'     Text
 ' '           Text
 '**the next _word_ should have been italics**' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n> '        Keyword
 'this is a quote\n' Generic.Emph
@@ -283,7 +283,7 @@
 '> '          Keyword
 'quote string thing\n' Generic.Emph
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'this'        Text
 ' '           Text
@@ -294,9 +294,9 @@
 'in'          Text
 ' '           Text
 'it'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'this'        Text
 ' '           Text
@@ -314,9 +314,9 @@
 ' '           Text
 '#topic'      Name.Entity
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '['           Text
 'google'      Name.Tag
@@ -324,7 +324,7 @@
 '('           Text
 'https://google.com/some/path.html' Name.Attribute
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '!['          Text
 'Image of Yaktocat' Name.Tag
@@ -332,9 +332,9 @@
 '('           Text
 'https://octodex.github.com/images/yaktocat.png' Name.Attribute
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '['           Text
 'reference link' Name.Tag
@@ -342,24 +342,24 @@
 '['           Text
 'id'          Name.Label
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '['           Text
 'id'          Name.Label
 ']: '         Text
 'http://example.com/' Name.Attribute
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n```\n  * this is just unformated\n      __text__\n```\n' Literal.String.Backtick
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'some'        Text
 ' '           Text
 'other'       Text
 ' '           Text
 'text'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n```'       Literal.String.Backtick
 'python'      Literal.String.Backtick
@@ -372,18 +372,18 @@
 'import'      Keyword.Namespace
 ' '           Text
 'token'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# comment'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```\n'       Literal.String.Backtick
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'some'        Text
 ' '           Text
 'more'        Text
 ' '           Text
 'text'        Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/mips/function_with_stack.mips b/tests/examplefiles/mips/function_with_stack.mips
new file mode 100644
index 0000000000..b9d606f66e
--- /dev/null
+++ b/tests/examplefiles/mips/function_with_stack.mips
@@ -0,0 +1,84 @@
+# Simple routine to demo functions
+# USING a stack in this example to preserve
+# values of calling function
+
+# ------------------------------------------------------------------
+
+    .text
+
+    .globl  main
+main:
+    # Register assignments
+    # $s0 = x
+    # $s1 = y
+
+    # Initialize registers
+    lw  $s0, x      # Reg $s0 = x
+    lw  $s1, y      # Reg $s1 = y
+
+    # Call function
+    move    $a0, $s0    # Argument 1: x ($s0)
+    jal fun     # Save current PC in $ra, and jump to fun
+    move    $s1,$v0     # Return value saved in $v0. This is y ($s1)
+
+    # Print msg1
+    li  $v0, 4      # print_string syscall code = 4
+    la  $a0, msg1
+    syscall
+
+    # Print result (y)
+    li  $v0,1       # print_int syscall code = 1
+    move    $a0, $s1    # Load integer to print in $a0
+    syscall
+
+    # Print newline
+    li  $v0,4       # print_string syscall code = 4
+    la  $a0, lf
+    syscall
+
+    # Exit
+    li  $v0,10      # exit
+    syscall
+
+# ------------------------------------------------------------------
+
+    # FUNCTION: int fun(int a)
+    # Arguments are stored in $a0
+    # Return value is stored in $v0
+    # Return address is stored in $ra (put there by jal instruction)
+    # Typical function operation is:
+
+fun:    # This function overwrites $s0 and $s1
+    # We should save those on the stack
+    # This is PUSH'ing onto the stack
+    addi $sp,$sp,-4     # Adjust stack pointer
+    sw $s0,0($sp)       # Save $s0
+    addi $sp,$sp,-4     # Adjust stack pointer
+    sw $s1,0($sp)       # Save $s1
+
+    # Do the function math
+    li $s0, 3
+    mul $s1,$s0,$a0     # s1 = 3*$a0  (i.e. 3*a)
+    addi $s1,$s1,5      # 3*a+5
+
+    # Save the return value in $v0
+    move $v0,$s1
+
+    # Restore saved register values from stack in opposite order
+    # This is POP'ing from the stack
+    lw $s1,0($sp)       # Restore $s1
+    addi $sp,$sp,4      # Adjust stack pointer
+    lw $s0,0($sp)       # Restore $s0
+    addi $sp,$sp,4      # Adjust stack pointer
+
+    # Return from function
+    jr $ra          # Jump to addr stored in $ra
+
+# ------------------------------------------------------------------
+
+    # Start .data segment (data!)
+    .data
+x:  .word 5
+y:  .word 0
+msg1:   .asciiz "y="
+lf:     .asciiz "\n"
diff --git a/tests/examplefiles/mips/function_with_stack.mips.output b/tests/examplefiles/mips/function_with_stack.mips.output
new file mode 100644
index 0000000000..552b93601b
--- /dev/null
+++ b/tests/examplefiles/mips/function_with_stack.mips.output
@@ -0,0 +1,338 @@
+'# Simple routine to demo functions' Comment
+'\n'          Text.Whitespace
+
+'# USING a stack in this example to preserve' Comment
+'\n'          Text.Whitespace
+
+'# values of calling function' Comment
+'\n\n'        Text.Whitespace
+
+'# ------------------------------------------------------------------' Comment
+'\n\n    '    Text.Whitespace
+'.text'       Name.Entity
+'\n\n    '    Text.Whitespace
+'.globl'      Name.Entity
+'  '          Text.Whitespace
+'main'        Text
+'\n'          Text.Whitespace
+
+'main:'       Name.Function
+'\n    '      Text.Whitespace
+'# Register assignments' Comment
+'\n    '      Text.Whitespace
+'# $s0 = x'   Comment
+'\n    '      Text.Whitespace
+'# $s1 = y'   Comment
+'\n\n    '    Text.Whitespace
+'# Initialize registers' Comment
+'\n    '      Text.Whitespace
+'lw'          Keyword
+'  '          Text.Whitespace
+'$s0'         Keyword.Type
+','           Name.Builtin
+' '           Text.Whitespace
+'x'           Text
+'      '      Text.Whitespace
+'# Reg $s0 = x' Comment
+'\n    '      Text.Whitespace
+'lw'          Keyword
+'  '          Text.Whitespace
+'$s1'         Keyword.Type
+','           Name.Builtin
+' '           Text.Whitespace
+'y'           Text
+'      '      Text.Whitespace
+'# Reg $s1 = y' Comment
+'\n\n    '    Text.Whitespace
+'# Call function' Comment
+'\n    '      Text.Whitespace
+'move'        Name.Variable
+'    '        Text.Whitespace
+'$a0'         Keyword.Type
+','           Name.Builtin
+' '           Text.Whitespace
+'$s0'         Keyword.Type
+'    '        Text.Whitespace
+'# Argument 1: x ($s0)' Comment
+'\n    '      Text.Whitespace
+'jal'         Keyword
+' '           Text.Whitespace
+'fun'         Text
+'     '       Text.Whitespace
+'# Save current PC in $ra, and jump to fun' Comment
+'\n    '      Text.Whitespace
+'move'        Name.Variable
+'    '        Text.Whitespace
+'$s1'         Keyword.Type
+','           Name.Builtin
+'$v0'         Keyword.Type
+'     '       Text.Whitespace
+'# Return value saved in $v0. This is y ($s1)' Comment
+'\n\n    '    Text.Whitespace
+'# Print msg1' Comment
+'\n    '      Text.Whitespace
+'li'          Name.Variable
+'  '          Text.Whitespace
+'$v0'         Keyword.Type
+','           Name.Builtin
+' '           Text.Whitespace
+'4'           Keyword.Constant
+'      '      Text.Whitespace
+'# print_string syscall code = 4' Comment
+'\n    '      Text.Whitespace
+'la'          Name.Variable
+'  '          Text.Whitespace
+'$a0'         Keyword.Type
+','           Name.Builtin
+' '           Text.Whitespace
+'msg1'        Text
+'\n    '      Text.Whitespace
+'syscall'     Keyword
+'\n\n    '    Text.Whitespace
+'# Print result (y)' Comment
+'\n    '      Text.Whitespace
+'li'          Name.Variable
+'  '          Text.Whitespace
+'$v0'         Keyword.Type
+','           Name.Builtin
+'1'           Keyword.Constant
+'       '     Text.Whitespace
+'# print_int syscall code = 1' Comment
+'\n    '      Text.Whitespace
+'move'        Name.Variable
+'    '        Text.Whitespace
+'$a0'         Keyword.Type
+','           Name.Builtin
+' '           Text.Whitespace
+'$s1'         Keyword.Type
+'    '        Text.Whitespace
+'# Load integer to print in $a0' Comment
+'\n    '      Text.Whitespace
+'syscall'     Keyword
+'\n\n    '    Text.Whitespace
+'# Print newline' Comment
+'\n    '      Text.Whitespace
+'li'          Name.Variable
+'  '          Text.Whitespace
+'$v0'         Keyword.Type
+','           Name.Builtin
+'4'           Keyword.Constant
+'       '     Text.Whitespace
+'# print_string syscall code = 4' Comment
+'\n    '      Text.Whitespace
+'la'          Name.Variable
+'  '          Text.Whitespace
+'$a0'         Keyword.Type
+','           Name.Builtin
+' '           Text.Whitespace
+'lf'          Text
+'\n    '      Text.Whitespace
+'syscall'     Keyword
+'\n\n    '    Text.Whitespace
+'# Exit'      Comment
+'\n    '      Text.Whitespace
+'li'          Name.Variable
+'  '          Text.Whitespace
+'$v0'         Keyword.Type
+','           Name.Builtin
+'1'           Keyword.Constant
+'0'           Keyword.Constant
+'      '      Text.Whitespace
+'# exit'      Comment
+'\n    '      Text.Whitespace
+'syscall'     Keyword
+'\n\n'        Text.Whitespace
+
+'# ------------------------------------------------------------------' Comment
+'\n\n    '    Text.Whitespace
+'# FUNCTION: int fun(int a)' Comment
+'\n    '      Text.Whitespace
+'# Arguments are stored in $a0' Comment
+'\n    '      Text.Whitespace
+'# Return value is stored in $v0' Comment
+'\n    '      Text.Whitespace
+'# Return address is stored in $ra (put there by jal instruction)' Comment
+'\n    '      Text.Whitespace
+'# Typical function operation is:' Comment
+'\n\n'        Text.Whitespace
+
+'fun:'        Name.Function
+'    '        Text.Whitespace
+'# This function overwrites $s0 and $s1' Comment
+'\n    '      Text.Whitespace
+'# We should save those on the stack' Comment
+'\n    '      Text.Whitespace
+"# This is PUSH'ing onto the stack" Comment
+'\n    '      Text.Whitespace
+'addi'        Keyword
+' '           Text.Whitespace
+'$sp'         Keyword.Type
+','           Name.Builtin
+'$sp'         Keyword.Type
+','           Name.Builtin
+'-4'          Keyword.Constant
+'     '       Text.Whitespace
+'# Adjust stack pointer' Comment
+'\n    '      Text.Whitespace
+'sw'          Keyword
+' '           Text.Whitespace
+'$s0'         Keyword.Type
+','           Name.Builtin
+'0'           Keyword.Constant
+'('           Text
+'$sp'         Keyword.Type
+')'           Text
+'       '     Text.Whitespace
+'# Save $s0'  Comment
+'\n    '      Text.Whitespace
+'addi'        Keyword
+' '           Text.Whitespace
+'$sp'         Keyword.Type
+','           Name.Builtin
+'$sp'         Keyword.Type
+','           Name.Builtin
+'-4'          Keyword.Constant
+'     '       Text.Whitespace
+'# Adjust stack pointer' Comment
+'\n    '      Text.Whitespace
+'sw'          Keyword
+' '           Text.Whitespace
+'$s1'         Keyword.Type
+','           Name.Builtin
+'0'           Keyword.Constant
+'('           Text
+'$sp'         Keyword.Type
+')'           Text
+'       '     Text.Whitespace
+'# Save $s1'  Comment
+'\n\n    '    Text.Whitespace
+'# Do the function math' Comment
+'\n    '      Text.Whitespace
+'li'          Name.Variable
+' '           Text.Whitespace
+'$s0'         Keyword.Type
+','           Name.Builtin
+' '           Text.Whitespace
+'3'           Keyword.Constant
+'\n    '      Text.Whitespace
+'mul'         Keyword
+' '           Text.Whitespace
+'$s1'         Keyword.Type
+','           Name.Builtin
+'$s0'         Keyword.Type
+','           Name.Builtin
+'$a0'         Keyword.Type
+'     '       Text.Whitespace
+'# s1 = 3*$a0  (i.e. 3*a)' Comment
+'\n    '      Text.Whitespace
+'addi'        Keyword
+' '           Text.Whitespace
+'$s1'         Keyword.Type
+','           Name.Builtin
+'$s1'         Keyword.Type
+','           Name.Builtin
+'5'           Keyword.Constant
+'      '      Text.Whitespace
+'# 3*a+5'     Comment
+'\n\n    '    Text.Whitespace
+'# Save the return value in $v0' Comment
+'\n    '      Text.Whitespace
+'move'        Name.Variable
+' '           Text.Whitespace
+'$v0'         Keyword.Type
+','           Name.Builtin
+'$s1'         Keyword.Type
+'\n\n    '    Text.Whitespace
+'# Restore saved register values from stack in opposite order' Comment
+'\n    '      Text.Whitespace
+"# This is POP'ing from the stack" Comment
+'\n    '      Text.Whitespace
+'lw'          Keyword
+' '           Text.Whitespace
+'$s1'         Keyword.Type
+','           Name.Builtin
+'0'           Keyword.Constant
+'('           Text
+'$sp'         Keyword.Type
+')'           Text
+'       '     Text.Whitespace
+'# Restore $s1' Comment
+'\n    '      Text.Whitespace
+'addi'        Keyword
+' '           Text.Whitespace
+'$sp'         Keyword.Type
+','           Name.Builtin
+'$sp'         Keyword.Type
+','           Name.Builtin
+'4'           Keyword.Constant
+'      '      Text.Whitespace
+'# Adjust stack pointer' Comment
+'\n    '      Text.Whitespace
+'lw'          Keyword
+' '           Text.Whitespace
+'$s0'         Keyword.Type
+','           Name.Builtin
+'0'           Keyword.Constant
+'('           Text
+'$sp'         Keyword.Type
+')'           Text
+'       '     Text.Whitespace
+'# Restore $s0' Comment
+'\n    '      Text.Whitespace
+'addi'        Keyword
+' '           Text.Whitespace
+'$sp'         Keyword.Type
+','           Name.Builtin
+'$sp'         Keyword.Type
+','           Name.Builtin
+'4'           Keyword.Constant
+'      '      Text.Whitespace
+'# Adjust stack pointer' Comment
+'\n\n    '    Text.Whitespace
+'# Return from function' Comment
+'\n    '      Text.Whitespace
+'jr'          Keyword
+' '           Text.Whitespace
+'$ra'         Keyword.Type
+'          '  Text.Whitespace
+'# Jump to addr stored in $ra' Comment
+'\n\n'        Text.Whitespace
+
+'# ------------------------------------------------------------------' Comment
+'\n\n    '    Text.Whitespace
+'# Start .data segment (data!)' Comment
+'\n    '      Text.Whitespace
+'.data'       Name.Entity
+'\n'          Text.Whitespace
+
+'x:'          Name.Function
+'  '          Text.Whitespace
+'.word'       Name.Entity
+' '           Text.Whitespace
+'5'           Keyword.Constant
+'\n'          Text.Whitespace
+
+'y:'          Name.Function
+'  '          Text.Whitespace
+'.word'       Name.Entity
+' '           Text.Whitespace
+'0'           Keyword.Constant
+'\n'          Text.Whitespace
+
+'msg1:'       Name.Function
+'   '         Text.Whitespace
+'.asciiz'     Name.Entity
+' '           Text.Whitespace
+'"'           Literal.String
+'y='          Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'lf:'         Name.Function
+'     '       Text.Whitespace
+'.asciiz'     Name.Entity
+' '           Text.Whitespace
+'"'           Literal.String
+'\\n'         Literal.String.Escape
+'"'           Literal.String
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/monte/test.mt.output b/tests/examplefiles/monte/test.mt.output
index 977cb0b3d4..8683f6a46d 100644
--- a/tests/examplefiles/monte/test.mt.output
+++ b/tests/examplefiles/monte/test.mt.output
@@ -3,9 +3,9 @@
 '('           Punctuation
 'main'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword.Declaration
 ' '           Text.Whitespace
@@ -23,7 +23,7 @@
 ' '           Text.Whitespace
 'DeepFrozen'  Keyword.Type
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'traceln'     Keyword.Pseudo
@@ -49,7 +49,7 @@
 '$currentProcess' Name
 '`'           Literal.String.Backtick
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 '"'           Literal.String.Double
@@ -63,16 +63,16 @@
 ' '           Literal.String.Double
 '\\u1234'     Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 "'"           Literal.String.Double
 '\\u1234'     Literal.String.Escape
 "'"           Literal.String.Char
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'return'      Keyword
 ' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/myghty/test.myt.output b/tests/examplefiles/myghty/test.myt.output
index 5937952f56..97b40bb0c0 100644
--- a/tests/examplefiles/myghty/test.myt.output
+++ b/tests/examplefiles/myghty/test.myt.output
@@ -38,15 +38,15 @@
 '%'           Operator
 'doc'         Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
 'global'      Keyword
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'import'      Keyword.Namespace
@@ -55,22 +55,22 @@
 ','           Operator
 ' '           Text
 're'          Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'import'      Keyword.Namespace
 ' '           Text
 'highlight'   Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '/'           Operator
 '%'           Operator
 'global'      Keyword
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
@@ -78,7 +78,7 @@
 ' '           Text
 'section'     Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
@@ -97,46 +97,46 @@
 '%'           Operator
 'doc'         Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'toc'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'path'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'description' Name
 '='           Operator
 'None'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'onepage'     Name
 '='           Operator
 'False'       Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '/'           Operator
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'item'        Name
@@ -149,7 +149,7 @@
 '('           Punctuation
 'path'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'if'          Keyword
@@ -160,7 +160,7 @@
 ' '           Text
 'None'        Keyword.Constant
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'raise'       Keyword
@@ -172,16 +172,16 @@
 '+'           Operator
 ' '           Text
 'path'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '/'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 'A'           Name
@@ -213,7 +213,7 @@
 '<%'          Name.Tag
 'python'      Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'content'     Name
@@ -225,7 +225,7 @@
 'content'     Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 're2'         Name
@@ -252,7 +252,7 @@
 '.'           Operator
 'S'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'content'     Name
@@ -278,16 +278,16 @@
 ' '           Text
 'content'     Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '/'           Operator
 '%'           Operator
 'python'      Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%'           Operator
 ' '           Text
@@ -301,7 +301,7 @@
 ' '           Text
 '1'           Literal.Number.Integer
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 'h3'          Name
@@ -445,20 +445,20 @@
 ' '           Text
 'formatplain' Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
 '%'           Operator
 'filter'      Name.Builtin
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'import'      Keyword.Namespace
 ' '           Text
 're'          Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'f'           Name
@@ -495,7 +495,7 @@
 ' '           Text
 'f'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'f'           Name
@@ -515,13 +515,13 @@
 '"'           Literal.String.Double
 '</p>'        Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
 ' '           Text
 'f'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
@@ -529,7 +529,7 @@
 '%'           Operator
 'filter'      Name.Builtin
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
@@ -559,7 +559,7 @@
 'both'        Literal.String.Double
 '"'           Literal.String.Double
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 'span'        Name
@@ -593,13 +593,13 @@
 '='           Operator
 'False'       Keyword.Constant
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'title'       Name
@@ -607,7 +607,7 @@
 '='           Operator
 ' '           Text
 'None'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'syntaxtype'  Name
@@ -617,7 +617,7 @@
 "'"           Literal.String.Single
 'python'      Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'html_escape' Name
@@ -625,7 +625,7 @@
 '='           Operator
 ' '           Text
 'False'       Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'use_sliders' Name
@@ -633,22 +633,22 @@
 '='           Operator
 ' '           Text
 'False'       Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '/'           Operator
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'def'         Keyword
@@ -658,7 +658,7 @@
 'f'           Name
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'f'           Name
@@ -673,7 +673,7 @@
 ' '           Text
 '4'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'g'           Name
@@ -682,7 +682,7 @@
 ' '           Text
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'lines'       Name
@@ -700,7 +700,7 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'whitespace'  Name
@@ -708,7 +708,7 @@
 '='           Operator
 ' '           Text
 'None'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'for'         Keyword
@@ -719,7 +719,7 @@
 ' '           Text
 'lines'       Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text
 'if'          Keyword
@@ -730,7 +730,7 @@
 ' '           Text
 'None'        Keyword.Constant
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                ' Text
 'match'       Name
@@ -749,7 +749,7 @@
 ' '           Text
 'line'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                ' Text
 'if'          Keyword
@@ -762,7 +762,7 @@
 ' '           Text
 'None'        Keyword.Constant
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                    ' Text
 'whitespace'  Name
@@ -775,9 +775,9 @@
 '('           Punctuation
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text
 'if'          Keyword
@@ -790,7 +790,7 @@
 ' '           Text
 'None'        Keyword.Constant
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                ' Text
 'line'        Name
@@ -818,9 +818,9 @@
 ' '           Text
 'line'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text
 'if'          Keyword
@@ -855,7 +855,7 @@
 ' '           Text
 'None'        Keyword.Constant
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                ' Text
 'g'           Name
@@ -872,11 +872,11 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
@@ -886,9 +886,9 @@
 'rstrip'      Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'p'           Name
@@ -909,7 +909,7 @@
 '.'           Operator
 'S'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'def'         Keyword
@@ -919,7 +919,7 @@
 'match'       Name
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
@@ -964,7 +964,7 @@
 '"'           Literal.String.Double
 '</pre>'      Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'content'     Name
@@ -996,14 +996,14 @@
 '</pre>'      Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '/'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 'div'         Name
@@ -1072,20 +1072,20 @@
 '"'           Literal.String.Double
 '>'           Operator
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'name'        Name
 '='           Operator
 'None'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'show'        Name
@@ -1093,7 +1093,7 @@
 "'"           Literal.String.Single
 'show'        Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'hide'        Name
@@ -1101,7 +1101,7 @@
 "'"           Literal.String.Single
 'hide'        Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
@@ -1109,14 +1109,14 @@
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'if'          Keyword
@@ -1127,7 +1127,7 @@
 ' '           Text
 'None'        Keyword.Constant
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text
 'name'        Name
@@ -1147,7 +1147,7 @@
 ' '           Text
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'name'        Name
@@ -1156,7 +1156,7 @@
 '='           Operator
 ' '           Text
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'm'           Name
@@ -1171,7 +1171,7 @@
 '='           Operator
 ' '           Text
 'name'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'name'        Name
@@ -1188,7 +1188,7 @@
 '('           Punctuation
 'name'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
@@ -1196,7 +1196,7 @@
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'javascript'  Name
 ':'           Punctuation
@@ -1234,13 +1234,13 @@
 'both'        Literal.String.Double
 '"'           Literal.String.Double
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'name'        Name
@@ -1248,7 +1248,7 @@
 '='           Operator
 ' '           Text
 'None'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'class_'      Name
@@ -1256,20 +1256,20 @@
 '='           Operator
 ' '           Text
 'None'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '/'           Operator
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'if'          Keyword
@@ -1280,7 +1280,7 @@
 ' '           Text
 'None'        Keyword.Constant
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'name'        Name
@@ -1304,14 +1304,14 @@
 "'"           Literal.String.Single
 ']'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '/'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 'div'         Name
@@ -1358,14 +1358,14 @@
 'both'        Literal.String.Double
 '"'           Literal.String.Double
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'link'        Name
@@ -1373,7 +1373,7 @@
 "'"           Literal.String.Single
 'sql'         Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
@@ -1381,14 +1381,14 @@
 '%'           Operator
 'args'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'href'        Name
@@ -1403,7 +1403,7 @@
 'SELF:popboxlink' Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
@@ -1411,20 +1411,20 @@
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '\'\'\'PYESC<& nav.myt:link, href=href, text=link, class_="codepoplink" &>PYESC\'\'\'' Literal.String.Doc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '/'           Operator
 '%'           Operator
 'method'      Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '%'           Operator
@@ -1438,14 +1438,14 @@
 'both'        Literal.String.Double
 '"'           Literal.String.Double
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '<'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'c'           Name
@@ -1457,7 +1457,7 @@
 'content'     Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'c'           Name
@@ -1487,7 +1487,7 @@
 '('           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '<'           Operator
@@ -1495,7 +1495,7 @@
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
@@ -1540,14 +1540,14 @@
 'both'        Literal.String.Double
 '"'           Literal.String.Double
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '<'           Operator
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'c'           Name
@@ -1559,7 +1559,7 @@
 'content'     Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'c'           Name
@@ -1589,7 +1589,7 @@
 '('           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '<'           Operator
@@ -1597,7 +1597,7 @@
 '%'           Operator
 'init'        Name
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '<'           Operator
diff --git a/tests/examplefiles/nasm/nasm_simd.asm b/tests/examplefiles/nasm/nasm_simd.asm
new file mode 100644
index 0000000000..587e30e823
--- /dev/null
+++ b/tests/examplefiles/nasm/nasm_simd.asm
@@ -0,0 +1,13 @@
+; test source for SIMD operations
+; not intended to be executable
+bits 64
+
+kmovq k1, [rel mask]
+vpxor xmm0, xmm0, xmm0
+vmovdqa32 zmm30, [abs data]
+vpaddd zmm0{k1}, zmm0, zmm30
+vpxor xmm1, xmm1, [rel xmm01]
+
+mask dq 0xAAAAAAAA55555555
+data: times 16 dd 0x12345678
+xmm01: times 4 dd 0
diff --git a/tests/examplefiles/nasm/nasm_simd.asm.output b/tests/examplefiles/nasm/nasm_simd.asm.output
new file mode 100644
index 0000000000..289d8accfa
--- /dev/null
+++ b/tests/examplefiles/nasm/nasm_simd.asm.output
@@ -0,0 +1,102 @@
+'; test source for SIMD operations' Comment.Single
+'\n'          Text.Whitespace
+
+'; not intended to be executable' Comment.Single
+'\n'          Text.Whitespace
+
+'bits'        Keyword
+' '           Text.Whitespace
+'64'          Literal.Number.Integer
+'\n\n'        Text.Whitespace
+
+'kmovq'       Name.Function
+' '           Text.Whitespace
+'k1'          Name.Builtin
+','           Punctuation
+' '           Text.Whitespace
+'['           Punctuation
+'rel'         Operator.Word
+' '           Text.Whitespace
+'mask'        Name.Variable
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'vpxor'       Name.Function
+' '           Text.Whitespace
+'xmm0'        Name.Builtin
+','           Punctuation
+' '           Text.Whitespace
+'xmm0'        Name.Builtin
+','           Punctuation
+' '           Text.Whitespace
+'xmm0'        Name.Builtin
+'\n'          Text.Whitespace
+
+'vmovdqa32'   Name.Function
+' '           Text.Whitespace
+'zmm30'       Name.Builtin
+','           Punctuation
+' '           Text.Whitespace
+'['           Punctuation
+'abs'         Operator.Word
+' '           Text.Whitespace
+'data'        Name.Variable
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'vpaddd'      Name.Function
+' '           Text.Whitespace
+'zmm0'        Name.Builtin
+'{'           Punctuation
+'k1'          Name.Builtin
+'},'          Punctuation
+' '           Text.Whitespace
+'zmm0'        Name.Builtin
+','           Punctuation
+' '           Text.Whitespace
+'zmm30'       Name.Builtin
+'\n'          Text.Whitespace
+
+'vpxor'       Name.Function
+' '           Text.Whitespace
+'xmm1'        Name.Builtin
+','           Punctuation
+' '           Text.Whitespace
+'xmm1'        Name.Builtin
+','           Punctuation
+' '           Text.Whitespace
+'['           Punctuation
+'rel'         Operator.Word
+' '           Text.Whitespace
+'xmm01'       Name.Variable
+']'           Punctuation
+'\n\n'        Text.Whitespace
+
+'mask'        Name.Function
+' '           Text.Whitespace
+'dq'          Name.Variable
+' '           Text.Whitespace
+'0xAAAAAAAA55555555' Literal.Number.Hex
+'\n'          Text.Whitespace
+
+'data:'       Name.Label
+' '           Text.Whitespace
+'times'       Keyword.Declaration
+' '           Text.Whitespace
+'16'          Literal.Number.Integer
+' '           Text.Whitespace
+'dd'          Name.Variable
+' '           Text.Whitespace
+'0x12345678'  Literal.Number.Hex
+'\n'          Text.Whitespace
+
+'xmm01:'      Name.Label
+' '           Text.Whitespace
+'times'       Keyword.Declaration
+' '           Text.Whitespace
+'4'           Literal.Number.Integer
+' '           Text.Whitespace
+'dd'          Name.Variable
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/nim/example.nim.output b/tests/examplefiles/nim/example.nim.output
index fd675b5c07..99e65c20df 100644
--- a/tests/examplefiles/nim/example.nim.output
+++ b/tests/examplefiles/nim/example.nim.output
@@ -1,218 +1,218 @@
 'import'      Keyword.Namespace
-' '           Text
+' '           Text.Whitespace
 'glib2'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'gtk2'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'gdk2'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'gtksourceview' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'dialogs'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pango'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'osproc'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'strutils'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword.Namespace
-' '           Text
+' '           Text.Whitespace
 'pegs'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'streams'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword.Namespace
-' '           Text
+' '           Text.Whitespace
 'settings'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'types'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'cfg'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'search'      Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'{.'          Punctuation
-'push'        Name
-' '           Text
-'callConv'    Name
-':'           Punctuation
-'cdecl'       Name
-'.'           Punctuation
-'}'           Punctuation
-'\n\n'        Text
+'{.'          Literal.String.Other
+'push'        Literal.String.Other
+' '           Text.Whitespace
+'callConv'    Literal.String.Other
+':'           Text
+'cdecl'       Literal.String.Other
+'.}'          Literal.String.Other
+'\n\n'        Text.Whitespace
 
 'const'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'NimrodProjectExt' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '.nimprj'     Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'types'       Name
 '.'           Punctuation
 'MainWin'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@'           Operator
 '['           Operator
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'search'      Name
 '.'           Punctuation
 'win'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'win'         Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'lastSession' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'seq'         Name.Builtin
 '['           Operator
 'string'      Name.Builtin
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@'           Operator
 '['           Operator
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'confParseFail' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 '# This gets set to true' Comment
-'\n                          ' Text
+'\n                          ' Text.Whitespace
 '# When there is an error parsing the config' Comment
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Load the settings' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'try'         Keyword
 ':'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'cfg'         Name
 '.'           Punctuation
 'load'        Name
 '('           Punctuation
 'lastSession' Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'except'      Keyword
-' '           Text
+' '           Text.Whitespace
 'ECFGParse'   Name
 ':'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# TODO: Make the dialog show the exception' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'confParseFail' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword.Pseudo
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'cfg'         Name
 '.'           Punctuation
 'defaultSettings' Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'except'      Keyword
-' '           Text
+' '           Text.Whitespace
 'EIO'         Name
 ':'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'cfg'         Name
 '.'           Punctuation
 'defaultSettings' Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'getProjectTab' Name.Function
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'int'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' \n  '       Text
+' \n  '       Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Float
 '..'          Punctuation
 'high'        Name
@@ -222,9 +222,9 @@
 'tabs'        Name
 ')'           Punctuation
 ':'           Punctuation
-' \n    '     Text
+' \n    '     Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'tabs'        Name
@@ -239,42 +239,43 @@
 'NimrodProjectExt' Name
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'saveTab'     Name.Function
 '('           Punctuation
 'tabNr'       Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'int'         Name.Builtin
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'startpath'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'tabNr'       Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -284,20 +285,20 @@
 '.'           Punctuation
 'saved'       Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -306,37 +307,37 @@
 ']'           Operator
 '.'           Punctuation
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ChooseFileToSave' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'w'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'startpath'   Name
 ')'           Punctuation
-' \n    '     Text
+' \n    '     Text.Whitespace
 '# dialogs.nim STOCK_OPEN instead of STOCK_SAVE' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-' \n    '     Text
+' \n    '     Text.Whitespace
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -345,24 +346,24 @@
 ']'           Operator
 '.'           Punctuation
 'filename'    Name
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'buffer'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PTextBuffer' Name
 '('           Punctuation
 'win'         Name
@@ -374,16 +375,16 @@
 '.'           Punctuation
 'buffer'      Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Get the text from the TextView' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'startIter'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TTextIter'   Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'getStartIter' Name
@@ -393,14 +394,14 @@
 'startIter'   Name
 ')'           Punctuation
 ')'           Punctuation
-'\n    \n    ' Text
+'\n    \n    ' Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'endIter'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TTextIter'   Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'getEndIter'  Name
@@ -410,13 +411,13 @@
 'endIter'     Name
 ')'           Punctuation
 ')'           Punctuation
-'\n    \n    ' Text
+'\n    \n    ' Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'text'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'getText'     Name
@@ -426,69 +427,69 @@
 'startIter'   Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'endIter'     Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Save it to a file' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'f'           Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TFile'       Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'open'        Name
 '('           Punctuation
 'f'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'path'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'fmWrite'     Name
 ')'           Punctuation
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'f'           Name
 '.'           Punctuation
 'write'       Name
 '('           Punctuation
 'text'        Name
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'f'           Name
 '.'           Punctuation
 'close'       Name
 '('           Punctuation
 ')'           Punctuation
-'\n      \n      ' Text
+'\n      \n      ' Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'tempStuff'   Name
 '.'           Punctuation
 'lastSaveDir' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'splitFile'   Name
 '('           Punctuation
 'path'        Name
 ')'           Punctuation
 '.'           Punctuation
 'dir'         Name
-'\n      \n      ' Text
+'\n      \n      ' Text.Whitespace
 '# Change the tab name and .Tabs.filename etc.' Comment
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -497,11 +498,11 @@
 ']'           Operator
 '.'           Punctuation
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'path'        Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -510,35 +511,35 @@
 ']'           Operator
 '.'           Punctuation
 'saved'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword.Pseudo
-'\n      '    Text
+'\n      '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'extractFilename' Name
 '('           Punctuation
 'path'        Name
 ')'           Punctuation
-'\n      \n      ' Text
+'\n      \n      ' Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'cTab'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
 '['           Operator
 'tabNr'       Name
 ']'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'cTab'        Name
 '.'           Punctuation
 'label'       Name
@@ -547,36 +548,37 @@
 '('           Punctuation
 'name'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'error'       Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'w'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Unable to write to file' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'  \n\n'      Text
+'  \n\n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'saveAllTabs' Name.Function
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Float
 '..'          Punctuation
 'high'        Name
@@ -586,12 +588,12 @@
 'tabs'        Name
 ')'           Punctuation
 ':'           Punctuation
-' \n    '     Text
+' \n    '     Text.Whitespace
 'saveTab'     Name
 '('           Punctuation
 'i'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 '.'           Punctuation
 'splitFile'   Name
@@ -608,46 +610,46 @@
 '.'           Punctuation
 'dir'         Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# GTK Events' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# -- w(PWindow)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'destroy'     Name.Function
 '('           Punctuation
 'widget'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PWidget'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'data'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
-'{.'          Punctuation
-'cdecl'       Name
-'.'           Punctuation
-'}'           Punctuation
-' '           Text
+' '           Text.Whitespace
+'{.'          Literal.String.Other
+'cdecl'       Literal.String.Other
+'.}'          Literal.String.Other
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# gather some settings' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'VPanedPos'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'PPaned'      Name
 '('           Punctuation
 'win'         Name
@@ -662,15 +664,15 @@
 'getPosition' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'winWidth'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -678,15 +680,15 @@
 'allocation'  Name
 '.'           Punctuation
 'width'       Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'winHeight'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -694,62 +696,63 @@
 'allocation'  Name
 '.'           Punctuation
 'height'      Name
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# save the settings' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'save'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# then quit' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'main_quit'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'delete_event' Name.Function
 '('           Punctuation
 'widget'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PWidget'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'event'       Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PEvent'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'bool'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'quit'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword.Pseudo
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'low'         Name
 '('           Punctuation
 'win'         Name
@@ -766,11 +769,11 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -780,50 +783,50 @@
 '.'           Punctuation
 'saved'       Name
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'askSave'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dialogNewWithButtons' Name
 '('           Punctuation
 '"'           Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Punctuation
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 'STOCK_SAVE'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'RESPONSE_ACCEPT' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'STOCK_CANCEL' Name
 ','           Punctuation
-' \n                            ' Text
+' \n                            ' Text.Whitespace
 'RESPONSE_CANCEL' Name
 ','           Punctuation
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '"'           Literal.String
 'Close without saving' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'RESPONSE_REJECT' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'askSave'     Name
 '.'           Punctuation
 'setTransientFor' Name
@@ -832,15 +835,15 @@
 '.'           Punctuation
 'w'           Name
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# TODO: Make this dialog look better' Comment
-'\n      '    Text
+'\n      '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'label'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'labelNew'    Name
 '('           Punctuation
 'win'         Name
@@ -851,14 +854,14 @@
 ']'           Operator
 '.'           Punctuation
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' \n          ' Text
+' \n          ' Text.Whitespace
 '"'           Literal.String
 ' is unsaved, would you like to save it ?' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'PBox'        Name
 '('           Punctuation
 'askSave'     Name
@@ -870,34 +873,34 @@
 '('           Punctuation
 'label'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'label'       Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'resp'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'askSave'     Name
 '.'           Punctuation
 'run'         Name
 '('           Punctuation
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'gtk2'        Name
 '.'           Punctuation
 'destroy'     Name
@@ -907,21 +910,21 @@
 'askSave'     Name
 ')'           Punctuation
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'resp'        Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 'of'          Keyword
-' '           Text
-'RESPONSE_ACCEPT' Name
-':'           Punctuation
-'\n        '  Text
+' '           Text.Whitespace
+'RESPONSE_ACCEPT' Name.Label
+':'           Operator
+'\n        '  Text.Whitespace
 'saveTab'     Name
 '('           Punctuation
 'i'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 '.'           Punctuation
 'splitFile'   Name
@@ -938,155 +941,156 @@
 '.'           Punctuation
 'dir'         Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'quit'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword.Pseudo
-'\n      '    Text
+'\n      '    Text.Whitespace
 'of'          Keyword
-' '           Text
-'RESPONSE_CANCEL' Name
-':'           Punctuation
-'\n        '  Text
+' '           Text.Whitespace
+'RESPONSE_CANCEL' Name.Label
+':'           Operator
+'\n        '  Text.Whitespace
 'quit'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 'break'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'of'          Keyword
-' '           Text
-'RESPONSE_REJECT' Name
-':'           Punctuation
-'\n        '  Text
+' '           Text.Whitespace
+'RESPONSE_REJECT' Name.Label
+':'           Operator
+'\n        '  Text.Whitespace
 'quit'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword.Pseudo
-'\n      '    Text
+'\n      '    Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'quit'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 'break'       Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# If False is returned the window will close' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'quit'        Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'windowState_Changed' Name.Function
 '('           Punctuation
 'widget'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PWidget'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'event'       Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PEventWindowState' Name
 ','           Punctuation
-' \n                         ' Text
+' \n                         ' Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'winMaximized' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'event'       Name
 '.'           Punctuation
 'newWindowState' Name
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' \n                               ' Text
+' \n                               ' Text.Whitespace
 'WINDOW_STATE_MAXIMIZED' Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# -- SourceView(PSourceView) & SourceBuffer' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'updateStatusBar' Name.Function
 '('           Punctuation
 'buffer'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PTextBuffer' Name
 ')'           Punctuation
-'{.'          Punctuation
-'cdecl'       Name
-'.'           Punctuation
-'}'           Punctuation
-' '           Text
+'{.'          Literal.String.Other
+'cdecl'       Literal.String.Other
+'.}'          Literal.String.Other
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Incase this event gets fired before' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# bottomBar is initialized' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomBar'   Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'tempStuff'   Name
 '.'           Punctuation
 'stopSBUpdates' Name
 ':'           Punctuation
-'  \n    '    Text
+'  \n    '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'iter'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TTextIter'   Name
-'\n    \n    ' Text
+'\n    \n    ' Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomBar'   Name
@@ -1095,7 +1099,7 @@
 '('           Punctuation
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'getIterAtMark' Name
@@ -1105,20 +1109,20 @@
 'iter'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'getInsert'   Name
 '('           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'row'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'getLine'     Name
 '('           Punctuation
 'addr'        Keyword
@@ -1126,17 +1130,17 @@
 'iter'        Name
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'col'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'getLineOffset' Name
 '('           Punctuation
 'addr'        Keyword
@@ -1144,9 +1148,9 @@
 'iter'        Name
 ')'           Punctuation
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomBar'   Name
@@ -1155,87 +1159,88 @@
 '('           Punctuation
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Line: '      Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Operator
 'row'         Name
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' Column: '   Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Operator
 'col'         Name
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'cursorMoved' Name.Function
 '('           Punctuation
 'buffer'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PTextBuffer' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'location'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PTextIter'   Name
 ','           Punctuation
-' \n                 ' Text
+' \n                 ' Text.Whitespace
 'mark'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PTextMark'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-'{.'          Punctuation
-'cdecl'       Name
-'.'           Punctuation
-'}'           Punctuation
-' '           Text
+'{.'          Literal.String.Other
+'cdecl'       Literal.String.Other
+'.}'          Literal.String.Other
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'updateStatusBar' Name
 '('           Punctuation
 'buffer'      Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'onCloseTab'  Name.Function
 '('           Punctuation
 'btn'         Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PButton'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PWidget'     Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'sourceViewTabs' Name
@@ -1243,18 +1248,18 @@
 'getNPages'   Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'tab'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'sourceViewTabs' Name
@@ -1263,7 +1268,7 @@
 '('           Punctuation
 'user_data'   Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'sourceViewTabs' Name
@@ -1272,7 +1277,7 @@
 '('           Punctuation
 'tab'         Name
 ')'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -1281,39 +1286,40 @@
 '('           Punctuation
 'tab'         Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'onSwitchTab' Name.Function
 '('           Punctuation
 'notebook'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PNotebook'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'page'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PNotebookPage' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pageNum'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'guint'       Name
 ','           Punctuation
-' \n                 ' Text
+' \n                 ' Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -1323,13 +1329,13 @@
 ')'           Punctuation
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pageNum'     Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -1339,9 +1345,9 @@
 '"'           Literal.String
 'Aporia IDE - ' Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -1351,253 +1357,255 @@
 '.'           Punctuation
 'filename'    Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'createTabLabel' Name.Function
 '('           Punctuation
 'name'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 't_child'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PWidget'     Name
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'tuple'       Keyword
 '['           Operator
 'box'         Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PWidget'     Name
 ','           Punctuation
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'label'       Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PLabel'      Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'box'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'hboxNew'     Name
 '('           Punctuation
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'label'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'labelNew'    Name
 '('           Punctuation
 'name'        Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'closebtn'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'buttonNew'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'closeBtn'    Name
 '.'           Punctuation
 'setLabel'    Name
 '('           Punctuation
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'iconSize'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'iconSizeFromName' Name
 '('           Punctuation
 '"'           Literal.String
 'tabIconSize' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'iconSize'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ':'           Punctuation
-'\n     '     Text
+'\n     '     Text.Whitespace
 'iconSize'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'iconSizeRegister' Name
 '('           Punctuation
 '"'           Literal.String
 'tabIconSize' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'image'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'imageNewFromStock' Name
 '('           Punctuation
 'STOCK_CLOSE' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'iconSize'    Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'gSignalConnect' Name
 '('           Punctuation
 'closebtn'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'clicked'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'G_Callback'  Name
 '('           Punctuation
 'onCloseTab'  Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 't_child'     Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'closebtn'    Name
 '.'           Punctuation
 'setImage'    Name
 '('           Punctuation
 'image'       Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'gtk2'        Name
 '.'           Punctuation
 'setRelief'   Name
 '('           Punctuation
 'closebtn'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'RELIEF_NONE' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'box'         Name
 '.'           Punctuation
 'packStart'   Name
 '('           Punctuation
 'label'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'box'         Name
 '.'           Punctuation
 'packEnd'     Name
 '('           Punctuation
 'closebtn'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'box'         Name
 '.'           Punctuation
 'showAll'     Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'box'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'label'       Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'changed'     Name.Function
 '('           Punctuation
 'buffer'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PTextBuffer' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 "# Update the 'Line & Column'" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#updateStatusBar(buffer)' Comment
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 "# Change the tabs state to 'unsaved'" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 "# and add '*' to the Tab Name" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'current'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -1605,18 +1613,18 @@
 'getCurrentPage' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -1625,14 +1633,14 @@
 ']'           Operator
 '.'           Punctuation
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -1641,22 +1649,22 @@
 ']'           Operator
 '.'           Punctuation
 'saved'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Untitled *'  Literal.String
 '"'           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -1665,15 +1673,15 @@
 ']'           Operator
 '.'           Punctuation
 'saved'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'extractFilename' Name
 '('           Punctuation
 'win'         Name
@@ -1685,26 +1693,26 @@
 '.'           Punctuation
 'filename'    Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' *'          Literal.String
 '"'           Literal.String
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'cTab'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
 '['           Operator
 'current'     Name
 ']'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'cTab'        Name
 '.'           Punctuation
 'label'       Name
@@ -1713,85 +1721,86 @@
 '('           Punctuation
 'name'        Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Other(Helper) functions' Comment
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'initSourceView' Name.Function
 '('           Punctuation
 'SourceView'  Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'PWidget'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'scrollWindow' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'PScrolledWindow' Name
 ','           Punctuation
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'buffer'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'PSourceBuffer' Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# This gets called by addTab' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Each tabs creates a new SourceView' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# SourceScrolledWindow(ScrolledWindow)' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'scrollWindow' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'scrolledWindowNew' Name
 '('           Punctuation
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'scrollWindow' Name
 '.'           Punctuation
 'setPolicy'   Name
 '('           Punctuation
 'POLICY_AUTOMATIC' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'POLICY_AUTOMATIC' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'scrollWindow' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# SourceView(gtkSourceView)' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SourceView'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sourceViewNew' Name
 '('           Punctuation
 'buffer'      Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PSourceView' Name
 '('           Punctuation
 'SourceView'  Name
@@ -1801,7 +1810,7 @@
 '('           Punctuation
 'True'        Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PSourceView' Name
 '('           Punctuation
 'SourceView'  Name
@@ -1815,7 +1824,7 @@
 '.'           Punctuation
 'indentWidth' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PSourceView' Name
 '('           Punctuation
 'SourceView'  Name
@@ -1829,7 +1838,7 @@
 '.'           Punctuation
 'showLineNumbers' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PSourceView' Name
 '('           Punctuation
 'SourceView'  Name
@@ -1837,14 +1846,14 @@
 '.'           Punctuation
 'setHighlightCurrentLine' Name
 '('           Punctuation
-'\n               ' Text
+'\n               ' Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'highlightCurrentLine' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PSourceView' Name
 '('           Punctuation
 'SourceView'  Name
@@ -1858,7 +1867,7 @@
 '.'           Punctuation
 'rightMargin' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PSourceView' Name
 '('           Punctuation
 'SourceView'  Name
@@ -1872,13 +1881,13 @@
 '.'           Punctuation
 'autoIndent'  Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'font'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'font_description_from_string' Name
 '('           Punctuation
 'win'         Name
@@ -1887,53 +1896,53 @@
 '.'           Punctuation
 'font'        Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SourceView'  Name
 '.'           Punctuation
 'modifyFont'  Name
 '('           Punctuation
 'font'        Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'scrollWindow' Name
 '.'           Punctuation
 'add'         Name
 '('           Punctuation
 'SourceView'  Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SourceView'  Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'setHighlightMatchingBrackets' Name
 '('           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'highlightMatchingBrackets' Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# UGLY workaround for yet another compiler bug:' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'gsignalConnect' Name
 '('           Punctuation
 'buffer'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'mark-set'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                         ' Text
+' \n                         ' Text.Whitespace
 'GCallback'   Name
 '('           Punctuation
 'aporia'      Name
@@ -1941,22 +1950,22 @@
 'cursorMoved' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'gsignalConnect' Name
 '('           Punctuation
 'buffer'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'changed'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'GCallback'   Name
 '('           Punctuation
 'aporia'      Name
@@ -1964,12 +1973,12 @@
 'changed'     Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# -- Set the syntax highlighter scheme' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'setScheme'   Name
@@ -1978,80 +1987,81 @@
 '.'           Punctuation
 'scheme'      Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'addTab'      Name.Function
 '('           Punctuation
 'name'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '## Adds a tab, if filename is not "" reads the file. And sets' Literal.String.Doc
-'\n  '        Text
+'\n  '        Text.Whitespace
 '## the tabs SourceViews text to that files contents.' Literal.String.Doc
-'\n  '        Text
+'\n  '        Text.Whitespace
 'assert'      Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'nimLang'     Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'buffer'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PSourceBuffer' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sourceBufferNew' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'nimLang'     Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'lang'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'langMan'     Name
@@ -2060,75 +2070,75 @@
 '('           Punctuation
 'filename'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'lang'        Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'setLanguage' Name
 '('           Punctuation
 'lang'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'setHighlightSyntax' Name
 '('           Punctuation
 'False'       Keyword.Pseudo
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'nam'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'name'        Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'nam'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nam'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Untitled'    Literal.String
 '"'           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nam'         Name
 '.'           Punctuation
 'add'         Name
@@ -2137,144 +2147,144 @@
 ' *'          Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Disable the undo/redo manager.' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'begin_not_undoable_action' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n    '  Text
+'\n  \n    '  Text.Whitespace
 '# Load the file.' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'file'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'readFile'    Name
 '('           Punctuation
 'filename'    Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'file'        Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'set_text'    Name
 '('           Punctuation
 'file'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'len'         Name
 '('           Punctuation
 'file'        Name
 ')'           Punctuation
 ')'           Punctuation
-'\n      \n    ' Text
+'\n      \n    ' Text.Whitespace
 '# Enable the undo/redo manager.' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'buffer'      Name
 '.'           Punctuation
 'end_not_undoable_action' Name
 '('           Punctuation
 ')'           Punctuation
-'\n      \n    ' Text
+'\n      \n    ' Text.Whitespace
 '# Get the name.ext of the filename, for the tabs title' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'nam'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'extractFilename' Name
 '('           Punctuation
 'filename'    Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Init the sourceview' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'sourceView'  Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PWidget'     Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'scrollWindow' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PScrolledWindow' Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'initSourceView' Name
 '('           Punctuation
 'sourceView'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'scrollWindow' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'buffer'      Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'TabLabel'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'labelText'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'createTabLabel' Name
 '('           Punctuation
 'nam'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'scrollWindow' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Add a tab' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -2283,65 +2293,65 @@
 '('           Punctuation
 'scrollWindow' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TabLabel'    Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'nTab'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Tab'         Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'nTab'        Name
 '.'           Punctuation
 'buffer'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'buffer'      Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'nTab'        Name
 '.'           Punctuation
 'sourceView'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sourceView'  Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'nTab'        Name
 '.'           Punctuation
 'label'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'labelText'   Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'nTab'        Name
 '.'           Punctuation
 'saved'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'nTab'        Name
 '.'           Punctuation
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2350,7 +2360,7 @@
 '('           Punctuation
 'nTab'        Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'PTextView'   Name
 '('           Punctuation
 'SourceView'  Name
@@ -2362,41 +2372,42 @@
 '.'           Punctuation
 'buffer'      Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# GTK Events Contd.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# -- TopMenu & TopBar' Comment
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'newFile'     Name.Function
 '('           Punctuation
 'menuItem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'addTab'      Name
 '('           Punctuation
 '"'           Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'sourceViewTabs' Name
@@ -2413,40 +2424,41 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'openFile'    Name.Function
 '('           Punctuation
 'menuItem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'startpath'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'currPage'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -2454,25 +2466,25 @@
 'getCurrentPage' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'currPage'    Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'tabs'        Name
 '.'           Punctuation
 'len'         Name
 ':'           Punctuation
-' \n    '     Text
+' \n    '     Text.Whitespace
 'startpath'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 '.'           Punctuation
 'splitFile'   Name
@@ -2488,125 +2500,125 @@
 ')'           Punctuation
 '.'           Punctuation
 'dir'         Name
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'startpath'   Name
 '.'           Punctuation
 'len'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Use lastSavePath as the startpath' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'startpath'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'tempStuff'   Name
 '.'           Punctuation
 'lastSaveDir' Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'startpath'   Name
 '.'           Punctuation
 'len'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'startpath'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 '.'           Punctuation
 'getHomeDir'  Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'files'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ChooseFilesToOpen' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'w'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'startpath'   Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'files'       Name
 '.'           Punctuation
 'len'         Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'f'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'items'       Name
 '('           Punctuation
 'files'       Name
 ')'           Punctuation
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'try'         Keyword
 ':'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'addTab'      Name
 '('           Punctuation
 '"'           Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'f'           Name
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'except'      Keyword
-' '           Text
+' '           Text.Whitespace
 'EIO'         Name
 ':'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'error'       Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'w'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Unable to read from file' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Switch to the newly created tab' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'sourceViewTabs' Name
@@ -2623,31 +2635,32 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'saveFile_Activate' Name.Function
 '('           Punctuation
 'menuItem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'current'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -2655,12 +2668,12 @@
 'getCurrentPage' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'saveTab'     Name
 '('           Punctuation
 'current'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 '.'           Punctuation
 'splitFile'   Name
@@ -2677,31 +2690,32 @@
 '.'           Punctuation
 'dir'         Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'saveFileAs_Activate' Name.Function
 '('           Punctuation
 'menuItem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'current'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -2709,18 +2723,18 @@
 'getCurrentPage' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'filename'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'saved'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
@@ -2731,7 +2745,7 @@
 '.'           Punctuation
 'filename'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2741,7 +2755,7 @@
 '.'           Punctuation
 'saved'       Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2750,11 +2764,11 @@
 ']'           Operator
 '.'           Punctuation
 'saved'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2763,17 +2777,17 @@
 ']'           Operator
 '.'           Punctuation
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'saveTab'     Name
 '('           Punctuation
 'current'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 '.'           Punctuation
 'splitFile'   Name
@@ -2783,13 +2797,13 @@
 '.'           Punctuation
 'dir'         Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# If the user cancels the save file dialog. Restore the previous filename' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# and saved state' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2798,14 +2812,14 @@
 ']'           Operator
 '.'           Punctuation
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2814,11 +2828,11 @@
 ']'           Operator
 '.'           Punctuation
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2827,35 +2841,36 @@
 ']'           Operator
 '.'           Punctuation
 'saved'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'saved'       Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'undo'        Name.Function
 '('           Punctuation
 'menuItem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' \n  '       Text
+' \n  '       Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'current'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -2863,9 +2878,9 @@
 'getCurrentPage' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2879,7 +2894,7 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2892,31 +2907,32 @@
 'undo'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'redo'        Name.Function
 '('           Punctuation
 'menuItem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'current'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -2924,9 +2940,9 @@
 'getCurrentPage' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2940,7 +2956,7 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -2953,33 +2969,34 @@
 'redo'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n    \n'    Text
+'\n    \n'    Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'find_Activate' Name.Function
 '('           Punctuation
 'menuItem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' \n  '       Text
+' \n  '       Text.Whitespace
 '# Get the selected text, and set the findEntry to it.' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'currentTab'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -2987,14 +3004,14 @@
 'getCurrentPage' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'insertIter'  Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TTextIter'   Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -3011,7 +3028,7 @@
 'insertIter'  Name
 ')'           Punctuation
 ','           Punctuation
-' \n                                      ' Text
+' \n                                      ' Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -3025,13 +3042,13 @@
 '('           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'insertOffset' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'insertIter'  Name
@@ -3040,14 +3057,14 @@
 'getOffset'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'selectIter'  Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TTextIter'   Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -3064,7 +3081,7 @@
 'selectIter'  Name
 ')'           Punctuation
 ','           Punctuation
-' \n                ' Text
+' \n                ' Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -3078,13 +3095,13 @@
 '('           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'selectOffset' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'selectIter'  Name
@@ -3093,23 +3110,23 @@
 'getOffset'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'insertOffset' Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'selectOffset' Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'text'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -3126,16 +3143,16 @@
 'insertIter'  Name
 ')'           Punctuation
 ','           Punctuation
-' \n                                                   ' Text
+' \n                                                   ' Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'selectIter'  Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findEntry'   Name
@@ -3144,7 +3161,7 @@
 '('           Punctuation
 'text'        Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -3152,7 +3169,7 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findEntry'   Name
@@ -3160,7 +3177,7 @@
 'grabFocus'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceEntry' Name
@@ -3168,7 +3185,7 @@
 'hide'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceLabel' Name
@@ -3176,7 +3193,7 @@
 'hide'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceBtn'  Name
@@ -3184,7 +3201,7 @@
 'hide'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceAllBtn' Name
@@ -3192,25 +3209,26 @@
 'hide'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'replace_Activate' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -3218,7 +3236,7 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findEntry'   Name
@@ -3226,7 +3244,7 @@
 'grabFocus'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceEntry' Name
@@ -3234,7 +3252,7 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceLabel' Name
@@ -3242,7 +3260,7 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceBtn'  Name
@@ -3250,7 +3268,7 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceAllBtn' Name
@@ -3258,73 +3276,75 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'settings_Activate' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'settings'    Name
 '.'           Punctuation
 'showSettings' Name
 '('           Punctuation
 'win'         Name
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'viewBottomPanel_Toggled' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PCheckMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'bottomPanelVisible' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuitem'    Name
 '.'           Punctuation
 'itemGetActive' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'bottomPanelVisible' Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomPanelTabs' Name
@@ -3332,10 +3352,10 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomPanelTabs' Name
@@ -3343,14 +3363,14 @@
 'hide'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'var'         Keyword.Declaration
-'\n  '        Text
+'\n  '        Text.Whitespace
 'pegLineError' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'peg"'        Literal.String
 '{[^(]*} '    Literal.String
 "'"           Literal.String
@@ -3372,11 +3392,11 @@
 '\\'          Literal.String
 's* {.*}'     Literal.String
 '"'           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'pegLineWarning' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'peg"'        Literal.String
 '{[^(]*} '    Literal.String
 "'"           Literal.String
@@ -3406,11 +3426,11 @@
 '\\'          Literal.String
 's* {.*}'     Literal.String
 '"'           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'pegOtherError' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'peg"'        Literal.String
 "'"           Literal.String
 'Error:'      Literal.String
@@ -3419,63 +3439,64 @@
 '\\'          Literal.String
 's* {.*}'     Literal.String
 '"'           Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 'pegSuccess'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'peg"'        Literal.String
 "'"           Literal.String
 'Hint: operation successful' Literal.String
 "'"           Literal.String
 '.*'          Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'addText'     Name.Function
 '('           Punctuation
 'textView'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PTextView'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'text'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'colorTag'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PTextTag'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'text'        Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'iter'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TTextIter'   Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'textView'    Name
 '.'           Punctuation
 'getBuffer'   Name
@@ -3489,17 +3510,17 @@
 'iter'        Name
 ')'           Punctuation
 ')'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'colorTag'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'textView'    Name
 '.'           Punctuation
 'getBuffer'   Name
@@ -3513,19 +3534,19 @@
 'iter'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'text'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'len'         Name
 '('           Punctuation
 'text'        Name
 ')'           Punctuation
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'textView'    Name
 '.'           Punctuation
 'getBuffer'   Name
@@ -3539,52 +3560,53 @@
 'iter'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'text'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'len'         Name
 '('           Punctuation
 'text'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'colorTag'    Name
 ','           Punctuation
-'\n                                          ' Text
+'\n                                          ' Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'createColor' Name.Function
 '('           Punctuation
 'textView'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PTextView'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'name'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'color'       Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PTextTag'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'tagTable'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'textView'    Name
 '.'           Punctuation
 'getBuffer'   Name
@@ -3594,32 +3616,32 @@
 'getTagTable' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'tagTable'    Name
 '.'           Punctuation
 'tableLookup' Name
 '('           Punctuation
 'name'        Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'textView'    Name
 '.'           Punctuation
 'getBuffer'   Name
@@ -3630,23 +3652,23 @@
 '('           Punctuation
 'name'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'foreground'  Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'color'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'when'        Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'defined'     Name
 '('           Punctuation
 'os'          Name
@@ -3654,53 +3676,54 @@
 'findExe'     Name
 ')'           Punctuation
 ':'           Punctuation
-' \n  '       Text
-'proc '       Keyword
+' \n  '       Text.Whitespace
+'proc'        Keyword
+' '           Text.Whitespace
 'findExe'     Name.Function
 '('           Punctuation
 'exe'         Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' \n    '     Text
+' \n    '     Text.Whitespace
 '## returns "" if the exe cannot be found' Literal.String.Doc
-'\n    '      Text
+'\n    '      Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'addFileExt'  Name
 '('           Punctuation
 'exe'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 '.'           Punctuation
 'exeExt'      Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ExistsFile'  Name
 '('           Punctuation
 'result'      Name
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 '.'           Punctuation
 'getEnv'      Name
@@ -3709,89 +3732,90 @@
 'PATH'        Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'candidate'   Name
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'split'       Name
 '('           Punctuation
 'path'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pathSep'     Name
 ')'           Punctuation
 ':'           Punctuation
-' \n      '   Text
+' \n      '   Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'candidate'   Name
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 'result'      Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ExistsFile'  Name
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'GetCmd'      Name.Function
 '('           Punctuation
 'cmd'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' \n  '       Text
+' \n  '       Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'f'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'quoteIfContainsWhite' Name
 '('           Punctuation
 'filename'    Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'cmd'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 'peg"'        Literal.String
 '\\'          Literal.String
 's* '         Literal.String
@@ -3813,13 +3837,13 @@
 ' {.*}'       Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'exe'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'quoteIfContainsWhite' Name
 '('           Punctuation
 'findExe'     Name
@@ -3830,83 +3854,84 @@
 ']'           Operator
 ')'           Punctuation
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'exe'         Name
 '.'           Punctuation
 'len'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'exe'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'matches'     Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'exe'         Name
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'matches'     Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 'f'           Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'cmd'         Name
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 'f'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'showBottomPanel' Name.Function
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'bottomPanelVisible' Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomPanelTabs' Name
@@ -3914,17 +3939,17 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'bottomPanelVisible' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'PCheckMenuItem' Name
 '('           Punctuation
 'win'         Name
@@ -3936,18 +3961,18 @@
 '('           Punctuation
 'true'        Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Scroll to the end of the TextView' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 "# This is stupid, it works sometimes... it's random" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'endIter'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TTextIter'   Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -3963,57 +3988,58 @@
 'endIter'     Name
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
 '.'           Punctuation
 'scrollToIter' Name
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'endIter'     Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Float
 '.25'         Literal.Number.Float
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Float
 '.0'          Literal.Number.Float
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Float
 '.0'          Literal.Number.Float
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'compileRun'  Name.Function
 '('           Punctuation
 'currentTab'  Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'int'         Name.Builtin
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shouldRun'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'bool'        Name.Builtin
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -4024,17 +4050,17 @@
 'filename'    Name
 '.'           Punctuation
 'len'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Clear the outputTextView' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -4048,16 +4074,16 @@
 '"'           Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'outp'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'osProc'      Name
 '.'           Punctuation
 'execProcess' Name
@@ -4070,7 +4096,7 @@
 '.'           Punctuation
 'nimrodCmd'   Name
 ','           Punctuation
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -4081,128 +4107,128 @@
 'filename'    Name
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Colors'    Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'normalTag'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'createColor' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'normalTag'   Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '#3d3d3d'     Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'errorTag'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'createColor' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'errorTag'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'red'         Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'warningTag'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'createColor' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'warningTag'  Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'darkorange'  Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'successTag'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'createColor' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'successTag'  Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'darkgreen'   Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'outp'        Name
 '.'           Punctuation
 'splitLines'  Name
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 'pegLineError' Name
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 'pegOtherError' Name
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -4212,24 +4238,24 @@
 '"'           Literal.String
 '\\n'         Literal.String.Escape
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'errorTag'    Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 '='           Operator
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 'pegSuccess'  Name
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -4239,28 +4265,28 @@
 '"'           Literal.String
 '\\n'         Literal.String.Escape
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'successTag'  Name
 ')'           Punctuation
-'\n      \n      ' Text
+'\n      \n      ' Text.Whitespace
 '# Launch the process' Comment
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'shouldRun'   Name
 ':'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'changeFileExt' Name
 '('           Punctuation
 'win'         Name
@@ -4272,31 +4298,31 @@
 '.'           Punctuation
 'filename'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'os'          Name
 '.'           Punctuation
 'ExeExt'      Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'output'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '\\n'         Literal.String.Escape
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'osProc'      Name
 '.'           Punctuation
 'execProcess' Name
 '('           Punctuation
 'filename'    Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -4305,17 +4331,17 @@
 '('           Punctuation
 'output'      Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 'pegLineWarning' Name
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -4325,18 +4351,18 @@
 '"'           Literal.String
 '\\n'         Literal.String.Escape
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'warningTag'  Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -4346,45 +4372,46 @@
 '"'           Literal.String
 '\\n'         Literal.String.Escape
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'normalTag'   Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'showBottomPanel' Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'CompileCurrent_Activate' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'saveFile_Activate' Name
 '('           Punctuation
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'compileRun'  Name
 '('           Punctuation
 'win'         Name
@@ -4395,36 +4422,37 @@
 '('           Punctuation
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'CompileRunCurrent_Activate' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'saveFile_Activate' Name
 '('           Punctuation
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'compileRun'  Name
 '('           Punctuation
 'win'         Name
@@ -4435,100 +4463,103 @@
 '('           Punctuation
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'CompileProject_Activate' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'saveAllTabs' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'compileRun'  Name
 '('           Punctuation
 'getProjectTab' Name
 '('           Punctuation
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'CompileRunProject_Activate' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'saveAllTabs' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'compileRun'  Name
 '('           Punctuation
 'getProjectTab' Name
 '('           Punctuation
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'RunCustomCommand' Name.Function
 '('           Punctuation
 'cmd'         Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' \n  '       Text
+' \n  '       Text.Whitespace
 'saveFile_Activate' Name
 '('           Punctuation
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'currentTab'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -4536,9 +4567,9 @@
 'getCurrentPage' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -4549,28 +4580,28 @@
 'filename'    Name
 '.'           Punctuation
 'len'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'cmd'         Name
 '.'           Punctuation
 'len'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Clear the outputTextView' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -4584,16 +4615,16 @@
 '"'           Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'outp'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'osProc'      Name
 '.'           Punctuation
 'execProcess' Name
@@ -4602,7 +4633,7 @@
 '('           Punctuation
 'cmd'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -4613,43 +4644,43 @@
 'filename'    Name
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'normalTag'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'createColor' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'normalTag'   Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '#3d3d3d'     Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'outp'        Name
 '.'           Punctuation
 'splitLines'  Name
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -4659,37 +4690,38 @@
 '"'           Literal.String
 '\\n'         Literal.String.Escape
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'normalTag'   Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'showBottomPanel' Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'RunCustomCommand1' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'RunCustomCommand' Name
 '('           Punctuation
 'win'         Name
@@ -4698,25 +4730,26 @@
 '.'           Punctuation
 'customCmd1'  Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'RunCustomCommand2' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'RunCustomCommand' Name
 '('           Punctuation
 'win'         Name
@@ -4725,25 +4758,26 @@
 '.'           Punctuation
 'customCmd2'  Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'RunCustomCommand3' Name.Function
 '('           Punctuation
 'menuitem'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'RunCustomCommand' Name
 '('           Punctuation
 'win'         Name
@@ -4752,80 +4786,83 @@
 '.'           Punctuation
 'customCmd3'  Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# -- FindBar' Comment
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'nextBtn_Clicked' Name.Function
 '('           Punctuation
 'button'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PButton'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'findText'    Name
 '('           Punctuation
 'True'        Keyword.Pseudo
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'prevBtn_Clicked' Name.Function
 '('           Punctuation
 'button'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PButton'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'findText'    Name
 '('           Punctuation
 'False'       Keyword.Pseudo
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'replaceBtn_Clicked' Name.Function
 '('           Punctuation
 'button'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PButton'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'currentTab'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -4833,21 +4870,21 @@
 'getCurrentPage' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'start'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'theEnd'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TTextIter'   Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -4859,31 +4896,31 @@
 '.'           Punctuation
 'getSelectionBounds' Name
 '('           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'start'       Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'theEnd'      Name
 ')'           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# If no text is selected, try finding a match.' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'findText'    Name
 '('           Punctuation
 'True'        Keyword.Pseudo
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -4895,26 +4932,26 @@
 '.'           Punctuation
 'getSelectionBounds' Name
 '('           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'start'       Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'theEnd'      Name
 ')'           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '# No match'  Comment
-'\n      '    Text
+'\n      '    Text.Whitespace
 'return'      Keyword
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Remove the text' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -4931,28 +4968,28 @@
 'start'       Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'theEnd'      Name
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Insert the replacement' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'text'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'getText'     Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'replaceEntry' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -4969,88 +5006,90 @@
 'start'       Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'text'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'len'         Name
 '('           Punctuation
 'text'        Name
 ')'           Punctuation
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'replaceAllBtn_Clicked' Name.Function
 '('           Punctuation
 'button'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PButton'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'find'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'getText'     Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'findEntry'   Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'replace'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'getText'     Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'replaceEntry' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'replaceAll'  Name
 '('           Punctuation
 'find'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'replace'     Name
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'closeBtn_Clicked' Name.Function
 '('           Punctuation
 'button'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PButton'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' \n  '       Text
+' \n  '       Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -5058,499 +5097,505 @@
 'hide'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'caseSens_Changed' Name.Function
 '('           Punctuation
 'radiomenuitem' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PRadioMenuitem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'search'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'casesens'    Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'caseInSens_Changed' Name.Function
 '('           Punctuation
 'radiomenuitem' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PRadioMenuitem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'search'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'caseinsens'  Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'style_Changed' Name.Function
 '('           Punctuation
 'radiomenuitem' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PRadioMenuitem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'search'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'style'       Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'regex_Changed' Name.Function
 '('           Punctuation
 'radiomenuitem' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PRadioMenuitem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'search'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'regex'       Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'peg_Changed' Name.Function
 '('           Punctuation
 'radiomenuitem' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PRadioMenuitem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'search'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'peg'         Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'extraBtn_Clicked' Name.Function
 '('           Punctuation
 'button'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PButton'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'user_data'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'extraMenu'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuNew'     Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'group'       Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PGSList'     Name
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'caseSensMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'radio_menu_item_new' Name
 '('           Punctuation
 'group'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Case sensitive' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraMenu'   Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'caseSensMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'caseSensMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'toggled'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'caseSens_Changed' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'caseSensMenuItem' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'group'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'caseSensMenuItem' Name
 '.'           Punctuation
 'ItemGetGroup' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'caseInSensMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'radio_menu_item_new' Name
 '('           Punctuation
 'group'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Case insensitive' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraMenu'   Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'caseInSensMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'caseInSensMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'toggled'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'caseInSens_Changed' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'caseInSensMenuItem' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'group'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'caseInSensMenuItem' Name
 '.'           Punctuation
 'ItemGetGroup' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'styleMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'radio_menu_item_new' Name
 '('           Punctuation
 'group'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Style insensitive' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraMenu'   Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'styleMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'styleMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'toggled'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'style_Changed' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'styleMenuItem' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'group'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'styleMenuItem' Name
 '.'           Punctuation
 'ItemGetGroup' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'regexMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'radio_menu_item_new' Name
 '('           Punctuation
 'group'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Regex'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraMenu'   Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'regexMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'regexMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'toggled'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'regex_Changed' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'regexMenuItem' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'group'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'regexMenuItem' Name
 '.'           Punctuation
 'ItemGetGroup' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'pegMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'radio_menu_item_new' Name
 '('           Punctuation
 'group'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Pegs'        Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraMenu'   Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'pegMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'pegMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'toggled'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'peg_Changed' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'pegMenuItem' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Make the correct radio button active' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'search'      Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'of'          Keyword
-' '           Text
-'"'           Literal.String
-'casesens'    Literal.String
-'"'           Literal.String
-':'           Punctuation
-'\n    '      Text
+' '           Text.Whitespace
+'"'           Name.Label
+'casesens'    Name.Label
+'"'           Name.Label
+':'           Operator
+'\n    '      Text.Whitespace
 'PCheckMenuItem' Name
 '('           Punctuation
 'caseSensMenuItem' Name
@@ -5560,14 +5605,14 @@
 '('           Punctuation
 'True'        Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'of'          Keyword
-' '           Text
-'"'           Literal.String
-'caseinsens'  Literal.String
-'"'           Literal.String
-':'           Punctuation
-'\n    '      Text
+' '           Text.Whitespace
+'"'           Name.Label
+'caseinsens'  Name.Label
+'"'           Name.Label
+':'           Operator
+'\n    '      Text.Whitespace
 'PCheckMenuItem' Name
 '('           Punctuation
 'caseInSensMenuItem' Name
@@ -5577,14 +5622,14 @@
 '('           Punctuation
 'True'        Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'of'          Keyword
-' '           Text
-'"'           Literal.String
-'style'       Literal.String
-'"'           Literal.String
-':'           Punctuation
-'\n    '      Text
+' '           Text.Whitespace
+'"'           Name.Label
+'style'       Name.Label
+'"'           Name.Label
+':'           Operator
+'\n    '      Text.Whitespace
 'PCheckMenuItem' Name
 '('           Punctuation
 'styleMenuItem' Name
@@ -5594,14 +5639,14 @@
 '('           Punctuation
 'True'        Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'of'          Keyword
-' '           Text
-'"'           Literal.String
-'regex'       Literal.String
-'"'           Literal.String
-':'           Punctuation
-'\n    '      Text
+' '           Text.Whitespace
+'"'           Name.Label
+'regex'       Name.Label
+'"'           Name.Label
+':'           Operator
+'\n    '      Text.Whitespace
 'PCheckMenuItem' Name
 '('           Punctuation
 'regexMenuItem' Name
@@ -5611,14 +5656,14 @@
 '('           Punctuation
 'True'        Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'of'          Keyword
-' '           Text
-'"'           Literal.String
-'peg'         Literal.String
-'"'           Literal.String
-':'           Punctuation
-'\n    '      Text
+' '           Text.Whitespace
+'"'           Name.Label
+'peg'         Name.Label
+'"'           Name.Label
+':'           Operator
+'\n    '      Text.Whitespace
 'PCheckMenuItem' Name
 '('           Punctuation
 'pegMenuItem' Name
@@ -5628,94 +5673,95 @@
 '('           Punctuation
 'True'        Keyword.Pseudo
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'extraMenu'   Name
 '.'           Punctuation
 'popup'       Name
 '('           Punctuation
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'get_current_event_time' Name
 '('           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# GUI Initialization' Comment
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'createAccelMenuItem' Name.Function
 '('           Punctuation
 'toolsMenu'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenu'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PAccelGroup' Name
 ','           Punctuation
-' \n                         ' Text
+' \n                         ' Text.Whitespace
 'label'       Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'acc'         Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'gint'        Name
 ','           Punctuation
-'\n                         ' Text
+'\n                         ' Text.Whitespace
 'action'      Name
 ':'           Punctuation
-' '           Text
-'proc'        Keyword
-' '           Text
+' '           Text.Whitespace
+'proc'        Name
+' '           Text.Whitespace
 '('           Punctuation
 'i'           Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenuItem'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'p'           Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pgpointer'   Name
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' \n  '       Text
+' \n  '       Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 'label'       Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'result'      Name
 '.'           Punctuation
 'addAccelerator' Name
@@ -5724,217 +5770,219 @@
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'acc'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'ACCEL_VISIBLE' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ToolsMenu'   Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'result'      Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'result'      Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'result'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'action'      Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'createSeparator' Name.Function
 '('           Punctuation
 'menu'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PMenu'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'sep'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'separator_menu_item_new' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'menu'        Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'sep'         Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'sep'         Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'initTopMenu' Name.Function
 '('           Punctuation
 'MainBox'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PBox'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Create a accelerator group, used for shortcuts' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# like CTRL + S in SaveMenuItem' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'accel_group_new' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'add_accel_group' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'w'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# TopMenu(MenuBar)' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'TopMenu'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuBarNew'  Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# FileMenu'  Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'FileMenu'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuNew'     Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'NewMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'New'         Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# New'       Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileMenu'    Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'NewMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'NewMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'NewMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'newFile'     Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'createSeparator' Name
 '('           Punctuation
 'FileMenu'    Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'OpenMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'Open...'     Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# Open...'   Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# CTRL + O'  Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'OpenMenuItem' Name
 '.'           Punctuation
 'add_accelerator' Name
@@ -5943,43 +5991,43 @@
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' \n                  ' Text
+' \n                  ' Text.Whitespace
 'KEY_o'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'CONTROL_MASK' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'ACCEL_VISIBLE' Name
 ')'           Punctuation
-' \n  '       Text
+' \n  '       Text.Whitespace
 'FileMenu'    Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'OpenMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'OpenMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'OpenMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -5987,27 +6035,27 @@
 'openFile'    Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'SaveMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'Save'        Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# Save'      Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# CTRL + S'  Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'SaveMenuItem' Name
 '.'           Punctuation
 'add_accelerator' Name
@@ -6016,67 +6064,67 @@
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' \n                  ' Text
+' \n                  ' Text.Whitespace
 'KEY_s'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'CONTROL_MASK' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'ACCEL_VISIBLE' Name
 ')'           Punctuation
-' \n  '       Text
+' \n  '       Text.Whitespace
 'FileMenu'    Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'SaveMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'SaveMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'SaveMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'saveFile_activate' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'SaveAsMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'Save As...'  Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# Save as...' Comment
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'SaveAsMenuItem' Name
 '.'           Punctuation
 'add_accelerator' Name
@@ -6085,142 +6133,142 @@
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' \n                  ' Text
+' \n                  ' Text.Whitespace
 'KEY_s'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'CONTROL_MASK' Name
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'gdk2'        Name
 '.'           Punctuation
 'SHIFT_MASK'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'ACCEL_VISIBLE' Name
 ')'           Punctuation
-' \n  '       Text
+' \n  '       Text.Whitespace
 'FileMenu'    Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'SaveAsMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'SaveAsMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'SaveAsMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'saveFileAs_Activate' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'FileMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuItemNewWithMnemonic' Name
 '('           Punctuation
 '"'           Literal.String
 '_File'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'FileMenuItem' Name
 '.'           Punctuation
 'setSubMenu'  Name
 '('           Punctuation
 'FileMenu'    Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FileMenuItem' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TopMenu'     Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'FileMenuItem' Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Edit menu' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'EditMenu'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuNew'     Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'UndoMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'Undo'        Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# Undo'      Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EditMenu'    Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'UndoMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'UndoMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'UndoMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -6228,49 +6276,49 @@
 'undo'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'RedoMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'Redo'        Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# Undo'      Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EditMenu'    Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'RedoMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'RedoMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'RedoMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -6278,30 +6326,30 @@
 'redo'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'createSeparator' Name
 '('           Punctuation
 'EditMenu'    Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'FindMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'Find'        Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# Find'      Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'FindMenuItem' Name
 '.'           Punctuation
 'add_accelerator' Name
@@ -6310,43 +6358,43 @@
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' \n                  ' Text
+' \n                  ' Text.Whitespace
 'KEY_f'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'CONTROL_MASK' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'ACCEL_VISIBLE' Name
 ')'           Punctuation
-' \n  '       Text
+' \n  '       Text.Whitespace
 'EditMenu'    Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'FindMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'FindMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'FindMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -6354,25 +6402,25 @@
 'find_Activate' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'ReplaceMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'Replace'     Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# Replace'   Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ReplaceMenuItem' Name
 '.'           Punctuation
 'add_accelerator' Name
@@ -6381,43 +6429,43 @@
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' \n                  ' Text
+' \n                  ' Text.Whitespace
 'KEY_h'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'CONTROL_MASK' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'ACCEL_VISIBLE' Name
 ')'           Punctuation
-' \n  '       Text
+' \n  '       Text.Whitespace
 'EditMenu'    Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'ReplaceMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'ReplaceMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'ReplaceMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -6425,54 +6473,54 @@
 'replace_Activate' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'createSeparator' Name
 '('           Punctuation
 'EditMenu'    Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'SettingsMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'Settings...' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# Settings'  Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EditMenu'    Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'SettingsMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'SettingsMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'SettingsMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -6480,68 +6528,68 @@
 'Settings_Activate' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'EditMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuItemNewWithMnemonic' Name
 '('           Punctuation
 '"'           Literal.String
 '_Edit'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'EditMenuItem' Name
 '.'           Punctuation
 'setSubMenu'  Name
 '('           Punctuation
 'EditMenu'    Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'EditMenuItem' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TopMenu'     Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'EditMenuItem' Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# View menu' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'ViewMenu'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuNew'     Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'viewBottomPanelMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'check_menu_item_new' Name
 '('           Punctuation
 '"'           Literal.String
 'Bottom Panel' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'PCheckMenuItem' Name
 '('           Punctuation
 'win'         Name
@@ -6551,14 +6599,14 @@
 '.'           Punctuation
 'itemSetActive' Name
 '('           Punctuation
-'\n         ' Text
+'\n         ' Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'bottomPanelVisible' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'viewBottomPanelMenuItem' Name
@@ -6569,19 +6617,19 @@
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' \n                  ' Text
+' \n                  ' Text.Whitespace
 'KEY_f9'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'CONTROL_MASK' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'ACCEL_VISIBLE' Name
 ')'           Punctuation
-' \n  '       Text
+' \n  '       Text.Whitespace
 'ViewMenu'    Name
 '.'           Punctuation
 'append'      Name
@@ -6590,28 +6638,28 @@
 '.'           Punctuation
 'viewBottomPanelMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'show'        Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'viewBottomPanelMenuItem' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'signal_connect' Name
 '('           Punctuation
 'win'         Name
 '.'           Punctuation
 'viewBottomPanelMenuItem' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'toggled'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                          ' Text
+' \n                          ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -6619,323 +6667,324 @@
 'viewBottomPanel_Toggled' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'ViewMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuItemNewWithMnemonic' Name
 '('           Punctuation
 '"'           Literal.String
 '_View'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'ViewMenuItem' Name
 '.'           Punctuation
 'setSubMenu'  Name
 '('           Punctuation
 'ViewMenu'    Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ViewMenuItem' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TopMenu'     Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'ViewMenuItem' Name
 ')'           Punctuation
-'       \n  \n  \n  ' Text
+'       \n  \n  \n  ' Text.Whitespace
 '# Tools menu' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'ToolsMenu'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuNew'     Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'createAccelMenuItem' Name
 '('           Punctuation
 'ToolsMenu'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Compile current file' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                      ' Text
+' \n                      ' Text.Whitespace
 'KEY_F4'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'aporia'      Name
 '.'           Punctuation
 'CompileCurrent_Activate' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'createAccelMenuItem' Name
 '('           Punctuation
 'ToolsMenu'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Compile & run current file' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                      ' Text
+' \n                      ' Text.Whitespace
 'KEY_F5'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'aporia'      Name
 '.'           Punctuation
 'CompileRunCurrent_Activate' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'createSeparator' Name
 '('           Punctuation
 'ToolsMenu'   Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'createAccelMenuItem' Name
 '('           Punctuation
 'ToolsMenu'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Compile project' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                      ' Text
+' \n                      ' Text.Whitespace
 'KEY_F8'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'aporia'      Name
 '.'           Punctuation
 'CompileProject_Activate' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'createAccelMenuItem' Name
 '('           Punctuation
 'ToolsMenu'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Compile & run project' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                      ' Text
+' \n                      ' Text.Whitespace
 'KEY_F9'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'aporia'      Name
 '.'           Punctuation
 'CompileRunProject_Activate' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'createSeparator' Name
 '('           Punctuation
 'ToolsMenu'   Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'createAccelMenuItem' Name
 '('           Punctuation
 'ToolsMenu'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Run custom command 1' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                      ' Text
+' \n                      ' Text.Whitespace
 'KEY_F1'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'aporia'      Name
 '.'           Punctuation
 'RunCustomCommand1' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'createAccelMenuItem' Name
 '('           Punctuation
 'ToolsMenu'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Run custom command 2' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                      ' Text
+' \n                      ' Text.Whitespace
 'KEY_F2'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'aporia'      Name
 '.'           Punctuation
 'RunCustomCommand2' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'createAccelMenuItem' Name
 '('           Punctuation
 'ToolsMenu'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'accGroup'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Run custom command 3' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                      ' Text
+' \n                      ' Text.Whitespace
 'KEY_F3'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'aporia'      Name
 '.'           Punctuation
 'RunCustomCommand3' Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'ToolsMenuItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'menuItemNewWithMnemonic' Name
 '('           Punctuation
 '"'           Literal.String
 '_Tools'      Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'ToolsMenuItem' Name
 '.'           Punctuation
 'setSubMenu'  Name
 '('           Punctuation
 'ToolsMenu'   Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'ToolsMenuItem' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TopMenu'     Name
 '.'           Punctuation
 'append'      Name
 '('           Punctuation
 'ToolsMenuItem' Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Help menu' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MainBox'     Name
 '.'           Punctuation
 'packStart'   Name
 '('           Punctuation
 'TopMenu'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TopMenu'     Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'initToolBar' Name.Function
 '('           Punctuation
 'MainBox'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PBox'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# TopBar(ToolBar)' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'TopBar'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'toolbarNew'  Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TopBar'      Name
 '.'           Punctuation
 'setStyle'    Name
 '('           Punctuation
 'TOOLBAR_ICONS' Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'NewFileItem' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TopBar'      Name
 '.'           Punctuation
 'insertStock' Name
 '('           Punctuation
 'STOCK_NEW'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'New File'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '"'           Literal.String
 'New File'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -6943,42 +6992,42 @@
 'newFile'     Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TopBar'      Name
 '.'           Punctuation
 'appendSpace' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'OpenItem'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TopBar'      Name
 '.'           Punctuation
 'insertStock' Name
 '('           Punctuation
 'STOCK_OPEN'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Open'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '"'           Literal.String
 'Open'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -6986,79 +7035,79 @@
 'openFile'    Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'SaveItem'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TopBar'      Name
 '.'           Punctuation
 'insertStock' Name
 '('           Punctuation
 'STOCK_SAVE'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Save'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '"'           Literal.String
 'Save'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'saveFile_Activate' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TopBar'      Name
 '.'           Punctuation
 'appendSpace' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'UndoItem'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TopBar'      Name
 '.'           Punctuation
 'insertStock' Name
 '('           Punctuation
 'STOCK_UNDO'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Undo'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n                      ' Text
+' \n                      ' Text.Whitespace
 '"'           Literal.String
 'Undo'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -7066,37 +7115,37 @@
 'undo'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'RedoItem'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'TopBar'      Name
 '.'           Punctuation
 'insertStock' Name
 '('           Punctuation
 'STOCK_REDO'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Redo'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-'\n                      ' Text
+'\n                      ' Text.Whitespace
 '"'           Literal.String
 'Redo'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -7104,91 +7153,92 @@
 'redo'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'MainBox'     Name
 '.'           Punctuation
 'packStart'   Name
 '('           Punctuation
 'TopBar'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TopBar'      Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'initSourceViewTabs' Name.Function
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'notebookNew' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#win.sourceViewTabs.dragDestSet(DEST_DEFAULT_DROP, nil, 0, ACTION_MOVE)' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
 '.'           Punctuation
 'signalConnect' Name
 '('           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 '"'           Literal.String
 'switch-page' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'onSwitchTab' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#discard win.SourceViewTabs.signalConnect(' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#        "drag-drop", SIGNAL_FUNC(svTabs_DragDrop), nil)' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#discard win.SourceViewTabs.signalConnect(' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#        "drag-data-received", SIGNAL_FUNC(svTabs_DragDataRecv), nil)' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#discard win.SourceViewTabs.signalConnect(' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#        "drag-motion", SIGNAL_FUNC(svTabs_DragMotion), nil)' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -7197,7 +7247,7 @@
 '('           Punctuation
 'True'        Keyword.Pseudo
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'SourceViewTabs' Name
@@ -7205,29 +7255,29 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'lastSession' Name
 '.'           Punctuation
 'len'         Name
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '..'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'len'         Name
 '('           Punctuation
 'lastSession' Name
@@ -7235,13 +7285,13 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ':'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'splitUp'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'lastSession' Name
 '['           Operator
 'i'           Name
@@ -7253,47 +7303,47 @@
 '|'           Literal.String.Char
 "'"           Literal.String.Char
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'filename'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'offset'      Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'splitUp'     Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'splitUp'     Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'addTab'      Name
 '('           Punctuation
 '"'           Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'filename'    Name
 ')'           Punctuation
-'\n      \n      ' Text
+'\n      \n      ' Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'iter'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TTextIter'   Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -7310,14 +7360,14 @@
 'iter'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'offset'      Name
 '.'           Punctuation
 'parseInt'    Name
 '('           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -7333,13 +7383,13 @@
 'insert'      Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'iter'        Name
 ')'           Punctuation
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -7355,17 +7405,17 @@
 'selection_bound' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'addr'        Keyword
 '('           Punctuation
 'iter'        Name
 ')'           Punctuation
 ')'           Punctuation
-'\n      \n      ' Text
+'\n      \n      ' Text.Whitespace
 '# TODO: Fix this..... :(' Comment
-'\n      '    Text
+'\n      '    Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'PTextView'   Name
 '('           Punctuation
 'win'         Name
@@ -7378,7 +7428,7 @@
 'sourceView'  Name
 ')'           Punctuation
 '.'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'scrollToIter' Name
 '('           Punctuation
 'addr'        Keyword
@@ -7386,37 +7436,37 @@
 'iter'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Float
 '.25'         Literal.Number.Float
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Float
 '.0'          Literal.Number.Float
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Float
 '.0'          Literal.Number.Float
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'addTab'      Name
 '('           Punctuation
 '"'           Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 "# This doesn't work :\\" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'Tabs'        Name
@@ -7429,34 +7479,35 @@
 'grabFocus'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n  \n'    Text
+'\n\n  \n'    Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'initBottomTabs' Name.Function
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomPanelTabs' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'notebookNew' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'bottomPanelVisible' Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomPanelTabs' Name
@@ -7464,38 +7515,38 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# output tab' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'tabLabel'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'labelNew'    Name
 '('           Punctuation
 '"'           Literal.String
 'Output'      Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'outputTab'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'vboxNew'     Name
 '('           Punctuation
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomPanelTabs' Name
@@ -7504,68 +7555,68 @@
 '('           Punctuation
 'outputTab'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'tabLabel'    Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Compiler tabs, gtktextview' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'outputScrolledWindow' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'scrolledwindowNew' Name
 '('           Punctuation
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'outputScrolledWindow' Name
 '.'           Punctuation
 'setPolicy'   Name
 '('           Punctuation
 'POLICY_AUTOMATIC' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'POLICY_AUTOMATIC' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'outputTab'   Name
 '.'           Punctuation
 'packStart'   Name
 '('           Punctuation
 'outputScrolledWindow' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'outputScrolledWindow' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'textviewNew' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'outputScrolledWindow' Name
 '.'           Punctuation
 'add'         Name
@@ -7574,7 +7625,7 @@
 '.'           Punctuation
 'outputTextView' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'outputTextView' Name
@@ -7582,47 +7633,48 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'outputTab'   Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'initTAndBP'  Name.Function
 '('           Punctuation
 'MainBox'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PBox'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 "# This init's the HPaned, which splits the sourceViewTabs" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# and the BottomPanelTabs' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'initSourceViewTabs' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'initBottomTabs' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'TAndBPVPaned' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'vpanedNew'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'tandbpVPaned' Name
 '.'           Punctuation
 'pack1'       Name
@@ -7631,17 +7683,17 @@
 '.'           Punctuation
 'sourceViewTabs' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'resize'      Name
 '='           Operator
 'True'        Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shrink'      Name
 '='           Operator
 'False'       Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'tandbpVPaned' Name
 '.'           Punctuation
 'pack2'       Name
@@ -7650,33 +7702,33 @@
 '.'           Punctuation
 'bottomPanelTabs' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'resize'      Name
 '='           Operator
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shrink'      Name
 '='           Operator
 'False'       Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MainBox'     Name
 '.'           Punctuation
 'packStart'   Name
 '('           Punctuation
 'TAndBPVPaned' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'True'        Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'tandbpVPaned' Name
 '.'           Punctuation
 'setPosition' Name
@@ -7687,41 +7739,42 @@
 '.'           Punctuation
 'VPanedPos'   Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TAndBPVPaned' Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'initFindBar' Name.Function
 '('           Punctuation
 'MainBox'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PBox'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Create a fixed container' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'HBoxNew'     Name
 '('           Punctuation
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -7730,22 +7783,22 @@
 '('           Punctuation
 '4'           Literal.Number.Integer
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 "# Add a Label 'Find'" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'findLabel'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'labelNew'    Name
 '('           Punctuation
 '"'           Literal.String
 'Find:'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -7754,34 +7807,34 @@
 '('           Punctuation
 'findLabel'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'findLabel'   Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Add a (find) text entry' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findEntry'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'entryNew'    Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -7792,18 +7845,18 @@
 '.'           Punctuation
 'findEntry'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findEntry'   Name
@@ -7814,19 +7867,19 @@
 'activate'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
-'\n                                      ' Text
+'\n                                      ' Text.Whitespace
 'aporia'      Name
 '.'           Punctuation
 'nextBtn_Clicked' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findEntry'   Name
@@ -7834,14 +7887,14 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'rq'          Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TRequisition' Name
-' \n  '       Text
+' \n  '       Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findEntry'   Name
@@ -7853,9 +7906,9 @@
 'rq'          Name
 ')'           Punctuation
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Make the (find) text entry longer' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findEntry'   Name
@@ -7864,29 +7917,29 @@
 '('           Punctuation
 '190'         Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'rq'          Name
 '.'           Punctuation
 'height'      Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 "# Add a Label 'Replace' " Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 "# - This Is only shown, when the 'Search & Replace'(CTRL + H) is shown" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceLabel' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'labelNew'    Name
 '('           Punctuation
 '"'           Literal.String
 'Replace:'    Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -7897,32 +7950,32 @@
 '.'           Punctuation
 'replaceLabel' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#replaceLabel.show()' Comment
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Add a (replace) text entry ' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 "# - This Is only shown, when the 'Search & Replace'(CTRL + H) is shown" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceEntry' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'entryNew'    Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -7933,25 +7986,25 @@
 '.'           Punctuation
 'replaceEntry' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#win.replaceEntry.show()' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'rq1'         Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TRequisition' Name
-' \n  '       Text
+' \n  '       Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceEntry' Name
@@ -7963,9 +8016,9 @@
 'rq1'         Name
 ')'           Punctuation
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Make the (replace) text entry longer' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceEntry' Name
@@ -7974,27 +8027,27 @@
 '('           Punctuation
 '100'         Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'rq1'         Name
 '.'           Punctuation
 'height'      Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Find next button' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'nextBtn'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'buttonNew'   Name
 '('           Punctuation
 '"'           Literal.String
 'Next'        Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -8003,18 +8056,18 @@
 '('           Punctuation
 'nextBtn'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'nextBtn'     Name
 '.'           Punctuation
 'signalConnect' Name
@@ -8023,7 +8076,7 @@
 'clicked'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n             ' Text
+' \n             ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -8031,23 +8084,23 @@
 'nextBtn_Clicked' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'nextBtn'     Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'nxtBtnRq'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TRequisition' Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'nextBtn'     Name
 '.'           Punctuation
 'sizeRequest' Name
@@ -8057,22 +8110,22 @@
 'nxtBtnRq'    Name
 ')'           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Find previous button' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'prevBtn'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'buttonNew'   Name
 '('           Punctuation
 '"'           Literal.String
 'Previous'    Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -8081,18 +8134,18 @@
 '('           Punctuation
 'prevBtn'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'prevBtn'     Name
 '.'           Punctuation
 'signalConnect' Name
@@ -8101,7 +8154,7 @@
 'clicked'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n             ' Text
+' \n             ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -8109,33 +8162,33 @@
 'prevBtn_Clicked' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'prevBtn'     Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Replace button' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 "# - This Is only shown, when the 'Search & Replace'(CTRL + H) is shown" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceBtn'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'buttonNew'   Name
 '('           Punctuation
 '"'           Literal.String
 'Replace'     Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -8146,18 +8199,18 @@
 '.'           Punctuation
 'replaceBtn'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceBtn'  Name
@@ -8168,7 +8221,7 @@
 'clicked'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n             ' Text
+' \n             ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -8176,29 +8229,29 @@
 'replaceBtn_Clicked' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#replaceBtn.show()' Comment
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Replace all button' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 "# - this Is only shown, when the 'Search & Replace'(CTRL + H) is shown" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceAllBtn' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'buttonNew'   Name
 '('           Punctuation
 '"'           Literal.String
 'Replace All' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -8209,18 +8262,18 @@
 '.'           Punctuation
 'replaceAllBtn' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'replaceAllBtn' Name
@@ -8231,7 +8284,7 @@
 'clicked'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n             ' Text
+' \n             ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -8239,82 +8292,82 @@
 'replaceAllBtn_Clicked' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#replaceAllBtn.show()' Comment
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Right side ...' Comment
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Close button - With a close stock image' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'closeBtn'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'buttonNew'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'closeImage'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'imageNewFromStock' Name
 '('           Punctuation
 'STOCK_CLOSE' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'ICON_SIZE_SMALL_TOOLBAR' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'closeBox'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'hboxNew'     Name
 '('           Punctuation
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'closeBtn'    Name
 '.'           Punctuation
 'add'         Name
 '('           Punctuation
 'closeBox'    Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'closeBox'    Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'closeBox'    Name
 '.'           Punctuation
 'add'         Name
 '('           Punctuation
 'closeImage'  Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'closeImage'  Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'closeBtn'    Name
 '.'           Punctuation
 'signalConnect' Name
@@ -8323,7 +8376,7 @@
 'clicked'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n             ' Text
+' \n             ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -8331,10 +8384,10 @@
 'closeBtn_Clicked' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -8343,90 +8396,90 @@
 '('           Punctuation
 'closeBtn'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'closeBtn'    Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 "# Extra button - When clicked shows a menu with options like 'Use regex'" Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'extraBtn'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'buttonNew'   Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'extraImage'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'imageNewFromStock' Name
 '('           Punctuation
 'STOCK_PROPERTIES' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'ICON_SIZE_SMALL_TOOLBAR' Name
 ')'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'extraBox'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'hboxNew'     Name
 '('           Punctuation
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraBtn'    Name
 '.'           Punctuation
 'add'         Name
 '('           Punctuation
 'extraBox'    Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraBox'    Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraBox'    Name
 '.'           Punctuation
 'add'         Name
 '('           Punctuation
 'extraImage'  Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraImage'  Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'extraBtn'    Name
 '.'           Punctuation
 'signalConnect' Name
@@ -8435,7 +8488,7 @@
 'clicked'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n             ' Text
+' \n             ' Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -8443,10 +8496,10 @@
 'extraBtn_Clicked' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -8455,22 +8508,22 @@
 '('           Punctuation
 'extraBtn'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'extraBtn'    Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'MainBox'     Name
 '.'           Punctuation
 'packStart'   Name
@@ -8479,16 +8532,16 @@
 '.'           Punctuation
 'findBar'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'findBar'     Name
@@ -8496,29 +8549,30 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'initStatusBar' Name.Function
 '('           Punctuation
 'MainBox'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'PBox'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomBar'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'statusbarNew' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'MainBox'     Name
 '.'           Punctuation
 'packStart'   Name
@@ -8527,16 +8581,16 @@
 '.'           Punctuation
 'bottomBar'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomBar'   Name
@@ -8544,9 +8598,9 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'bottomBar'   Name
@@ -8555,49 +8609,50 @@
 '('           Punctuation
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Line: 0 Column: 0' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  \n'      Text
+'\n  \n'      Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'initControls' Name.Function
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Load up the language style' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'langMan'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'languageManagerGetDefault' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'langpaths'   Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'array'       Name.Builtin
 '['           Operator
 '0'           Literal.Number.Float
 '..'          Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'cstring'     Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' \n          ' Text
+' \n          ' Text.Whitespace
 '['           Operator
 'cstring'     Name
 '('           Punctuation
@@ -8606,16 +8661,16 @@
 'getApplicationDir' Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 'langSpecs'   Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ']'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'langMan'     Name
@@ -8627,13 +8682,13 @@
 'langpaths'   Name
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'nimLang'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'langMan'     Name
@@ -8644,44 +8699,44 @@
 'nimrod'      Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'nimLang'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nimLang'     Name
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Load the scheme' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'schemeMan'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'schemeManagerGetDefault' Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'schemepaths' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'array'       Name.Builtin
 '['           Operator
 '0'           Literal.Number.Float
 '..'          Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'cstring'     Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 '['           Operator
 'cstring'     Name
 '('           Punctuation
@@ -8690,16 +8745,16 @@
 'getApplicationDir' Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 'styles'      Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ']'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'schemeMan'   Name
 '.'           Punctuation
 'setSearchPath' Name
@@ -8709,13 +8764,13 @@
 'schemepaths' Name
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'scheme'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'schemeMan'   Name
 '.'           Punctuation
 'getScheme'   Name
@@ -8726,22 +8781,22 @@
 '.'           Punctuation
 'colorSchemeID' Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# Window'    Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'windowNew'   Name
 '('           Punctuation
 'gtk2'        Name
 '.'           Punctuation
 'WINDOW_TOPLEVEL' Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -8754,14 +8809,14 @@
 '.'           Punctuation
 'winWidth'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'winHeight'   Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -8772,16 +8827,16 @@
 'Aporia IDE'  Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'settings'    Name
 '.'           Punctuation
 'winMaximized' Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -8789,7 +8844,7 @@
 'maximize'    Name
 '('           Punctuation
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -8797,15 +8852,15 @@
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# The window has to be shown before' Comment
-'\n               ' Text
+'\n               ' Text.Whitespace
 '# setting the position of the VPaned so that' Comment
-'\n               ' Text
+'\n               ' Text.Whitespace
 '# it gets set correctly, when the window is maximized.' Comment
-'\n    \n  '  Text
+'\n    \n  '  Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -8816,7 +8871,7 @@
 'destroy'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -8824,12 +8879,12 @@
 'destroy'     Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -8840,7 +8895,7 @@
 'delete_event' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n    '     Text
+' \n    '     Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -8848,12 +8903,12 @@
 'delete_event' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'discard'     Keyword
-' '           Text
+' '           Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -8864,7 +8919,7 @@
 'window-state-event' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' \n    '     Text
+' \n    '     Text.Whitespace
 'SIGNAL_FUNC' Name
 '('           Punctuation
 'aporia'      Name
@@ -8872,26 +8927,26 @@
 'windowState_Changed' Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 '# MainBox (vbox)' Comment
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'MainBox'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'vboxNew'     Name
 '('           Punctuation
 'False'       Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'win'         Name
 '.'           Punctuation
 'w'           Name
@@ -8900,43 +8955,43 @@
 '('           Punctuation
 'MainBox'     Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'initTopMenu' Name
 '('           Punctuation
 'MainBox'     Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'initToolBar' Name
 '('           Punctuation
 'MainBox'     Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'initTAndBP'  Name
 '('           Punctuation
 'MainBox'     Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'initFindBar' Name
 '('           Punctuation
 'MainBox'     Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'initStatusBar' Name
 '('           Punctuation
 'MainBox'     Name
 ')'           Punctuation
-'\n  \n  '    Text
+'\n  \n  '    Text.Whitespace
 'MainBox'     Name
 '.'           Punctuation
 'show'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'confParseFail' Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'dialogs'     Name
 '.'           Punctuation
 'warning'     Name
@@ -8945,24 +9000,24 @@
 '.'           Punctuation
 'w'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Error parsing config file, using default settings.' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n \n'       Text
+'\n \n'       Text.Whitespace
 
 'nimrod_init' Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'initControls' Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'main'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/nim/test.nim b/tests/examplefiles/nim/test.nim
index fb23ce106b..20610bb691 100644
--- a/tests/examplefiles/nim/test.nim
+++ b/tests/examplefiles/nim/test.nim
@@ -5,14 +5,14 @@ for x in lines("myfile.txt"):
     echo "Key: ", matches[0],
          " Value: ", matches[1]
 
-echo("What's your name? ")
+Echo("What's your name? ")
 var name: string = readLine(stdin)
 if name == "":
   echo("Poor soul, you lost your name?")
 elif name == "name":
   echo("Very funny, your name is name.")
 else:
-  echo("Hi, ", name, "!")
+  Echo("Hi, ", name, "!")
 
 var name = readLine(stdin)
 case name
@@ -21,29 +21,29 @@ of "":
 of "name":
   echo("Very funny, your name is name.")
 else:
-  echo("Hi, ", name, "!")
+  Echo("Hi, ", name, "!")
 
 from strutils import parseInt
 
-echo("A number please: ")
+Echo("A number please: ")
 var n = parseInt(readLine(stdin))
 case n
-of 0..2, 4..7: echo("The number is in the set: {0, 1, 2, 4, 5, 6, 7}")
-of 3, 8: echo("The number is 3 or 8")
+of 0..2, 4..7: Echo("The number is in the set: {0, 1, 2, 4, 5, 6, 7}")
+of 3, 8: Echo("The number is 3 or 8")
 
-echo("Counting to 10: ")
+Echo("Counting to 10: ")
 var i = 1
 while i <= 10:
-  echo($i)
+  Echo($i)
   inc(i)
 
 proc yes(question: string): bool =
-  echo(question, " (y/n)")
+  Echo(question, " (y/n)")
   while true:
     case readLine(stdin)
     of "y", "Y", "yes", "Yes": return true
     of "n", "N", "no", "No": return false
-    else: echo("Please be clear: yes or no")
+    else: Echo("Please be clear: yes or no")
 
 proc even(n: int): bool
 
@@ -90,13 +90,4 @@ if open(f, "numbers.txt"):
     # reraise the unknown exception:
     raise
   finally:
-    close(f)
-
-
-let
-  aaa: string = "aaa"
-  bbb: int = 3
-  ccc: seq[char] = @['a', 'b']
-  ddd: float32 = 43.21
-  eee: bool = true
-
+    close(f)
\ No newline at end of file
diff --git a/tests/examplefiles/nim/test.nim.output b/tests/examplefiles/nim/test.nim.output
index 6865196fa1..4f9ec79349 100644
--- a/tests/examplefiles/nim/test.nim.output
+++ b/tests/examplefiles/nim/test.nim.output
@@ -1,14 +1,14 @@
 'import'      Keyword.Namespace
-' '           Text
+' '           Text.Whitespace
 're'          Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'lines'       Name
 '('           Punctuation
 '"'           Literal.String
@@ -16,46 +16,46 @@
 '"'           Literal.String
 ')'           Punctuation
 ':'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 're"'         Literal.String
 '('           Literal.String
 '\\'          Literal.String
 'w+)=(.*)'    Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'echo'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Key: '       Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'matches'     Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n         ' Text
+'\n         ' Text.Whitespace
 '"'           Literal.String
 ' Value: '    Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'matches'     Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'echo'        Name
+'Echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'What'        Literal.String
@@ -63,169 +63,169 @@
 's your name? ' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'name'        Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'readLine'    Name
 '('           Punctuation
 'stdin'       Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'Poor soul, you lost your name?' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elif'        Keyword
-' '           Text
+' '           Text.Whitespace
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'name'        Literal.String
 '"'           Literal.String
 ':'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'Very funny, your name is name.' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else'        Keyword
 ':'           Punctuation
-'\n  '        Text
-'echo'        Name
+'\n  '        Text.Whitespace
+'Echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'Hi, '        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'name'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '!'           Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'readLine'    Name
 '('           Punctuation
 'stdin'       Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'name'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of'          Keyword
-' '           Text
-'"'           Literal.String
-'"'           Literal.String
-':'           Punctuation
-'\n  '        Text
+' '           Text.Whitespace
+'"'           Name.Label
+'"'           Name.Label
+':'           Operator
+'\n  '        Text.Whitespace
 'echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'Poor soul, you lost your name?' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of'          Keyword
-' '           Text
-'"'           Literal.String
-'name'        Literal.String
-'"'           Literal.String
-':'           Punctuation
-'\n  '        Text
+' '           Text.Whitespace
+'"'           Name.Label
+'name'        Name.Label
+'"'           Name.Label
+':'           Operator
+'\n  '        Text.Whitespace
 'echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'Very funny, your name is name.' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else'        Keyword
 ':'           Punctuation
-'\n  '        Text
-'echo'        Name
+'\n  '        Text.Whitespace
+'Echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'Hi, '        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'name'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '!'           Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'from'        Keyword.Namespace
-' '           Text
+' '           Text.Whitespace
 'strutils'    Name
-' '           Text
+' '           Text.Whitespace
 'import'      Keyword.Namespace
-' '           Text
+' '           Text.Whitespace
 'parseInt'    Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'echo'        Name
+'Echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'A number please: ' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'parseInt'    Name
 '('           Punctuation
 'readLine'    Name
@@ -233,356 +233,361 @@
 'stdin'       Name
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of'          Keyword
-' '           Text
-'0'           Literal.Number.Float
-'..'          Punctuation
-'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'0'           Name.Label
+'.'           Name.Label
+'.'           Name.Label
+'2'           Name.Label
 ','           Punctuation
-' '           Text
-'4'           Literal.Number.Float
-'..'          Punctuation
-'7'           Literal.Number.Integer
-':'           Punctuation
-' '           Text
-'echo'        Name
+' '           Text.Whitespace
+'4'           Name.Label
+'.'           Name.Label
+'.'           Name.Label
+'7'           Name.Label
+':'           Operator
+' '           Text.Whitespace
+'Echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'The number is in the set: {0, 1, 2, 4, 5, 6, 7}' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of'          Keyword
-' '           Text
-'3'           Literal.Number.Integer
+' '           Text.Whitespace
+'3'           Name.Label
 ','           Punctuation
-' '           Text
-'8'           Literal.Number.Integer
-':'           Punctuation
-' '           Text
-'echo'        Name
+' '           Text.Whitespace
+'8'           Name.Label
+':'           Operator
+' '           Text.Whitespace
+'Echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'The number is 3 or 8' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'echo'        Name
+'Echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'Counting to 10: ' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number.Integer
 ':'           Punctuation
-'\n  '        Text
-'echo'        Name
+'\n  '        Text.Whitespace
+'Echo'        Name
 '('           Punctuation
 '$'           Operator
 'i'           Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'inc'         Name
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'yes'         Name.Function
 '('           Punctuation
 'question'    Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'bool'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
-'echo'        Name
+'\n  '        Text.Whitespace
+'Echo'        Name
 '('           Punctuation
 'question'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' (y/n)'      Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'readLine'    Name
 '('           Punctuation
 'stdin'       Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'of'          Keyword
-' '           Text
-'"'           Literal.String
-'y'           Literal.String
-'"'           Literal.String
+' '           Text.Whitespace
+'"'           Name.Label
+'y'           Name.Label
+'"'           Name.Label
 ','           Punctuation
-' '           Text
-'"'           Literal.String
-'Y'           Literal.String
-'"'           Literal.String
+' '           Text.Whitespace
+'"'           Name.Label
+'Y'           Name.Label
+'"'           Name.Label
 ','           Punctuation
-' '           Text
-'"'           Literal.String
-'yes'         Literal.String
-'"'           Literal.String
+' '           Text.Whitespace
+'"'           Name.Label
+'yes'         Name.Label
+'"'           Name.Label
 ','           Punctuation
-' '           Text
-'"'           Literal.String
-'Yes'         Literal.String
-'"'           Literal.String
-':'           Punctuation
-' '           Text
+' '           Text.Whitespace
+'"'           Name.Label
+'Yes'         Name.Label
+'"'           Name.Label
+':'           Operator
+' '           Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'of'          Keyword
-' '           Text
-'"'           Literal.String
-'n'           Literal.String
-'"'           Literal.String
+' '           Text.Whitespace
+'"'           Name.Label
+'n'           Name.Label
+'"'           Name.Label
 ','           Punctuation
-' '           Text
-'"'           Literal.String
-'N'           Literal.String
-'"'           Literal.String
+' '           Text.Whitespace
+'"'           Name.Label
+'N'           Name.Label
+'"'           Name.Label
 ','           Punctuation
-' '           Text
-'"'           Literal.String
-'no'          Literal.String
-'"'           Literal.String
+' '           Text.Whitespace
+'"'           Name.Label
+'no'          Name.Label
+'"'           Name.Label
 ','           Punctuation
-' '           Text
-'"'           Literal.String
-'No'          Literal.String
-'"'           Literal.String
-':'           Punctuation
-' '           Text
+' '           Text.Whitespace
+'"'           Name.Label
+'No'          Name.Label
+'"'           Name.Label
+':'           Operator
+' '           Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-' '           Text
-'echo'        Name
+' '           Text.Whitespace
+'Echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'Please be clear: yes or no' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'even'        Name.Function
 '('           Punctuation
 'n'           Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'int'         Name.Builtin
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'bool'        Name.Builtin
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
-'proc '       Keyword
+'proc'        Keyword
+' '           Text.Whitespace
 'odd'         Name.Function
 '('           Punctuation
 'n'           Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'int'         Name.Builtin
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'bool'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n  '        Text
+'\n  '        Text.Whitespace
 'else'        Keyword
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'even'        Name
 '('           Punctuation
 'n'           Name
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'iterator'    Keyword
-' '           Text
+' '           Text.Whitespace
 'countup'     Name
 '('           Punctuation
 'a'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'int'         Name.Builtin
 ')'           Punctuation
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'int'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'res'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'res'         Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'yield'       Keyword
-' '           Text
+' '           Text.Whitespace
 'res'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'inc'         Name
 '('           Punctuation
 'res'         Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'type'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'TPerson'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'object'      Keyword
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'TObject'     Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'name'        Name
 '*'           Operator
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Builtin
-'  '          Text
+'  '          Text.Whitespace
 '# the * means that `name` is accessible from other modules' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'age'         Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'int'         Name.Builtin
-'       '     Text
+'       '     Text.Whitespace
 '# no * means that the field is hidden from other modules' Comment
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'TStudent'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'object'      Keyword
-' '           Text
+' '           Text.Whitespace
 'of'          Keyword
-' '           Text
+' '           Text.Whitespace
 'TPerson'     Name
-' '           Text
+' '           Text.Whitespace
 '# TStudent inherits from TPerson' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'id'          Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'int'         Name.Builtin
-'                    ' Text
+'                    ' Text.Whitespace
 '# with an id field' Comment
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'var'         Keyword.Declaration
-'\n  '        Text
+'\n  '        Text.Whitespace
 'student'     Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TStudent'    Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'person'      Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TPerson'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Name
 '('           Punctuation
 'student'     Name
-' '           Text
+' '           Text.Whitespace
 'is'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'TStudent'    Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'echo'        Name
 '('           Punctuation
@@ -591,12 +596,12 @@
 'a'           Literal.String.Char
 "'"           Literal.String.Char
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Char
 'b'           Literal.String.Char
 "'"           Literal.String.Char
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Char
 'c'           Literal.String.Char
 "'"           Literal.String.Char
@@ -604,7 +609,7 @@
 '.'           Punctuation
 'card'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'stdout'      Name
 '.'           Punctuation
@@ -614,197 +619,133 @@
 'Hallo'       Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Keyword.Declaration
-'\n  '        Text
+'\n  '        Text.Whitespace
 'f'           Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'TFile'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'open'        Name
 '('           Punctuation
 'f'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'numbers.txt' Literal.String
 '"'           Literal.String
 ')'           Punctuation
 ':'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'try'         Keyword
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'readLine'    Name
 '('           Punctuation
 'f'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'var'         Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'readLine'    Name
 '('           Punctuation
 'f'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'sum: '       Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Operator
 '('           Punctuation
 'parseInt'    Name
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'parseInt'    Name
 '('           Punctuation
 'b'           Name
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'except'      Keyword
-' '           Text
+' '           Text.Whitespace
 'EOverflow'   Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'overflow!'   Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'except'      Keyword
-' '           Text
+' '           Text.Whitespace
 'EInvalidValue' Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'could not convert string to integer' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'except'      Keyword
-' '           Text
+' '           Text.Whitespace
 'EIO'         Name
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'IO error!'   Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'except'      Keyword
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'echo'        Name
 '('           Punctuation
 '"'           Literal.String
 'Unknown exception!' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# reraise the unknown exception:' Comment
-'\n    '      Text
+'\n    '      Text.Whitespace
 'raise'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'finally'     Keyword
 ':'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'close'       Name
 '('           Punctuation
 'f'           Name
 ')'           Punctuation
-'\n\n\n'      Text
-
-'let'         Keyword
-'\n  '        Text
-'aaa'         Name
-':'           Punctuation
-' '           Text
-'string'      Name.Builtin
-' '           Text
-'='           Operator
-' '           Text
-'"'           Literal.String
-'aaa'         Literal.String
-'"'           Literal.String
-'\n  '        Text
-'bbb'         Name
-':'           Punctuation
-' '           Text
-'int'         Name.Builtin
-' '           Text
-'='           Operator
-' '           Text
-'3'           Literal.Number.Integer
-'\n  '        Text
-'ccc'         Name
-':'           Punctuation
-' '           Text
-'seq'         Name.Builtin
-'['           Operator
-'char'        Name.Builtin
-']'           Operator
-' '           Text
-'='           Operator
-' '           Text
-'@'           Operator
-'['           Operator
-"'"           Literal.String.Char
-'a'           Literal.String.Char
-"'"           Literal.String.Char
-','           Punctuation
-' '           Text
-"'"           Literal.String.Char
-'b'           Literal.String.Char
-"'"           Literal.String.Char
-']'           Operator
-'\n  '        Text
-'ddd'         Name
-':'           Punctuation
-' '           Text
-'float32'     Name.Builtin
-' '           Text
-'='           Operator
-' '           Text
-'43'          Literal.Number.Float
-'.21'         Literal.Number.Float
-'\n  '        Text
-'eee'         Name
-':'           Punctuation
-' '           Text
-'bool'        Name.Builtin
-' '           Text
-'='           Operator
-' '           Text
-'true'        Keyword.Pseudo
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/nixos/example.nix b/tests/examplefiles/nixos/example.nix
index 515b686f2f..388b14d1bd 100644
--- a/tests/examplefiles/nixos/example.nix
+++ b/tests/examplefiles/nixos/example.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   # escape example
   postInstall = ''
-    mv $out/sbin $out/bin ''' ''${
+    mv $out/sbin 'foo' $out/bin ''' ''${
    ${ if true then ${ "" } else false }
   '';
 
diff --git a/tests/examplefiles/nixos/example.nix.output b/tests/examplefiles/nixos/example.nix.output
index b6fb1898e3..f777699b47 100644
--- a/tests/examplefiles/nixos/example.nix.output
+++ b/tests/examplefiles/nixos/example.nix.output
@@ -1086,86 +1086,14 @@
 'preConfigure =' Literal.String.Symbol
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Literal.String.Single
-
-' '           Literal.String.Single
-' '           Literal.String.Single
-' '           Literal.String.Single
-' '           Literal.String.Single
-'e'           Literal.String.Single
-'x'           Literal.String.Single
-'p'           Literal.String.Single
-'o'           Literal.String.Single
-'r'           Literal.String.Single
-'t'           Literal.String.Single
-' '           Literal.String.Single
-'N'           Literal.String.Single
-'I'           Literal.String.Single
-'X'           Literal.String.Single
-'_'           Literal.String.Single
-'C'           Literal.String.Single
-'F'           Literal.String.Single
-'L'           Literal.String.Single
-'A'           Literal.String.Single
-'G'           Literal.String.Single
-'S'           Literal.String.Single
-'_'           Literal.String.Single
-'C'           Literal.String.Single
-'O'           Literal.String.Single
-'M'           Literal.String.Single
-'P'           Literal.String.Single
-'I'           Literal.String.Single
-'L'           Literal.String.Single
-'E'           Literal.String.Single
-'='           Literal.String.Single
-'"'           Literal.String.Single
+'\n    export NIX_CFLAGS_COMPILE="' Literal.String.Single
 '$'           Literal.String.Single
-'N'           Literal.String.Single
-'I'           Literal.String.Single
-'X'           Literal.String.Single
-'_'           Literal.String.Single
-'C'           Literal.String.Single
-'F'           Literal.String.Single
-'L'           Literal.String.Single
-'A'           Literal.String.Single
-'G'           Literal.String.Single
-'S'           Literal.String.Single
-'_'           Literal.String.Single
-'C'           Literal.String.Single
-'O'           Literal.String.Single
-'M'           Literal.String.Single
-'P'           Literal.String.Single
-'I'           Literal.String.Single
-'L'           Literal.String.Single
-'E'           Literal.String.Single
-' '           Literal.String.Single
-'-'           Literal.String.Single
-'I'           Literal.String.Single
+'NIX_CFLAGS_COMPILE -I' Literal.String.Single
 '${'          Literal.String.Interpol
 'libxml2'     Text
 ' '           Text
 '}'           Literal.String.Interpol
-'/'           Literal.String.Single
-'i'           Literal.String.Single
-'n'           Literal.String.Single
-'c'           Literal.String.Single
-'l'           Literal.String.Single
-'u'           Literal.String.Single
-'d'           Literal.String.Single
-'e'           Literal.String.Single
-'/'           Literal.String.Single
-'l'           Literal.String.Single
-'i'           Literal.String.Single
-'b'           Literal.String.Single
-'x'           Literal.String.Single
-'m'           Literal.String.Single
-'l'           Literal.String.Single
-'2'           Literal.String.Single
-'"'           Literal.String.Single
-'\n'          Literal.String.Single
-
-' '           Literal.String.Single
-' '           Literal.String.Single
+'/include/libxml2"\n  ' Literal.String.Single
 "''"          Literal.String.Single
 ';'           Punctuation
 '\n\n  '      Text
@@ -1174,42 +1102,19 @@
 'postInstall =' Literal.String.Symbol
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Literal.String.Single
-
-' '           Literal.String.Single
-' '           Literal.String.Single
-' '           Literal.String.Single
-' '           Literal.String.Single
-'m'           Literal.String.Single
-'v'           Literal.String.Single
-' '           Literal.String.Single
+'\n    mv '   Literal.String.Single
 '$'           Literal.String.Single
-'o'           Literal.String.Single
-'u'           Literal.String.Single
-'t'           Literal.String.Single
-'/'           Literal.String.Single
-'s'           Literal.String.Single
-'b'           Literal.String.Single
-'i'           Literal.String.Single
-'n'           Literal.String.Single
+'out/sbin '   Literal.String.Single
+"'"           Literal.String.Single
+'foo'         Literal.String.Single
+"'"           Literal.String.Single
 ' '           Literal.String.Single
 '$'           Literal.String.Single
-'o'           Literal.String.Single
-'u'           Literal.String.Single
-'t'           Literal.String.Single
-'/'           Literal.String.Single
-'b'           Literal.String.Single
-'i'           Literal.String.Single
-'n'           Literal.String.Single
-' '           Literal.String.Single
+'out/bin '    Literal.String.Single
 "'''"         Literal.String.Escape
 ' '           Literal.String.Single
 "''${"        Literal.String.Escape
-'\n'          Literal.String.Single
-
-' '           Literal.String.Single
-' '           Literal.String.Single
-' '           Literal.String.Single
+'\n   '       Literal.String.Single
 '${'          Literal.String.Interpol
 ' '           Text
 'if'          Keyword
@@ -1230,10 +1135,7 @@
 'false'       Name.Constant
 ' '           Text
 '}'           Literal.String.Interpol
-'\n'          Literal.String.Single
-
-' '           Literal.String.Single
-' '           Literal.String.Single
+'\n  '        Literal.String.Single
 "''"          Literal.String.Single
 ';'           Punctuation
 '\n\n  '      Text
diff --git a/tests/examplefiles/notmuch/notmuch_example.output b/tests/examplefiles/notmuch/notmuch_example.output
index ae858b8675..fc72cd5660 100644
--- a/tests/examplefiles/notmuch/notmuch_example.output
+++ b/tests/examplefiles/notmuch/notmuch_example.output
@@ -38,12 +38,12 @@
 
 '#!/bin/sh\n' Comment.Hashbang
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'Hello world!'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\x0cpart}\n' Keyword
 
diff --git a/tests/examplefiles/nt/test.nt.output b/tests/examplefiles/nt/test.nt.output
index def63a3653..310054cb20 100644
--- a/tests/examplefiles/nt/test.nt.output
+++ b/tests/examplefiles/nt/test.nt.output
@@ -1,46 +1,46 @@
 '# comment'   Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '# indented comment' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text.Whitespace
 
 'dict'        Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'key1'        Name
 ':'           Punctuation
 ' '           Text.Whitespace
 'dict-like: value' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'key2'        Name
 ':'           Punctuation
 ' '           Text.Whitespace
 '- list-like value' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'key3'        Name
 ':'           Punctuation
 ' '           Text.Whitespace
 '> str-like value' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'key4'        Name
 ':'           Punctuation
 ' '           Text.Whitespace
 'no trailing whitespace' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'key5'        Name
@@ -48,21 +48,21 @@
 ' '           Text.Whitespace
 'trailing whitespace' Literal.String
 '    '        Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 "'"           Punctuation
 'key: single-quoted' Name
 "': "         Punctuation
 'value'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '"'           Punctuation
 'key: double-quoted' Name
 '": '         Punctuation
 'value'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'empty'       Name
@@ -73,31 +73,31 @@
 
 'list'        Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '-'           Punctuation
 ' '           Text.Whitespace
 'dict-like: value' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '-'           Punctuation
 ' '           Text.Whitespace
 '- list-like value' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '-'           Punctuation
 ' '           Text.Whitespace
 '> str-like value' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '-'           Punctuation
 ' '           Text.Whitespace
 'no trailing whitespace' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '-'           Punctuation
@@ -109,7 +109,7 @@
 
 'empty list'  Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '-'           Punctuation
@@ -119,38 +119,38 @@
 
 'string'      Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '>'           Punctuation
 ' '           Text.Whitespace
 'dict-like: value' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '>'           Punctuation
 ' '           Text.Whitespace
 '- list-like value' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '>'           Punctuation
 ' '           Text.Whitespace
 '> str-like value' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '>'           Punctuation
 ' '           Text.Whitespace
 'no trailing whitespace' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '>'           Punctuation
 ' '           Text.Whitespace
 'trailing whitespace' Literal.String
 '    '        Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '>'           Punctuation
diff --git a/tests/examplefiles/objdump-nasm/no-show-raw-isns.dump.output b/tests/examplefiles/objdump-nasm/no-show-raw-isns.dump.output
index cb1bf69146..11a151311b 100644
--- a/tests/examplefiles/objdump-nasm/no-show-raw-isns.dump.output
+++ b/tests/examplefiles/objdump-nasm/no-show-raw-isns.dump.output
@@ -2,32 +2,32 @@
 ':'           Punctuation
 '     file format ' Text
 'elf64-x86-64' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Disassembly of section ' Text
 '.text'       Name.Label
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0000000000000000' Literal.Number.Hex
 ' '           Text.Whitespace
 '<'           Punctuation
 'foo'         Name.Function
 '>:'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text.Whitespace
 '0:'          Name.Label
 '\t'          Text.Whitespace
 'endbr64'     Name.Function
 ' '           Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text.Whitespace
 '4:'          Name.Label
@@ -35,7 +35,7 @@
 'push'        Name.Function
 '   '         Text.Whitespace
 'rbp'         Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text.Whitespace
 '5:'          Name.Label
@@ -45,7 +45,7 @@
 'rbp'         Name.Builtin
 ','           Punctuation
 'rsp'         Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text.Whitespace
 '8:'          Name.Label
@@ -55,7 +55,7 @@
 'rsp'         Name.Builtin
 ','           Punctuation
 '0x10'        Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text.Whitespace
 'c:'          Name.Label
@@ -72,7 +72,7 @@
 '0x4'         Literal.Number.Hex
 '],'          Punctuation
 'edi'         Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text.Whitespace
 'f:'          Name.Label
@@ -87,7 +87,7 @@
 ']'           Punctuation
 '        '    Text.Whitespace
 '# 16 <foo+0x16>' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '16:'         Name.Label
@@ -101,7 +101,7 @@
 '+'           Operator
 '0x1b'        Literal.Number.Hex
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '1b:'         Name.Label
@@ -111,18 +111,18 @@
 'eax'         Name.Builtin
 ','           Punctuation
 '0x0'         Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '20:'         Name.Label
 '\t'          Text.Whitespace
 'leave'       Name.Function
 '  '          Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '21:'         Name.Label
 '\t'          Text.Whitespace
 'ret'         Name.Function
 '   '         Text.Whitespace
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/perl/perl_misc.output b/tests/examplefiles/perl/perl_misc.output
index 1e8730878b..0edfd8261b 100644
--- a/tests/examplefiles/perl/perl_misc.output
+++ b/tests/examplefiles/perl/perl_misc.output
@@ -1,387 +1,387 @@
 '#!/usr/bin/perl' Comment.Hashbang
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# from http://gist.github.com/485595' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'use'         Keyword
-' '           Text
+' '           Text.Whitespace
 'strict'      Name.Namespace
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'use'         Keyword
-' '           Text
+' '           Text.Whitespace
 'warnings'    Name.Namespace
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'use'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Time::HiRes' Name.Namespace
-' '           Text
+' '           Text.Whitespace
 "'usleep'"    Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '1'           Literal.Number.Integer
 '..'          Operator
 '5'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'open'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'in'          Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'<'"         Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'/proc/sys/kernel/random/entropy_avail'" Literal.String
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'die'         Name.Builtin
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '<$in>'       Literal.String.Regex
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'close'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'in'          Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'usleep'      Name
-' '           Text
+' '           Text.Whitespace
 '100_000'     Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# other miscellaneous tests of numbers separated by _' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#usleep 100_000;' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '100_000_000' Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'nichts'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0.005_006'   Literal.Number.Float
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"$nichts\\n"' Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'nichts2'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0.005_006_007' Literal.Number.Float
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '900_800_700.005_006_007' Literal.Number.Float
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$/'          Name.Variable.Global
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# numbers from `man 1 perlnumber`' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1234'        Literal.Number.Integer
 ';'           Punctuation
-'              ' Text
+'              ' Text.Whitespace
 '# decimal integer' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0b1110011'   Literal.Number.Bin
 ';'           Punctuation
-'         '   Text
+'         '   Text.Whitespace
 '# binary integer' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '01234'       Literal.Number.Oct
 ';'           Punctuation
-'             ' Text
+'             ' Text.Whitespace
 '# octal integer' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0x1234'      Literal.Number.Hex
 ';'           Punctuation
-'            ' Text
+'            ' Text.Whitespace
 '# hexadecimal integer' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '12.34e-56'   Literal.Number.Float
 ';'           Punctuation
-'         '   Text
+'         '   Text.Whitespace
 '# exponential notation' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"-12.34e56"' Literal.String
 ';'           Punctuation
-'       '     Text
+'       '     Text.Whitespace
 '# number specified as a string' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"1234"'      Literal.String
 ';'           Punctuation
-'            ' Text
+'            ' Text.Whitespace
 '# number specified as a string' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# other numbers' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '-'           Operator
 '9876'        Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '+'           Operator
 '8765'        Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '-'           Operator
 '9876.02'     Literal.Number.Float
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '-'           Operator
 '9876.02e+10' Literal.Number.Float
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '+'           Operator
 '765_432e30'  Literal.Number.Float
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '2002'        Literal.Number.Integer
 '.'           Operator
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '.2002'       Literal.Number.Float
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 '_'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# operators on numbers' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '300'         Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '300'         Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '300'         Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '250'         Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '2.0'         Literal.Number.Float
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '>='          Operator
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '<='          Operator
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.Number.Integer
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '%'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '2'           Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'abs'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 '_'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/perl/perl_perl5db.output b/tests/examplefiles/perl/perl_perl5db.output
index 3fb91edd07..718e6e5912 100644
--- a/tests/examplefiles/perl/perl_perl5db.output
+++ b/tests/examplefiles/perl/perl_perl5db.output
@@ -1,526 +1,526 @@
 "=head1 NAME \n\nperl5db.pl - the perl debugger\n\n=head1 SYNOPSIS\n\n    perl -d  your_Perl_script\n\n=head1 DESCRIPTION\n\nAfter this routine is over, we don't have user code executing in the debugger's\ncontext, so we can use C<my> freely.\n\n=cut" Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '############################################## Begin lexical danger zone' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# 'my' variables used here could leak into (that is, be visible in)" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# the context that the code being evaluated is executing in. This means that' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# the code could modify the debugger's variables." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Fiddling with the debugger's context could be Bad. We insulate things as" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# much as we can.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'sub'         Keyword
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Function
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 "# 'my' would make it visible from user code" Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '#    but so does local! --tchrist' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Remember: this localizes @DB::res, not @main::res.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '@'           Name.Variable
 'res'         Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '{'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# Try to keep the user code from messing  with us. Save these so that' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 "# even if the eval'ed code changes them, we can put them back again." Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 "# Needed because the user could refer directly to the debugger's" Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 "# package globals (and any 'my' variables in this containing scope)" Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# inside the eval(), and we want to try to stay safe.' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'otrace'      Name.Variable
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'trace'       Name.Variable
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'osingle'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'single'      Name.Variable
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'od'          Name.Variable
-'      '      Text
+'      '      Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$^D'         Name.Variable.Global
 ';'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# Untaint the incoming eval() argument.' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$'           Name.Variable
 'evalarg'     Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'evalarg'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' /(.*)/s'    Literal.String.Regex
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# $usercontext built in DB::DB near the comment' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# "set up the context for DB::eval ..."' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# Evaluate and save any results.' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@'           Name.Variable
 'res'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"$usercontext $evalarg;\\n"' Literal.String
 ';'           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 "# '\\n' for nice recursive debug" Comment.Single
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# Restore those old values.' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'trace'       Name.Variable
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'otrace'      Name.Variable
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'single'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'osingle'     Name.Variable
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$^D'         Name.Variable.Global
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'od'          Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 "# Save the current value of $@, and preserve it in the debugger's copy" Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# of the saved precious globals.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'at'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable.Global
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 "# Since we're only saving $@, we only have to localize the array element" Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# that it will be stored in.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'saved'       Name.Variable
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
 ';'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# Preserve the old value of $@' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 ''            Name
 'DB::'        Name.Namespace
 ''            Name
 'save'        Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Now see whether we need to report an error back to the user.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$'           Name.Variable
 'at'          Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$\\'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "''"          Literal.String
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'at'          Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Display as required by the caller. $onetimeDump and $onetimedumpDepth' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# are package globals.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$'           Name.Variable
 'onetimeDump' Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'onetimeDump' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'dump'"      Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'option'      Name.Variable
 '{'           Punctuation
 ''            Name
 'dumpDepth'   Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'onetimedumpDepth' Name.Variable
-'\n              ' Text
+'\n              ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'onetimedumpDepth' Name.Variable
 ';'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 ''            Name
 'dumpit'      Name
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '@'           Name.Variable
 'res'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'onetimeDump' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'methods'"   Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 ''            Name
 'methods'     Name
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'res'         Name.Variable
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end elsif ($onetimeDump)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@'           Name.Variable
 'res'         Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end sub eval' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '############################################## End lexical danger zone' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# After this point it is safe to introduce lexicals.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# The code being debugged will be executing in its own context, and' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# can't see the inside of the debugger." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# However, one should not overdo it: leave as much control from outside as' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# possible. If you make something a lexical, it's not going to be addressable" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# from outside the debugger even if you know its name.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This file is automatically included if you do perl -d.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# It's probably not useful to include this yourself." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Before venturing further into these twisty passages, it is' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# wise to read the perldebguts man page or risk the ire of dragons.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# (It should be noted that perldebguts will tell you a lot about' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# the underlying mechanics of how the debugger interfaces into the' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Perl interpreter, but not a lot about the debugger itself. The new' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# comments in this code try to address this problem.)' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Note that no subroutine call is possible until &DB::sub is defined' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# (for subroutines defined outside of the package DB). In fact the same is' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# true if $deep is not defined.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Enhanced by ilya@math.ohio-state.edu (Ilya Zakharevich)' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# modified Perl debugger, to be run from Emacs in perldb-mode' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Ray Lischner (uunet!mntgfx!lisch) as of 5 Nov 1990' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Johan Vromans -- upgrade to 4.0 pl 10' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Ilya Zakharevich -- patches after 5.001 (and some before ;-)' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# (We have made efforts to  clarify the comments in the change log' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# in other places; some of them may seem somewhat obscure as they' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# were originally written, and explaining them away from the code' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# in question seems conterproductive.. -JM)' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=head1 DEBUGGER INITIALIZATION\n\nThe debugger starts up in phases.\n\n=head2 BASIC SETUP\n\nFirst, it initializes the environment it wants to run in: turning off\nwarnings during its own compilation, defining variables which it will need\nto avoid warnings later, setting itself up to not exit when the program\nterminates, and defaulting to printing return values for the C<r> command.\n\n=cut' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Needed for the statement after exec():' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# This BEGIN block is simply used to switch off warnings during debugger' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# compiliation. Probably it would be better practice to fix the warnings,' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# but this is how it's done at the moment." Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'BEGIN'       Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'ini_warn'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$^W'         Name.Variable.Global
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$^W'         Name.Variable.Global
-'       '     Text
+'       '     Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# Switch compilation warnings off until another BEGIN.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# test if assertions are supported and actived:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'BEGIN'       Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'ini_assertion' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"sub asserting_test : assertion {1}; 1"' Literal.String
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# $ini_assertion = undef => assertions unsupported,' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '#        "       = 1     => assertions supported' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# print "\\$ini_assertion=$ini_assertion\\n";' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$^W'         Name.Variable.Global
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# Switch run-time warnings off during init.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=head2 THREADS SUPPORT\n\nIf we are running under a threaded Perl, we require threads and threads::shared\nif the environment variable C<PERL5DB_THREADED> is set, to enable proper\nthreaded debugger control.  C<-dt> can also be used to set this.\n\nEach new thread will be announced and the debugger prompt will always inform\nyou of each new thread created.  It will also indicate the thread id in which\nwe are currently running within the prompt like this:\n\n\t[tid] DB<$i>\n\nWhere C<[tid]> is an integer thread id and C<$i> is the familiar debugger\ncommand prompt.  The prompt will show: C<[0]> when running under threads, but\nnot actually in a thread.  C<[tid]> is consistent with C<gdb> usage.\n\nWhile running under threads, when you set or delete a breakpoint (etc.), this\nwill apply to all threads, not just the currently running one.  When you are \nin a currently executing thread, you will stay there until it completes.  With\nthe current implementation it is not currently possible to hop from one thread\nto another.\n\nThe C<e> and C<E> commands are currently fairly minimal - see C<h e> and C<h E>.\n\nNote that threading support was built into the debugger as of Perl version\nC<5.8.6> and debugger version C<1.2.8>.\n\n=cut' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'BEGIN'       Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# ensure we can share our non-threaded variables or no-op' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$'           Name.Variable
 'ENV'         Name.Variable
@@ -529,35 +529,35 @@
 'PERL5DB_THREADED' Name
 '}'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'require'     Keyword
-' '           Text
+' '           Text.Whitespace
 'threads'     Name.Namespace
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'require'     Keyword
-' '           Text
+' '           Text.Whitespace
 'threads::shared' Name.Namespace
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'import'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'threads::'   Name.Namespace
 ''            Name
 'shared'      Name
-' '           Text
+' '           Text.Whitespace
 'qw('         Literal.String.Other
 'share'       Literal.String.Other
 ')'           Literal.String.Other
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '$'           Name.Variable
 'DBGR'        Name.Variable
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ''            Name
 'share'       Name
 '('           Punctuation
@@ -566,7 +566,7 @@
 'DBGR'        Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ''            Name
 'lock'        Name
 '('           Punctuation
@@ -574,170 +574,170 @@
 'DBGR'        Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"Threads support enabled\\n"' Literal.String
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Operator
 ''            Name
 'lock'        Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'sub'         Name
 '('           Punctuation
 '*'           Operator
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '*'           Operator
 ''            Name
 'share'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'sub'         Name
 '('           Punctuation
 '*'           Operator
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
 ';'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This would probably be better done with "use vars", but that wasn\'t around' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# when this code was originally written. (Neither was "use strict".) And on' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# the principle of not fiddling with something that was working, this was' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# left alone.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'warn'        Name.Builtin
 '('           Punctuation
-'               ' Text
+'               ' Text.Whitespace
 '# Do not ;-)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "# These variables control the execution of 'dumpvar.pl'." Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'hashDepth'   Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'arrayDepth'  Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'dumpDBFiles' Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'dumpPackages' Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'quoteHighBit' Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'printUndef'  Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'globPrint'   Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'usageOnly'   Name.Variable
 ','           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# used to save @ARGV and extract any debugger-related flags.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@'           Name.Variable
 'ARGS'        Name.Variable
 ','           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# used to control die() reporting in diesignal()' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'Carp::'      Name.Namespace
 'CarpLevel'   Name.Variable
 ','           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# used to prevent multiple entries to diesignal()' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# (if for instance diesignal() itself dies)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'panic'       Name.Variable
 ','           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# used to prevent the debugger from running nonstop' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# after a restart' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'second_time' Name.Variable
 ','           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'foreach'     Keyword
-' '           Text
+' '           Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'k'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'keys'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '%'           Name.Variable
 'INC'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '&'           Operator
 ''            Name
 'share'       Name
@@ -753,377 +753,377 @@
 '}'           Punctuation
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Command-line + PERLLIB:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Save the contents of @INC before they are modified elsewhere.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@'           Name.Variable
 'ini_INC'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@'           Name.Variable
 'INC'         Name.Variable
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This was an attempt to clear out the previous values of various' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# trapped errors. Apparently it didn't help. XXX More info needed!" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# $prevwarn = $prevdie = $prevbus = $prevsegv = ''; # Does not help?!" Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# We set these variables to safe values. We don't want to blindly turn" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# off warnings, because other packages may still want them.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'trace'       Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'signal'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'single'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# Uninitialized warning suppression' Comment.Single
-'\n                                   ' Text
+'\n                                   ' Text.Whitespace
 '# (local $^W cannot help - other packages!).' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Default to not exiting when program finishes; print the return' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# value when the 'r' command is used to return from a subroutine." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'inhibit_exit' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'option'      Name.Variable
 '{'           Punctuation
 ''            Name
 'PrintRet'    Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=head1 OPTION PROCESSING\n\nThe debugger's options are actually spread out over the debugger itself and \nC<dumpvar.pl>; some of these are variables to be set, while others are \nsubs to be called with a value. To try to make this a little easier to\nmanage, the debugger uses a few data structures to define what options\nare legal and how they are to be processed.\n\nFirst, the C<@options> array defines the I<names> of all the options that\nare to be accepted.\n\n=cut" Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '@'           Name.Variable
 'options'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'qw('         Literal.String.Other
 '\n  CommandSet\n  hashDepth    arrayDepth    dumpDepth\n  DumpDBFiles  DumpPackages  DumpReused\n  compactDump  veryCompact   quote\n  HighBit      undefPrint    globPrint\n  PrintRet     UsageOnly     frame\n  AutoTrace    TTY           noTTY\n  ReadLine     NonStop       LineInfo\n  maxTraceLen  recallCommand ShellBang\n  pager        tkRunning     ornaments\n  signalLevel  warnLevel     dieLevel\n  inhibit_exit ImmediateStop bareStringify\n  CreateTTY    RemotePort    windowSize\n  DollarCaretP OnlyAssertions WarnAssertions\n' Literal.String.Other
 
 ')'           Literal.String.Other
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '@'           Name.Variable
 'RememberOnROptions' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'qw('         Literal.String.Other
 'DollarCaretP OnlyAssertions' Literal.String.Other
 ')'           Literal.String.Other
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nSecond, C<optionVars> lists the variables that each option uses to save its\nstate.\n\n=cut' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '%'           Name.Variable
 'optionVars'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'hashDepth'   Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'hashDepth'   Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'arrayDepth'  Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'arrayDepth'  Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'CommandSet'  Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'CommandSet'  Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'DumpDBFiles' Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'dumpDBFiles' Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'DumpPackages' Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'dumpPackages' Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'DumpReused'  Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'dumpReused'  Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'HighBit'     Name
-'       '     Text
+'       '     Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'quoteHighBit' Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'undefPrint'  Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'printUndef'  Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'globPrint'   Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'globPrint'   Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'UsageOnly'   Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'usageOnly'   Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'CreateTTY'   Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'CreateTTY'   Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'bareStringify' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'dumpvar::'   Name.Namespace
 'bareStringify' Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'frame'       Name
-'         '   Text
+'         '   Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'frame'       Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'AutoTrace'   Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'trace'       Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'inhibit_exit' Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'inhibit_exit' Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'maxTraceLen' Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'maxtrace'    Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'ImmediateStop' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'ImmediateStop' Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'RemotePort'  Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'remoteport'  Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'windowSize'  Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'window'      Name.Variable
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'WarnAssertions' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '$'           Name.Variable
 'warnassertions' Name.Variable
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ')'           Punctuation
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nThird, C<%optionAction> defines the subroutine to be called to process each\noption.\n\n=cut' Comment.Multiline
-' \n\n'       Text
+' \n\n'       Text.Whitespace
 
 '%'           Name.Variable
 'optionAction' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'compactDump' Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
@@ -1131,13 +1131,13 @@
 ''            Name
 'compactDump' Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'veryCompact' Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
@@ -1145,13 +1145,13 @@
 ''            Name
 'veryCompact' Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'quote'       Name
-'         '   Text
+'         '   Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
@@ -1159,409 +1159,409 @@
 ''            Name
 'quote'       Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'TTY'         Name
-'           ' Text
+'           ' Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'TTY'         Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'noTTY'       Name
-'         '   Text
+'         '   Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'noTTY'       Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'ReadLine'    Name
-'      '      Text
+'      '      Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'ReadLine'    Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'NonStop'     Name
-'       '     Text
+'       '     Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'NonStop'     Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'LineInfo'    Name
-'      '      Text
+'      '      Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'LineInfo'    Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'recallCommand' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'recallCommand' Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'ShellBang'   Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'shellBang'   Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'pager'       Name
-'         '   Text
+'         '   Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'pager'       Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'signalLevel' Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'signalLevel' Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'warnLevel'   Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'warnLevel'   Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'dieLevel'    Name
-'      '      Text
+'      '      Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'dieLevel'    Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'tkRunning'   Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'tkRunning'   Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'ornaments'   Name
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'ornaments'   Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'RemotePort'  Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'RemotePort'  Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'DollarCaretP' Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'DollarCaretP' Name
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'OnlyAssertions' Name
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'OnlyAssertions' Name
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ')'           Punctuation
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nLast, the C<%optionRequire> notes modules that must be C<require>d if an\noption is used.\n\n=cut' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Note that this list is not complete: several options not listed here' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# actually require that dumpvar.pl be loaded for them to work, but are' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# not in the table. A subsequent patch will correct this problem; for' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# the moment, we're just recommenting, and we are NOT going to change" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# function.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%'           Name.Variable
 'optionRequire' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'compactDump' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'dumpvar.pl'" Literal.String
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'veryCompact' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'dumpvar.pl'" Literal.String
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'quote'       Name
-'       '     Text
+'       '     Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'dumpvar.pl'" Literal.String
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ')'           Punctuation
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nThere are a number of initialization-related variables which can be set\nby putting code to set them in a BEGIN block in the C<PERL5DB> environment\nvariable. These are:\n\n=over 4\n\n=item C<$rl> - readline control XXX needs more explanation\n\n=item C<$warnLevel> - whether or not debugger takes over warning handling\n\n=item C<$dieLevel> - whether or not debugger takes over die handling\n\n=item C<$signalLevel> - whether or not debugger takes over signal handling\n\n=item C<$pre> - preprompt actions (array reference)\n\n=item C<$post> - postprompt actions (array reference)\n\n=item C<$pretype>\n\n=item C<$CreateTTY> - whether or not to create a new TTY for this debugger\n\n=item C<$CommandSet> - which command set to use (defaults to new, documented set)\n\n=back\n\n=cut' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# These guys may be defined in $ENV{PERL5DB} :' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'rl'          Name.Variable
-'          '  Text
+'          '  Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'     '       Text
+'     '       Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'rl'          Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'warnLevel'   Name.Variable
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'     '       Text
+'     '       Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'warnLevel'   Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'dieLevel'    Name.Variable
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'     '       Text
+'     '       Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'dieLevel'    Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'signalLevel' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'     '       Text
+'     '       Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'signalLevel' Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'pre'         Name.Variable
-'         '   Text
+'         '   Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '[]'          Operator
-'    '        Text
+'    '        Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'pre'         Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'post'        Name.Variable
-'        '    Text
+'        '    Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '[]'          Operator
-'    '        Text
+'    '        Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'post'        Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'pretype'     Name.Variable
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '[]'          Operator
-'    '        Text
+'    '        Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'pretype'     Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'CreateTTY'   Name.Variable
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
-'     '       Text
+'     '       Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'CreateTTY'   Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'CommandSet'  Name.Variable
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'580'"       Literal.String
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'CommandSet'  Name.Variable
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1570,7 +1570,7 @@
 'rl'          Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1579,7 +1579,7 @@
 'warnLevel'   Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1588,7 +1588,7 @@
 'dieLevel'    Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1597,7 +1597,7 @@
 'signalLevel' Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1606,7 +1606,7 @@
 'pre'         Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1615,7 +1615,7 @@
 'post'        Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1624,7 +1624,7 @@
 'pretype'     Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1633,7 +1633,7 @@
 'rl'          Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1642,7 +1642,7 @@
 'CreateTTY'   Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'share'       Name
@@ -1651,10 +1651,10 @@
 'CommandSet'  Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nThe default C<die>, C<warn>, and C<signal> handlers are set up.\n\n=cut' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 ''            Name
 'warnLevel'   Name
@@ -1663,7 +1663,7 @@
 'warnLevel'   Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'dieLevel'    Name
@@ -1672,7 +1672,7 @@
 'dieLevel'    Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'signalLevel' Name
@@ -1681,56 +1681,56 @@
 'signalLevel' Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=pod\n\nThe pager to be used is needed next. We try to get it from the\nenvironment first.  if it's not defined there, we try to find it in\nthe Perl C<Config.pm>.  If it's not there, we default to C<more>. We\nthen call the C<pager()> function to save the pager name.\n\n=cut" Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# This routine makes sure $pager is set up so that '|' can use it." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'pager'       Name
 '('           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# If PAGER is defined in the environment, use it.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'PAGER'       Name
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'PAGER'       Name
 '}'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '# If not, see if Config.pm defines it.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'require'     Keyword
-' '           Text
+' '           Text.Whitespace
 'Config'      Name.Namespace
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'Config::'    Name.Namespace
 'Config'      Name.Variable
@@ -1738,9 +1738,9 @@
 ''            Name
 'pager'       Name
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'Config::'    Name.Namespace
 'Config'      Name.Variable
@@ -1748,39 +1748,39 @@
 ''            Name
 'pager'       Name
 '}'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 "# If not, fall back to 'more'." Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'more'"      Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'pager'       Name.Variable
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nWe set up the command to be used to access the man pages, the command\nrecall character (C<!> unless otherwise defined) and the shell escape\ncharacter (C<!> unless otherwise defined). Yes, these do conflict, and\nneither works in the debugger at the moment.\n\n=cut' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 ''            Name
 'setman'      Name
 '('           Punctuation
 ')'           Punctuation
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Set up defaults for command recall and shell escape (note:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# these currently don't work in linemode debugging)." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '&'           Operator
 ''            Name
@@ -1788,15 +1788,15 @@
 '('           Punctuation
 '"!"'         Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'prc'         Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '&'           Operator
 ''            Name
@@ -1804,62 +1804,62 @@
 '('           Punctuation
 '"!"'         Literal.String
 ')'           Punctuation
-'     '       Text
+'     '       Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'psh'         Name.Variable
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=pod\n\nWe then set up the gigantic string containing the debugger help.\nWe also set the limit on the number of arguments we'll display during a\ntrace.\n\n=cut" Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 ''            Name
 'sethelp'     Name
 '('           Punctuation
 ')'           Punctuation
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# If we didn't get a default for the length of eval/stack trace args," Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# set it here.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'maxtrace'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '400'         Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'maxtrace'    Name.Variable
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=head2 SETTING UP THE DEBUGGER GREETING\n\nThe debugger I<greeting> helps to inform the user how many debuggers are\nrunning, and whether the current debugger is the primary or a child.\n\nIf we are the primary, we just hang onto our pid so we'll have it when\nor if we start a child debugger. If we are a child, we'll set things up\nso we'll have a unique greeting and so the parent will give us our own\nTTY later.\n\nWe save the current contents of the C<PERLDB_PIDS> environment variable\nbecause we mess around with it. We'll also need to hang onto it because\nwe'll need it if we restart.\n\nChild debuggers make a label out of the current PID structure recorded in\nPERLDB_PIDS plus the new PID. They also mark themselves as not having a TTY\nyet so the parent will give them one later via C<resetterm()>.\n\n=cut" Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# Save the current contents of the environment; we're about to" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# much with it. We'll need this if we have to restart." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'ini_pids'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
@@ -1867,781 +1867,781 @@
 'PERLDB_PIDS' Name
 '}'           Punctuation
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'PERLDB_PIDS' Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 "# We're a child. Make us a label out of the current PID structure" Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# recorded in PERLDB_PIDS plus our (new) PID. Mark us as not having' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# a term yet so the parent will give us one later via resetterm().' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'pids'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"[$ENV{PERLDB_PIDS}]"' Literal.String
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'PERLDB_PIDS' Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '.'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"->$$"'      Literal.String
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'term_pid'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end if (defined $ENV{PERLDB_PIDS...' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 "# We're the parent PID. Initialize PERLDB_PID in case we end up with a" Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "# child debugger, and mark us as the parent, so we'll know to set up" Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "# more TTY's is we have to." Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'PERLDB_PIDS' Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"$$"'        Literal.String
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'pids'        Name.Variable
-'             ' Text
+'             ' Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"{pid=$$}"'  Literal.String
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'term_pid'    Name.Variable
-'         '   Text
+'         '   Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$$'          Name.Variable.Global
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '$'           Name.Variable
 'pidprompt'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "''"          Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Sets up $emacs as a synonym for $slave_editor.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Operator
 ''            Name
 'emacs'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'slave_editor' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'slave_editor' Name.Variable
 ';'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# May be used in afterinit()...' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=head2 READING THE RC FILE\n\nThe debugger will read a file of initialization options if supplied. If    \nrunning interactively, this is C<.perldb>; if not, it's C<perldb.ini>.\n\n=cut" Comment.Multiline
-'      \n\n'  Text
+'      \n\n'  Text.Whitespace
 
 "# As noted, this test really doesn't check accurately that the debugger" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# is running at a terminal or not.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 ''            Name
 'e'           Name
-' '           Text
+' '           Text.Whitespace
 '"/dev/tty"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'                      ' Text
+'                      ' Text.Whitespace
 '# this is the wrong metric!' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'rcfile'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '".perldb"'   Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'rcfile'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"perldb.ini"' Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nThe debugger does a safety test of the file to be read. It must be owned\neither by the current user or root, and must only be writable by the owner.\n\n=cut' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This wraps a safety test around "do" to read and evaluate the init file.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# This isn't really safe, because there's a race" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# between checking and opening.  The solution is to' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# open and fstat the handle, but then you have to read and' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# eval the contents.  But then the silly thing gets' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# your lexical scope, which is unfortunate at best.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub'         Keyword
-' '           Text
+' '           Text.Whitespace
 'safe_do'     Name.Function
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'file'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'shift'       Name.Builtin
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Just exactly what part of the word "CORE::" don\'t you understand?' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'SIG'         Name.Variable
 '{'           Punctuation
 '__WARN__'    Name.Builtin.Pseudo
 '}'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'SIG'         Name.Variable
 '{'           Punctuation
 '__DIE__'     Name.Builtin.Pseudo
 '}'           Punctuation
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'is_safe_file' Name
 '('           Punctuation
 '$'           Name.Variable
 'file'        Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 ''            Name
 'CORE::'      Name.Namespace
 'warn'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '<<'          Literal.String
 'EO_GRIPE'    Literal.String.Delimiter
 ';\nperldb: Must not source insecure rcfile $file.\n        You or the superuser must be the owner, and it must not \n        be writable by anyone but its owner.\n' Literal.String
 
 'EO_GRIPE'    Literal.String.Delimiter
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'return'      Keyword
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end unless (is_safe_file($file...' Comment.Single
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'file'        Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'CORE::'      Name.Namespace
 'warn'        Name.Builtin
 '('           Punctuation
 '"perldb: couldn\'t parse $file: $@"' Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$@'          Name.Variable.Global
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end sub safe_do' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This is the safety test itself.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Verifies that owner is either real user or superuser and that no' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# one but owner may write to it.  This function is of limited use' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# when called on a path instead of upon a handle, because there are' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# no guarantees that filename (by dirent) whose file (by ino) is' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# eventually accessed is the same as the one tested.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Assumes that the file's existence is not in doubt." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub'         Keyword
-' '           Text
+' '           Text.Whitespace
 'is_safe_file' Name.Function
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'path'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'shift'       Name.Builtin
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'stat'        Name.Builtin
 '('           Punctuation
 '$'           Name.Variable
 'path'        Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
 ';'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# mysteriously vaporized' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'dev'         Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ino'         Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'mode'        Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'nlink'       Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'uid'         Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'gid'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'stat'        Name.Builtin
 '('           Punctuation
 ''            Name
 '_'           Name
 ')'           Punctuation
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'uid'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'uid'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '$<'          Name.Variable.Global
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'mode'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '022'         Literal.Number.Oct
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end sub is_safe_file' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# If the rcfile (whichever one we decided was the right one to read)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# exists, we safely do it.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 ''            Name
 'f'           Name
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'rcfile'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'safe_do'     Name
 '('           Punctuation
 '"./$rcfile"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# If there isn't one here, try the user's home directory." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'HOME'        Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 ''            Name
 'f'           Name
-' '           Text
+' '           Text.Whitespace
 '"$ENV{HOME}/$rcfile"' Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'safe_do'     Name
 '('           Punctuation
 '"$ENV{HOME}/$rcfile"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Else try the login directory.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'LOGDIR'      Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 ''            Name
 'f'           Name
-' '           Text
+' '           Text.Whitespace
 '"$ENV{LOGDIR}/$rcfile"' Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'safe_do'     Name
 '('           Punctuation
 '"$ENV{LOGDIR}/$rcfile"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# If the PERLDB_OPTS variable has options in it, parse those out next.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'PERLDB_OPTS' Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 ''            Name
 'parse_options' Name
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'PERLDB_OPTS' Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nThe last thing we do during initialization is determine which subroutine is\nto be used to obtain a new terminal when a new debugger is started. Right now,\nthe debugger only handles X Windows and OS/2.\n\n=cut' Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Set up the get_fork_TTY subroutine to be aliased to the proper routine.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Works if you're running an xterm or xterm-like window, or you're on" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# OS/2. This may need some expansion: for instance, this doesn't handle" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# OS X Terminal windows.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 ''            Name
 'get_fork_TTY' Name
-'    '        Text
+'    '        Text.Whitespace
 '# no routine exists,' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'TERM'        Name
 '}'           Punctuation
-'       '     Text
+'       '     Text.Whitespace
 '# and we know what kind' Comment.Single
-'\n                                 ' Text
+'\n                                 ' Text.Whitespace
 '# of terminal this is,' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'TERM'        Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'xterm'"     Literal.String
-'    '        Text
+'    '        Text.Whitespace
 "# and it's an xterm," Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   and defined $ENV{WINDOWID}   # and we know what window this is, <- wrong metric' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'DISPLAY'     Name
 '}'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 "# and what display it's on," Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Operator
 ''            Name
 'get_fork_TTY' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'xterm_get_fork_TTY' Name
 ';'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# use the xterm version' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end if (not defined &get_fork_TTY...' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'os2'"       Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'                     ' Text
+'                     ' Text.Whitespace
 '# If this is OS/2,' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '*'           Operator
 ''            Name
 'get_fork_TTY' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '&'           Operator
 ''            Name
 'os2_get_fork_TTY' Name
 ';'           Punctuation
-'      '      Text
+'      '      Text.Whitespace
 '# use the OS/2 version' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# untaint $^O, which may have been tainted by the last statement.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# see bug [perl #24674]' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 'm/^(.*)\\z/' Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 '1'           Name.Variable
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Here begin the unreadable code.  It needs fixing.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=head2 RESTART PROCESSING\n\nThis section handles the restart command. When the C<R> command is invoked, it\ntries to capture all of the state it can into environment variables, and\nthen sets C<PERLDB_RESTART>. When we start executing again, we check to see\nif C<PERLDB_RESTART> is there; if so, we reload all the information that\nthe R command stuffed into the environment variables.\n\n  PERLDB_RESTART   - flag only, contains no restart data itself.       \n  PERLDB_HIST      - command history, if it's available\n  PERLDB_ON_LOAD   - breakpoints set by the rc file\n  PERLDB_POSTPONE  - subs that have been loaded/not executed, and have actions\n  PERLDB_VISITED   - files that had breakpoints\n  PERLDB_FILE_...  - breakpoints for a file\n  PERLDB_OPT       - active options\n  PERLDB_INC       - the original @INC\n  PERLDB_PRETYPE   - preprompt debugger actions\n  PERLDB_PRE       - preprompt Perl code\n  PERLDB_POST      - post-prompt Perl code\n  PERLDB_TYPEAHEAD - typeahead captured by readline()\n\nWe chug through all these variables and plug the values saved in them\nback into the appropriate spots in the debugger.\n\n=cut" Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'exists'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'PERLDB_RESTART' Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 "# We're restarting, so we don't need the flag that says to restart anymore." Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'delete'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
@@ -2649,45 +2649,45 @@
 'PERLDB_RESTART' Name
 '}'           Punctuation
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# $restart = 1;' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@'           Name.Variable
 'hist'        Name.Variable
-'          '  Text
+'          '  Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 "'PERLDB_HIST'" Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '%'           Name.Variable
 'break_on_load' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 '"PERLDB_ON_LOAD"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '%'           Name.Variable
 'postponed'   Name.Variable
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 '"PERLDB_POSTPONE"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 ''            Name
 'share'       Name
 '('           Punctuation
@@ -2695,7 +2695,7 @@
 'hist'        Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ''            Name
 'share'       Name
 '('           Punctuation
@@ -2703,7 +2703,7 @@
 'truehist'    Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ''            Name
 'share'       Name
 '('           Punctuation
@@ -2711,7 +2711,7 @@
 'break_on_load' Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ''            Name
 'share'       Name
 '('           Punctuation
@@ -2719,269 +2719,269 @@
 'postponed'   Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# restore breakpoints/actions' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@'           Name.Variable
 'had_breakpoints' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 '"PERLDB_VISITED"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '..'          Operator
-' '           Text
+' '           Text.Whitespace
 '$#'          Name.Variable
 'had_breakpoints' Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '%'           Name.Variable
 'pf'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 '"PERLDB_FILE_$_"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'postponed_file' Name.Variable
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'had_breakpoints' Name.Variable
 '['           Punctuation
 '$'           Name.Variable
 '_'           Name.Variable
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '%'           Name.Variable
 'pf'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '%'           Name.Variable
 'pf'          Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# restore options' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '%'           Name.Variable
 'opt'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 '"PERLDB_OPT"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'opt'         Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'val'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'opt'         Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'val'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'each'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '%'           Name.Variable
 'opt'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'val'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 "s/[\\\\\\']/\\\\$1/g" Literal.String.Regex
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 ''            Name
 'parse_options' Name
 '('           Punctuation
 '"$opt\'$val\'"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# restore original @INC' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@'           Name.Variable
 'INC'         Name.Variable
-'     '       Text
+'     '       Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 '"PERLDB_INC"' Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@'           Name.Variable
 'ini_INC'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@'           Name.Variable
 'INC'         Name.Variable
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# return pre/postprompt actions and typeahead buffer' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'pretype'     Name.Variable
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 '"PERLDB_PRETYPE"' Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ']'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'pre'         Name.Variable
-'       '     Text
+'       '     Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 '"PERLDB_PRE"' Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ']'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'post'        Name.Variable
-'      '      Text
+'      '      Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
 '"PERLDB_POST"' Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ']'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@'           Name.Variable
 'typeahead'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'get_list'    Name
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"PERLDB_TYPEAHEAD"' Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@'           Name.Variable
 'typeahead'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end if (exists $ENV{PERLDB_RESTART...' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=head2 SETTING UP THE TERMINAL\n\nNow, we'll decide how the debugger is going to interact with the user.\nIf there's no TTY, we set the debugger to run non-stop; there's not going\nto be anyone there to enter commands.\n\n=cut" Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$'           Name.Variable
 'notty'       Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'runnonstop'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ''            Name
 'share'       Name
 '('           Punctuation
@@ -2989,917 +2989,917 @@
 'runnonstop'  Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=pod\n\nIf there is a TTY, we have to determine who it belongs to before we can\nproceed. If this is a slave editor or graphical debugger (denoted by\nthe first command-line switch being '-emacs'), we shift this off and\nset C<$rl> to 0 (XXX ostensibly to do straight reads).\n\n=cut" Comment.Multiline
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Is Perl being run from a slave editor or graphical debugger?' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "# If so, don't use readline, and set $slave_editor = 1." Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'slave_editor' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'main::'      Name.Namespace
 'ARGV'        Name.Variable
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'main::'      Name.Namespace
 'ARGV'        Name.Variable
 '['           Punctuation
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'-emacs'"    Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'rl'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'shift'       Name.Builtin
 '('           Punctuation
 '@'           Name.Variable
 'main::'      Name.Namespace
 'ARGV'        Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'slave_editor' Name.Variable
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '#require Term::ReadLine;' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nWe then determine what the console should be on various systems:\n\n=over 4\n\n=item * Cygwin - We use C<stdin> instead of a separate device.\n\n=cut' Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'cygwin'"    Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# /dev/tty is binary. use stdin for textmode' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'undef'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=item * Unix - use C</dev/tty>.\n\n=cut' Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 ''            Name
 'e'           Name
-' '           Text
+' '           Text.Whitespace
 '"/dev/tty"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"/dev/tty"'  Literal.String
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=item * Windows or MSDOS - use C<con>.\n\n=cut' Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'dos'"       Literal.String
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 ''            Name
 'e'           Name
-' '           Text
+' '           Text.Whitespace
 '"con"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'MSWin32'"   Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"con"'       Literal.String
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=item * MacOS - use C<Dev:Console:Perl Debug> if this is the MPW version; C<Dev:\nConsole> if not.\n\nNote that Mac OS X returns C<darwin>, not C<MacOS>. Also note that the debugger doesn't do anything special for C<darwin>. Maybe it should.\n\n=cut" Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'MacOS'"     Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'MacPerl::'   Name.Namespace
 'Version'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!~'          Operator
-' '           Text
+' '           Text.Whitespace
 '/MPW/'       Literal.String.Regex
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'\n              ' Text
+'\n              ' Text.Whitespace
 '"Dev:Console:Perl Debug"' Literal.String
 ';'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# Separate window for application' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"Dev:Console"' Literal.String
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "## end elsif ($^O eq 'MacOS')" Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=item * VMS - use C<sys$command>.\n\n=cut' Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# everything else is ...' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"sys\\$command"' Literal.String
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "=pod\n\n=back\n\nSeveral other systems don't use a specific console. We C<undef $console>\nfor those (Windows using a slave editor/graphical debugger, NetWare, OS/2\nwith a slave editor, Epoc).\n\n=cut" Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'MSWin32'"   Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'slave_editor' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'EMACS'       Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# /dev/tty is binary. use stdin for textmode' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'undef'       Name.Builtin
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'NetWare'"   Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# /dev/tty is binary. use stdin for textmode' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'undef'       Name.Builtin
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# In OS/2, we need to use STDIN to get textmode too, even though' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# it pretty much looks like Unix otherwise.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'OS2_SHELL'   Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'slave_editor' Name.Variable
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'ENV'         Name.Variable
 '{'           Punctuation
 ''            Name
 'WINDOWID'    Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '{'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# In OS/2'   Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'undef'       Name.Builtin
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 "# EPOC also falls into the 'got to use STDIN' camp." Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$^O'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'epoc'"      Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'undef'       Name.Builtin
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nIf there is a TTY hanging around from a parent, we use that as the console.\n\n=cut' Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'tty'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'tty'         Name.Variable
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=head2 SOCKET HANDLING   \n\nThe debugger is capable of opening a socket and carrying out a debugging\nsession over the socket.\n\nIf C<RemotePort> was defined in the options, the debugger assumes that it\nshould try to start a debugging session on that port. It builds the socket\nand then tries to connect the input and output filehandles to it.\n\n=cut' Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Handle socket stuff.' Comment.Single
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'remoteport'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# If RemotePort was defined in the options, connect input and output' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# to the socket.' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'require'     Keyword
-' '           Text
+' '           Text.Whitespace
 'IO::Socket'  Name.Namespace
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'new'         Keyword
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'IO::Socket::' Name.Namespace
 ''            Name
 'INET'        Name
 '('           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 ''            Name
 'Timeout'     Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'10'"        Literal.String
 ','           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 ''            Name
 'PeerAddr'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'remoteport'  Name.Variable
 ','           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 ''            Name
 'Proto'       Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'tcp'"       Literal.String
 ','           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '$'           Name.Variable
 'OUT'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'die'         Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"Unable to connect to remote host: $remoteport\\n"' Literal.String
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'IN'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end if (defined $remoteport)' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nIf no C<RemotePort> was defined, and we want to create a TTY on startup,\nthis is probably a situation where multiple debuggers are running (for example,\na backticked command that starts up another debugger). We create a new IN and\nOUT filehandle, and do the necessary mojo to create a new TTY if we know how\nand if we can.\n\n=cut' Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Non-socket.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# Two debuggers running (probably a system or a backtick that invokes' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# the debugger itself under the running one). create a new IN and OUT' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# filehandle, and do the necessary mojo to create a new tty if we' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# know how, and we can.' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 ''            Name
 'create_IN_OUT' Name
 '('           Punctuation
 '4'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'CreateTTY'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$'           Name.Variable
 'console'     Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 '# If we have a console, check to see if there are separate ins and' Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 '# outs to open. (They are assumed identiical if not.)' Comment.Single
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'i'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'o'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'split'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '/,/'         Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
 ';'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '$'           Name.Variable
 'o'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'i'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'o'           Name.Variable
 ';'           Punctuation
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 '# read/write on in, or just read, or read on STDIN.' Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'IN'          Name
 ','           Punctuation
-'      '      Text
+'      '      Text.Whitespace
 '"+<$i"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-'\n              ' Text
+'\n              ' Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'IN'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"<$i"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-'\n              ' Text
+'\n              ' Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'IN'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"<&STDIN"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 '# read/write/create/clobber out, or write/create/clobber out,' Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 '# or merge with STDERR, or merge with STDOUT.' Comment.Single
-'\n                 ' Text
+'\n                 ' Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'OUT'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"+>$o"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-'\n              ' Text
+'\n              ' Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'OUT'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '">$o"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-'\n              ' Text
+'\n              ' Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'OUT'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '">&STDERR"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-'\n              ' Text
+'\n              ' Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'OUT'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '">&STDOUT"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 "# so we don't dongle stdout" Comment.Single
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end if ($console)' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 '# No console. Open STDIN.' Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'IN'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"<&STDIN"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 '# merge with STDERR, or with STDOUT.' Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'OUT'         Name
 ','           Punctuation
-'      '      Text
+'      '      Text.Whitespace
 '">&STDERR"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-'\n              ' Text
+'\n              ' Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'open'        Name.Builtin
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'OUT'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '">&STDOUT"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 "# so we don't dongle stdout" Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'STDIN/OUT'" Literal.String
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end elsif (not defined $console)' Comment.Single
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# Keep copies of the filehandles so that when the pager runs, it' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# can close standard input without clobbering ours.' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$'           Name.Variable
 'IN'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '*'           Operator
 ''            Name
 'IN'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '\\'          Operator
 '*'           Operator
 ''            Name
 'OUT'         Name
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end elsif (from if(defined $remoteport))' Comment.Single
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Unbuffer DB::OUT. We need to see responses right away.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'previous'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'select'      Name.Builtin
 '('           Punctuation
 '$'           Name.Variable
 'OUT'         Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$|'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'                                  ' Text
+'                                  ' Text.Whitespace
 '# for DB::OUT' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'select'      Name.Builtin
 '('           Punctuation
 '$'           Name.Variable
 'previous'    Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Line info goes to debugger output unless pointed elsewhere.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Pointing elsewhere makes it possible for slave editors to' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# keep track of file and position. We have both a filehandle' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# and a I/O description to keep track of.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'LINEINFO'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
-'     '       Text
+'     '       Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'LINEINFO'    Name.Variable
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'lineinfo'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'console'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'lineinfo'    Name.Variable
 ';'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# share($LINEINFO); # <- unable to share globs' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ''            Name
 'share'       Name
 '('           Punctuation
@@ -3907,214 +3907,214 @@
 'lineinfo'    Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'   '         Text
+'   '         Text.Whitespace
 '# '          Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=pod\n\nTo finish initialization, we show the debugger greeting,\nand then call the C<afterinit()> subroutine if there is one.\n\n=cut' Comment.Multiline
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Show the debugger greeting.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '$'           Name.Variable
 'header'      Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's/.Header: ([^,]+),v(\\s+\\S+\\s+\\S+).*$/$1$2/' Literal.String.Regex
 ';'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$'           Name.Variable
 'runnonstop'  Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$\\'         Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "''"          Literal.String
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'local'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '$,'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "''"          Literal.String
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'term_pid'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 'eq'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 "'-1'"        Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"\\nDaughter DB session started...\\n"' Literal.String
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '"\\nLoading DB routines from $header\\n"' Literal.String
 ';'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 '"Editor support "' Literal.String
 ','           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 '$'           Name.Variable
 'slave_editor' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"enabled"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"available"' Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '".\\n"'      Literal.String
-'\n            ' Text
+'\n            ' Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'OUT'         Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\nEnter h or `h h\' for help, or `$doccmd perldebug\' for more help.\\n\\n"' Literal.String
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "## end else [ if ($term_pid eq '-1')" Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end unless ($runnonstop)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '## end else [ if ($notty)' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# XXX This looks like a bug to me.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Why copy to @ARGS and then futz with @args?' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@'           Name.Variable
 'ARGS'        Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@'           Name.Variable
 'ARGV'        Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '@'           Name.Variable
 'args'        Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Make sure backslashes before single quotes are stripped out, and' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# keep args unless they are numeric (XXX why?)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "# s/\\'/\\\\\\'/g;                      # removed while not justified understandably" Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "# s/(.*)/'$1'/ unless /^-?[\\d.]+$/; # ditto" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# If there was an afterinit() sub defined, call it. It will get' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# executed in our scope, so it can fiddle with debugger globals.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'defined'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 ''            Name
 'afterinit'   Name
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# May be defined in $rcfile' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '&'           Operator
 ''            Name
 'afterinit'   Name
 '('           Punctuation
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Inform us about "Stack dump during die enabled ..." in dieLevel().' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'I_m_init'    Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/perl/perl_regex-delims.output b/tests/examplefiles/perl/perl_regex-delims.output
index 41f06ea8e3..777edcd98c 100644
--- a/tests/examplefiles/perl/perl_regex-delims.output
+++ b/tests/examplefiles/perl/perl_regex-delims.output
@@ -1,800 +1,800 @@
 '#! /usr/bin/env perl' Comment.Hashbang
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'use'         Keyword
-' '           Text
+' '           Text.Whitespace
 'strict'      Name.Namespace
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'use'         Keyword
-' '           Text
+' '           Text.Whitespace
 'warnings'    Name.Namespace
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# common delimiters' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"a: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'a'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'a'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'a'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's/foo/bar/'  Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'a'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"b: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'b'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'b'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'b'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's!foo!bar!'  Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'b'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"c: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'c'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'c'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'c'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's@foo@bar@'  Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'c'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"d: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'd'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'd'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'd'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's\\foo\\bar\\' Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'd'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# balanced delimiters' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"e: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'e'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'e'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'e'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's{foo}'      Literal.String.Regex
 '{bar}'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'e'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"f: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'f'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'f'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'f'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's(foo)'      Literal.String.Regex
 '(bar)'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'f'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"g: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'g'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'g'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'g'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's<foo>'      Literal.String.Regex
 '<bar>'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'g'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"h: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'h'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'h'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'h'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's[foo]'      Literal.String.Regex
 '[bar]'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'h'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# balanced delimiters with whitespace' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"i: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'i'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'i'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'i'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's{foo} '     Literal.String.Regex
 '{bar}'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'i'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"j: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'j'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'j'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'j'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's<foo>\t\t'  Literal.String.Regex
 '<bar>'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'j'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"k: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'k'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'k'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'k'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 's(foo)\n\n\t' Literal.String.Regex
 '(bar)'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'k'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# mixed delimiters' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"l: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'l'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'l'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'l'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's{foo} '     Literal.String.Regex
 '<bar>'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'l'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"m: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'm'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'm'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'm'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's(foo) '     Literal.String.Regex
 '!bar!'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'm'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"n: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'n'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's[foo] '     Literal.String.Regex
 '$bar$'       Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'n'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# /x modifier' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"o: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'o'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'o'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'o'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's{\n\t\t\t\tfoo\n\t\t\t } ' Literal.String.Regex
 '{bar}x'      Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'o'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"p: "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'my'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'p'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"foo"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'p'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '" - "'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Name.Variable
 'p'           Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 's%\n  foo\n  %bar%x' Literal.String.Regex
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'p'           Name.Variable
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"\\n"'       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/perl6/RoleQ.pm6.output b/tests/examplefiles/perl6/RoleQ.pm6.output
index a185dd6c06..fefd74a166 100644
--- a/tests/examplefiles/perl6/RoleQ.pm6.output
+++ b/tests/examplefiles/perl6/RoleQ.pm6.output
@@ -1,7 +1,7 @@
 'role'        Keyword
-' '           Text
+' '           Text.Whitespace
 'q'           Name
-' '           Text
+' '           Text.Whitespace
 '{'           Text
 '\n'          Text
 
@@ -233,7 +233,7 @@
 '\n'          Text
 
 'role'        Keyword
-' '           Text
+' '           Text.Whitespace
 'q'           Name
 'q'           Name
 ' '           Text
diff --git a/tests/examplefiles/phix/example.exw b/tests/examplefiles/phix/example.exw
new file mode 100644
index 0000000000..583feed77d
--- /dev/null
+++ b/tests/examplefiles/phix/example.exw
@@ -0,0 +1,85 @@
+#!/bin/bash
+#[
+  echo Phix ignores all text between #[ and #] in exactly the same way as /* and */ 
+  echo (both "and" are nested comments), allowing arbitrary shell code, for example:
+  cd /user/project/working
+  exec /path/to/phix "$0" "$@"
+  exit # may be needed for the shell to ignore the rest of this file.
+# comments(/shebang) ignored by Phix end here -> #]
+-- aside: few files have [multiline] shebangs like above, but this *is* a test file.
+/*  
+    Standard
+    /*
+    **  Nested
+    **  /*
+    **      Block
+    *//*    /*
+    **          Comments, of which Phix has quite a few [ok, six] varieties...
+    **      */
+    *****/
+    **/
+*/
+--/*
+    Euphoria-compatibility-style nestable multiline comments/code
+--*/
+// This program should be runnable (C-style line comments, btw, too!)
+with javascript_semantics
+string pe, te := iff(platform()==JS?"JavaScript/browser":"Phix/desktop")
+ifdef PHIX then 
+    pe = "Phix" 
+elsedef 
+    pe = "Euphoria" -- not that this file is compatible with that..
+end ifdef 
+printf(1,"This is %s (%s)\n",{pe,te}); -- the ; is entirely optional
+assert("\n\r\b\t\\\"\'\0\e"=join({"",10,13,8,9,#5C,#22,#27,#00,#1B},""))
+assert("\#42\x43\u4445\U00105678"="B"&'C'&"\xE4\x91\x85\xF4\x85\x99\xB8")
+
+-- triplequote, triplequote indented, backtick, and doublequote strings:
+constant tqs = """
+this
+string\thing""",
+
+tqis = """
+_____this
+     string\thing""",
+
+bts = `this
+string\thing`,
+
+dqs = "this\nstring\\thing"
+assert(tqs==tqis and tqis==bts and bts==dqs and dqs==tqs)
+assert(x"1 2 34 5678_AbC"=={0x01, 0x02, 0x34, 0x56, 0x78, 0xAB, 0x0C})
+
+-- Beyond comments and strings, not much in Phix bothers a syntax colourer.
+-- Originally I had another 380+ lines in here, that didn't prove anything.
+
+function merge_sort(sequence x)
+    -- put x into ascending order using a recursive merge sort
+     if length(x)<=1 then
+         return x  -- trivial case
+     end if
+     integer midpoint = floor(length(x)/2)
+     sequence merged = {},
+          first_half = merge_sort(x[1..midpoint]),
+         second_half = merge_sort(x[midpoint+1..$])
+     -- merge the two sorted halves into one
+     while length(first_half)>0 
+       and length(second_half)>0 do
+         if first_half[1]<=second_half[1] then
+             merged = append(merged, first_half[1])
+             first_half = first_half[2..$]
+         else
+             merged = append(merged, second_half[1])
+             second_half = second_half[2..$]
+         end if
+     end while
+     -- result is the merged data plus any leftovers
+     return merged & first_half & second_half
+end function
+
+?merge_sort({9, 10, 3, 1, 4, 5, 8, 7, 6, 2})
+?{1,0(2)10,0b11,0d4,0t5,0(6)10,0(7)10,0o10,0x9,#A} -- [the same 1..10 but with extra weirdness]
+
+wait_key()
+
+
diff --git a/tests/examplefiles/phix/example.exw.output b/tests/examplefiles/phix/example.exw.output
new file mode 100644
index 0000000000..107709b042
--- /dev/null
+++ b/tests/examplefiles/phix/example.exw.output
@@ -0,0 +1,606 @@
+'#!/bin/bash' Comment.Single
+'\n'          Text.Whitespace
+
+'#['          Comment.Multiline
+'\n  echo Phix ignores all text between ' Comment.Multiline
+'#['          Comment.Multiline
+' and '       Comment.Multiline
+'#]'          Comment.Multiline
+' in exactly the same way as ' Comment.Multiline
+'/*'          Comment.Multiline
+' and '       Comment.Multiline
+'*/'          Comment.Multiline
+' \n  echo (both "and" are nested comments), allowing arbitrary shell code, for example:\n  cd ' Comment.Multiline
+'/'           Comment.Multiline
+'user'        Comment.Multiline
+'/'           Comment.Multiline
+'project'     Comment.Multiline
+'/'           Comment.Multiline
+'working\n  exec ' Comment.Multiline
+'/'           Comment.Multiline
+'path'        Comment.Multiline
+'/'           Comment.Multiline
+'to'          Comment.Multiline
+'/'           Comment.Multiline
+'phix "$0" "$@"\n  exit ' Comment.Multiline
+'#'           Comment.Multiline
+' may be needed for the shell to ignore the rest of this file.\n' Comment.Multiline
+
+'#'           Comment.Multiline
+' comments('  Comment.Multiline
+'/'           Comment.Multiline
+'shebang) ignored by Phix end here -> ' Comment.Multiline
+'#]'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'-- aside: few files have [multiline] shebangs like above, but this *is* a test file.' Comment.Single
+'\n'          Text.Whitespace
+
+'/*'          Comment.Multiline
+'  \n    Standard\n    ' Comment.Multiline
+'/*'          Comment.Multiline
+'\n    '      Comment.Multiline
+'*'           Comment.Multiline
+'*'           Comment.Multiline
+'  Nested\n    ' Comment.Multiline
+'*'           Comment.Multiline
+'*'           Comment.Multiline
+'  '          Comment.Multiline
+'/*'          Comment.Multiline
+'\n    '      Comment.Multiline
+'*'           Comment.Multiline
+'*'           Comment.Multiline
+'      Block\n    ' Comment.Multiline
+'*/'          Comment.Multiline
+'/*'          Comment.Multiline
+'    '        Comment.Multiline
+'/*'          Comment.Multiline
+'\n    '      Comment.Multiline
+'*'           Comment.Multiline
+'*'           Comment.Multiline
+'          Comments, of which Phix has quite a few [ok, six] varieties...\n    ' Comment.Multiline
+'*'           Comment.Multiline
+'*'           Comment.Multiline
+'      '      Comment.Multiline
+'*/'          Comment.Multiline
+'\n    '      Comment.Multiline
+'*'           Comment.Multiline
+'*'           Comment.Multiline
+'*'           Comment.Multiline
+'*'           Comment.Multiline
+'*/'          Comment.Multiline
+'\n    '      Comment.Multiline
+'*'           Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Comment.Multiline
+
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'--/*'        Comment.Multiline
+'\n    Euphoria-compatibility-style nestable multiline comments' Comment.Multiline
+'/'           Comment.Multiline
+'code\n--'    Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'// This program should be runnable (C-style line comments, btw, too!)' Comment.Single
+'\n'          Text.Whitespace
+
+'with'        Keyword.Declaration
+' '           Text.Whitespace
+'javascript_semantics' Keyword.Declaration
+'\n'          Text.Whitespace
+
+'string'      Name.Function
+' '           Text.Whitespace
+'pe'          Text
+','           Operator
+' '           Text.Whitespace
+'te'          Text
+' '           Text.Whitespace
+':='          Operator
+' '           Text.Whitespace
+'iff'         Name.Function
+'('           Operator
+'platform'    Name.Function
+'('           Operator
+')'           Operator
+'=='          Operator
+'JS'          Name.Constant
+'?'           Operator
+'"JavaScript/browser"' Literal.String.Other
+':'           Operator
+'"Phix/desktop"' Literal.String.Other
+')'           Operator
+'\n'          Text.Whitespace
+
+'ifdef'       Keyword.Declaration
+' '           Text.Whitespace
+'PHIX'        Text
+' '           Text.Whitespace
+'then'        Keyword.Declaration
+' \n    '     Text.Whitespace
+'pe'          Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"Phix"'      Literal.String.Other
+' \n'         Text.Whitespace
+
+'elsedef'     Keyword.Declaration
+' \n    '     Text.Whitespace
+'pe'          Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"Euphoria"'  Literal.String.Other
+' '           Text.Whitespace
+'-- not that this file is compatible with that..' Comment.Single
+'\n'          Text.Whitespace
+
+'end'         Keyword.Declaration
+' '           Text.Whitespace
+'ifdef'       Keyword.Declaration
+' \n'         Text.Whitespace
+
+'printf'      Name.Function
+'('           Operator
+'1'           Text
+','           Operator
+'"This is %s (%s)\\n"' Literal.String.Other
+','           Operator
+'{'           Operator
+'pe'          Text
+','           Operator
+'te'          Text
+'}'           Operator
+')'           Operator
+';'           Operator
+' '           Text.Whitespace
+'-- the ; is entirely optional' Comment.Single
+'\n'          Text.Whitespace
+
+'assert'      Name.Function
+'('           Operator
+'"\\n\\r\\b\\t\\\\\\"\\\'\\0\\e"' Literal.String.Other
+'='           Operator
+'join'        Name.Function
+'('           Operator
+'{'           Operator
+'""'          Literal.String.Other
+','           Operator
+'10'          Text
+','           Operator
+'13'          Text
+','           Operator
+'8'           Text
+','           Operator
+'9'           Text
+','           Operator
+'#'           Operator
+'5C'          Text
+','           Operator
+'#'           Operator
+'22'          Text
+','           Operator
+'#'           Operator
+'27'          Text
+','           Operator
+'#'           Operator
+'00'          Text
+','           Operator
+'#'           Operator
+'1B'          Text
+'}'           Operator
+','           Operator
+'""'          Literal.String.Other
+')'           Operator
+')'           Operator
+'\n'          Text.Whitespace
+
+'assert'      Name.Function
+'('           Operator
+'"\\#42\\x43\\u4445\\U00105678"' Literal.String.Other
+'='           Operator
+'"B"'         Literal.String.Other
+'&'           Operator
+"'C'"         Literal.String.Other
+'&'           Operator
+'"\\xE4\\x91\\x85\\xF4\\x85\\x99\\xB8"' Literal.String.Other
+')'           Operator
+'\n\n'        Text.Whitespace
+
+'-- triplequote, triplequote indented, backtick, and doublequote strings:' Comment.Single
+'\n'          Text.Whitespace
+
+'constant'    Keyword.Declaration
+' '           Text.Whitespace
+'tqs'         Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'""'          Literal.String.Other
+'"\nthis\nstring\\thing"' Literal.String.Other
+'""'          Literal.String.Other
+','           Operator
+'\n\n'        Text.Whitespace
+
+'tqis'        Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'""'          Literal.String.Other
+'"\n_____this\n     string\\thing"' Literal.String.Other
+'""'          Literal.String.Other
+','           Operator
+'\n\n'        Text.Whitespace
+
+'bts'         Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'`this\nstring\\thing`' Literal.String.Other
+','           Operator
+'\n\n'        Text.Whitespace
+
+'dqs'         Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"this\\nstring\\\\thing"' Literal.String.Other
+'\n'          Text.Whitespace
+
+'assert'      Name.Function
+'('           Operator
+'tqs'         Text
+'=='          Operator
+'tqis'        Text
+' '           Text.Whitespace
+'and'         Keyword.Declaration
+' '           Text.Whitespace
+'tqis'        Text
+'=='          Operator
+'bts'         Text
+' '           Text.Whitespace
+'and'         Keyword.Declaration
+' '           Text.Whitespace
+'bts'         Text
+'=='          Operator
+'dqs'         Text
+' '           Text.Whitespace
+'and'         Keyword.Declaration
+' '           Text.Whitespace
+'dqs'         Text
+'=='          Operator
+'tqs'         Text
+')'           Operator
+'\n'          Text.Whitespace
+
+'assert'      Name.Function
+'('           Operator
+'x'           Text
+'"1 2 34 5678_AbC"' Literal.String.Other
+'=='          Operator
+'{'           Operator
+'0x01'        Text
+','           Operator
+' '           Text.Whitespace
+'0x02'        Text
+','           Operator
+' '           Text.Whitespace
+'0x34'        Text
+','           Operator
+' '           Text.Whitespace
+'0x56'        Text
+','           Operator
+' '           Text.Whitespace
+'0x78'        Text
+','           Operator
+' '           Text.Whitespace
+'0xAB'        Text
+','           Operator
+' '           Text.Whitespace
+'0x0C'        Text
+'}'           Operator
+')'           Operator
+'\n\n'        Text.Whitespace
+
+'-- Beyond comments and strings, not much in Phix bothers a syntax colourer.' Comment.Single
+'\n'          Text.Whitespace
+
+"-- Originally I had another 380+ lines in here, that didn't prove anything." Comment.Single
+'\n\n'        Text.Whitespace
+
+'function'    Keyword.Declaration
+' '           Text.Whitespace
+'merge_sort'  Text
+'('           Operator
+'sequence'    Name.Function
+' '           Text.Whitespace
+'x'           Text
+')'           Operator
+'\n    '      Text.Whitespace
+'-- put x into ascending order using a recursive merge sort' Comment.Single
+'\n     '     Text.Whitespace
+'if'          Keyword.Declaration
+' '           Text.Whitespace
+'length'      Name.Function
+'('           Operator
+'x'           Text
+')'           Operator
+'<'           Operator
+'='           Operator
+'1'           Text
+' '           Text.Whitespace
+'then'        Keyword.Declaration
+'\n         ' Text.Whitespace
+'return'      Keyword.Declaration
+' '           Text.Whitespace
+'x'           Text
+'  '          Text.Whitespace
+'-- trivial case' Comment.Single
+'\n     '     Text.Whitespace
+'end'         Keyword.Declaration
+' '           Text.Whitespace
+'if'          Keyword.Declaration
+'\n     '     Text.Whitespace
+'integer'     Name.Function
+' '           Text.Whitespace
+'midpoint'    Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'floor'       Name.Function
+'('           Operator
+'length'      Name.Function
+'('           Operator
+'x'           Text
+')'           Operator
+'/'           Operator
+'2'           Text
+')'           Operator
+'\n     '     Text.Whitespace
+'sequence'    Name.Function
+' '           Text.Whitespace
+'merged'      Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'{'           Operator
+'}'           Operator
+','           Operator
+'\n          ' Text.Whitespace
+'first_half'  Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'merge_sort'  Text
+'('           Operator
+'x'           Text
+'['           Operator
+'1'           Text
+'.'           Operator
+'.'           Operator
+'midpoint'    Text
+']'           Operator
+')'           Operator
+','           Operator
+'\n         ' Text.Whitespace
+'second_half' Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'merge_sort'  Text
+'('           Operator
+'x'           Text
+'['           Operator
+'midpoint'    Text
+'+'           Operator
+'1'           Text
+'.'           Operator
+'.'           Operator
+'$'           Operator
+']'           Operator
+')'           Operator
+'\n     '     Text.Whitespace
+'-- merge the two sorted halves into one' Comment.Single
+'\n     '     Text.Whitespace
+'while'       Keyword.Declaration
+' '           Text.Whitespace
+'length'      Name.Function
+'('           Operator
+'first_half'  Text
+')'           Operator
+'>'           Operator
+'0'           Text
+' \n       '  Text.Whitespace
+'and'         Keyword.Declaration
+' '           Text.Whitespace
+'length'      Name.Function
+'('           Operator
+'second_half' Text
+')'           Operator
+'>'           Operator
+'0'           Text
+' '           Text.Whitespace
+'do'          Keyword.Declaration
+'\n         ' Text.Whitespace
+'if'          Keyword.Declaration
+' '           Text.Whitespace
+'first_half'  Text
+'['           Operator
+'1'           Text
+']'           Operator
+'<'           Operator
+'='           Operator
+'second_half' Text
+'['           Operator
+'1'           Text
+']'           Operator
+' '           Text.Whitespace
+'then'        Keyword.Declaration
+'\n             ' Text.Whitespace
+'merged'      Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'append'      Name.Function
+'('           Operator
+'merged'      Text
+','           Operator
+' '           Text.Whitespace
+'first_half'  Text
+'['           Operator
+'1'           Text
+']'           Operator
+')'           Operator
+'\n             ' Text.Whitespace
+'first_half'  Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'first_half'  Text
+'['           Operator
+'2'           Text
+'.'           Operator
+'.'           Operator
+'$'           Operator
+']'           Operator
+'\n         ' Text.Whitespace
+'else'        Keyword.Declaration
+'\n             ' Text.Whitespace
+'merged'      Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'append'      Name.Function
+'('           Operator
+'merged'      Text
+','           Operator
+' '           Text.Whitespace
+'second_half' Text
+'['           Operator
+'1'           Text
+']'           Operator
+')'           Operator
+'\n             ' Text.Whitespace
+'second_half' Text
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'second_half' Text
+'['           Operator
+'2'           Text
+'.'           Operator
+'.'           Operator
+'$'           Operator
+']'           Operator
+'\n         ' Text.Whitespace
+'end'         Keyword.Declaration
+' '           Text.Whitespace
+'if'          Keyword.Declaration
+'\n     '     Text.Whitespace
+'end'         Keyword.Declaration
+' '           Text.Whitespace
+'while'       Keyword.Declaration
+'\n     '     Text.Whitespace
+'-- result is the merged data plus any leftovers' Comment.Single
+'\n     '     Text.Whitespace
+'return'      Keyword.Declaration
+' '           Text.Whitespace
+'merged'      Text
+' '           Text.Whitespace
+'&'           Operator
+' '           Text.Whitespace
+'first_half'  Text
+' '           Text.Whitespace
+'&'           Operator
+' '           Text.Whitespace
+'second_half' Text
+'\n'          Text.Whitespace
+
+'end'         Keyword.Declaration
+' '           Text.Whitespace
+'function'    Keyword.Declaration
+'\n\n'        Text.Whitespace
+
+'?'           Operator
+'merge_sort'  Text
+'('           Operator
+'{'           Operator
+'9'           Text
+','           Operator
+' '           Text.Whitespace
+'10'          Text
+','           Operator
+' '           Text.Whitespace
+'3'           Text
+','           Operator
+' '           Text.Whitespace
+'1'           Text
+','           Operator
+' '           Text.Whitespace
+'4'           Text
+','           Operator
+' '           Text.Whitespace
+'5'           Text
+','           Operator
+' '           Text.Whitespace
+'8'           Text
+','           Operator
+' '           Text.Whitespace
+'7'           Text
+','           Operator
+' '           Text.Whitespace
+'6'           Text
+','           Operator
+' '           Text.Whitespace
+'2'           Text
+'}'           Operator
+')'           Operator
+'\n'          Text.Whitespace
+
+'?'           Operator
+'{'           Operator
+'1'           Text
+','           Operator
+'0'           Text
+'('           Operator
+'2'           Text
+')'           Operator
+'10'          Text
+','           Operator
+'0b11'        Text
+','           Operator
+'0d4'         Text
+','           Operator
+'0t5'         Text
+','           Operator
+'0'           Text
+'('           Operator
+'6'           Text
+')'           Operator
+'10'          Text
+','           Operator
+'0'           Text
+'('           Operator
+'7'           Text
+')'           Operator
+'10'          Text
+','           Operator
+'0o10'        Text
+','           Operator
+'0x9'         Text
+','           Operator
+'#'           Operator
+'A'           Text
+'}'           Operator
+' '           Text.Whitespace
+'-- [the same 1..10 but with extra weirdness]' Comment.Single
+'\n\n'        Text.Whitespace
+
+'wait_key'    Name.Function
+'('           Operator
+')'           Operator
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/portugol/example.alg b/tests/examplefiles/portugol/example.alg
new file mode 100644
index 0000000000..c57545e1c5
--- /dev/null
+++ b/tests/examplefiles/portugol/example.alg
@@ -0,0 +1,184 @@
+Algoritmo "semnome"
+// Descrição   : Aqui você descreve o que o programa faz!
+// Autor(a)    : Lorhan Sohaky
+// Data atual  : 04/12/2022
+Var
+// Seção de Declarações das variáveis 
+
+meu_caractere: caractere
+meu_inteiro: inteiro
+meu_real: real
+meu_vetor: vetor[1..10] de inteiro
+
+Inicio
+// Seção de Comandos, procedimento, funções, operadores, etc... 
+
+    escreva("Digite N1:")
+    leia(n1)
+    n1 <- 1
+
+    escreva("Digite N2:")
+    leia(n2)
+
+    escreval("Valor 1:", n1)
+    escreva("Valor 2:", n2)
+
+    resultado <- n1 + n2
+    escreval(n1,"+", n2, "=", resultado)
+
+    resultado <- n1 - n2
+    escreval(n1,"-", n2, "=", resultado)
+
+    resultado <- n1 * n2
+    escreval(n1,"*", n2, "=", resultado)
+
+    resultado <- n1 / n2
+    escreval(n1,"/", n2, "=", resultado)
+
+    resultado <- n1 DIV n2
+    escreval(n1,"DIV", n2, "=", resultado)
+
+    resultado <- n1 MOD n2
+    escreval(n1,"MOD", n2, "=", resultado)
+
+    me <- (n1 + n2 + n3) / 3
+    escreva("Média:", me)
+
+    vq <- sm / 5
+    vp <- sm - (qq * vq)
+    vpd <- sm - ((vp * 15) / 100)
+
+    se ( n1 > n2 ) entao
+        escreva("N1 é maior que N2")
+    fimse
+
+    se ( n2 > n1 ) entao
+        escreva("N2 é maior que N1")
+    fimse
+
+    se ( n2 = n1 ) entao
+        escreva("N2 = N1")
+    fimse 
+
+    se ( n  mod 2 <> 0 ) entao
+        escreva("Impar")
+    senao
+        escreva("Par")
+    fimse
+
+    se (n < 10) entao
+        escreva("N < 10")
+    senao
+        se ( n = 10 ) entao
+            escreva("N = 10")
+        senao
+            se (n > 10) e (n < 50) entao
+                escreva("10 < N < 50")
+            senao
+                se (n = 50) entao
+                    escreva("N = 50")
+                senao
+                    escreva("N > 50")
+                fimse
+            fimse
+        fimse
+    fimse
+
+    se ( x = "M" ) ou ( x = "masculino" ) entao
+        escreva("Sexo: masculino")
+    senao 
+        se ( x = "F" ) ou ( x = "feminino" ) entao
+            escreva("Sexo: feminino")
+        senao
+            escreva("Digite novamente!")
+        fimse
+    fimse
+
+    se (a >= b) e (b >= c) entao
+        maior <- a
+        menor <- c
+    senao
+        se (a >= c) e (c >= b) entao
+            maior <- a
+            menor <- b
+        senao
+            se (b >= a) e (a >= c) entao
+                maior <- b
+                menor <- c
+            senao
+                se (b >= c) e (c >= a) entao
+                    maior <- b
+                    menor <- a
+                senao
+                    se (c >= a) e (a >= b) entao
+                        maior <- c
+                        menor <- b
+                    senao
+                        maior <- c
+                        menor <- a
+                    fimse
+                fimse
+            fimse
+        fimse
+    fimse
+
+    escolha (n)
+    caso 1
+        escreva("Janeiro")
+    caso 2
+        escreva("Fevereiro")
+    caso 3
+        escreva("Marco")
+    caso 4
+        escreva("Abril")
+    caso 5
+        escreva("Maio")
+    caso 6
+        escreva("Junho")
+    caso 7
+        escreva("Julho")
+    caso 8
+        escreva("Agosto")
+    caso 9
+        escreva("Setembro")
+    caso 10
+        escreva("Outubro")
+    caso 11
+        escreva("Novembro")
+    caso 12
+        escreva("Dezembro")
+    outrocaso
+        escreva("'Numero invalido'")
+    fimescolha
+
+    enquanto (n <11) faca
+        escreva(n)
+        n <- n + 1
+    fimenquanto
+
+    para n de 1 ate 10 faca
+        escreva(n)
+    fimpara
+
+    funcao soma: inteiro
+        var aux: inteiro
+        inicio
+        // n, m e res são variáveis globais
+        aux <- n + m
+        retorne aux
+    fimfuncao
+
+    res <- soma
+    escreva(res)
+
+     funcao soma (x,y: inteiro): inteiro
+        inicio
+        retorne x + y
+    fimfuncao
+
+    n <- 4
+    m <- -9
+    res <- soma(n,m)
+    Pi * 10
+    escreva(res * Pi * exp(10))
+Fimalgoritmo
\ No newline at end of file
diff --git a/tests/examplefiles/portugol/example.alg.output b/tests/examplefiles/portugol/example.alg.output
new file mode 100644
index 0000000000..2db9b36fa7
--- /dev/null
+++ b/tests/examplefiles/portugol/example.alg.output
@@ -0,0 +1,1195 @@
+'Algoritmo'   Keyword
+' '           Text.Whitespace
+'"'           Literal.String
+'semnome'     Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'// Descrição   : Aqui você descreve o que o programa faz!' Comment.Single
+'\n'          Text.Whitespace
+
+'// Autor(a)    : Lorhan Sohaky' Comment.Single
+'\n'          Text.Whitespace
+
+'// Data atual  : 04/12/2022' Comment.Single
+'\n'          Text.Whitespace
+
+'Var'         Keyword
+'\n'          Text.Whitespace
+
+'// Seção de Declarações das variáveis ' Comment.Single
+'\n\n'        Text.Whitespace
+
+'meu_caractere' Name
+':'           Operator
+' '           Text.Whitespace
+'caractere'   Keyword.Type
+'\n'          Text.Whitespace
+
+'meu_inteiro' Name
+':'           Operator
+' '           Text.Whitespace
+'inteiro'     Keyword.Type
+'\n'          Text.Whitespace
+
+'meu_real'    Name
+':'           Operator
+' '           Text.Whitespace
+'real'        Keyword.Type
+'\n'          Text.Whitespace
+
+'meu_vetor'   Name
+':'           Operator
+' '           Text.Whitespace
+'vetor'       Keyword
+'['           Punctuation
+'1'           Literal.Number.Integer
+'.'           Operator
+'.'           Operator
+'10'          Literal.Number.Integer
+']'           Punctuation
+' '           Text.Whitespace
+'de'          Name
+' '           Text.Whitespace
+'inteiro'     Keyword.Type
+'\n\n'        Text.Whitespace
+
+'Inicio'      Keyword
+'\n'          Text.Whitespace
+
+'// Seção de Comandos, procedimento, funções, operadores, etc... ' Comment.Single
+'\n\n    '    Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Digite N1:'  Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'leia'        Keyword
+'('           Punctuation
+'n1'          Name
+')'           Punctuation
+'\n    '      Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'\n\n    '    Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Digite N2:'  Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'leia'        Keyword
+'('           Punctuation
+'n2'          Name
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'escreval'    Keyword
+'('           Punctuation
+'"'           Literal.String
+'Valor 1:'    Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'n1'          Name
+')'           Punctuation
+'\n    '      Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Valor 2:'    Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'n2'          Name
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'resultado'   Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'n2'          Name
+'\n    '      Text.Whitespace
+'escreval'    Keyword
+'('           Punctuation
+'n1'          Name
+','           Operator
+'"'           Literal.String
+'+'           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'n2'          Name
+','           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'='           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'resultado'   Name
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'resultado'   Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'n2'          Name
+'\n    '      Text.Whitespace
+'escreval'    Keyword
+'('           Punctuation
+'n1'          Name
+','           Operator
+'"'           Literal.String
+'-'           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'n2'          Name
+','           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'='           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'resultado'   Name
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'resultado'   Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'n2'          Name
+'\n    '      Text.Whitespace
+'escreval'    Keyword
+'('           Punctuation
+'n1'          Name
+','           Operator
+'"'           Literal.String
+'*'           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'n2'          Name
+','           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'='           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'resultado'   Name
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'resultado'   Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'n2'          Name
+'\n    '      Text.Whitespace
+'escreval'    Keyword
+'('           Punctuation
+'n1'          Name
+','           Operator
+'"'           Literal.String
+'/'           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'n2'          Name
+','           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'='           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'resultado'   Name
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'resultado'   Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+'DIV'         Keyword
+' '           Text.Whitespace
+'n2'          Name
+'\n    '      Text.Whitespace
+'escreval'    Keyword
+'('           Punctuation
+'n1'          Name
+','           Operator
+'"'           Literal.String
+'DIV'         Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'n2'          Name
+','           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'='           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'resultado'   Name
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'resultado'   Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+'MOD'         Keyword
+' '           Text.Whitespace
+'n2'          Name
+'\n    '      Text.Whitespace
+'escreval'    Keyword
+'('           Punctuation
+'n1'          Name
+','           Operator
+'"'           Literal.String
+'MOD'         Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'n2'          Name
+','           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'='           Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'resultado'   Name
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'me'          Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'('           Punctuation
+'n1'          Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'n2'          Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'n3'          Name
+')'           Punctuation
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+'\n    '      Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Média:'      Literal.String
+'"'           Literal.String
+','           Operator
+' '           Text.Whitespace
+'me'          Name
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'vq'          Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'sm'          Name
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'5'           Literal.Number.Integer
+'\n    '      Text.Whitespace
+'vp'          Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'sm'          Name
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'('           Punctuation
+'qq'          Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'vq'          Name
+')'           Punctuation
+'\n    '      Text.Whitespace
+'vpd'         Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'sm'          Name
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'(('          Punctuation
+'vp'          Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'15'          Literal.Number.Integer
+')'           Punctuation
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'100'         Literal.Number.Integer
+')'           Punctuation
+'\n\n    '    Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'n2'          Name
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'N1 é maior que N2' Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'fimse'       Keyword
+'\n\n    '    Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'n2'          Name
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'N2 é maior que N1' Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'fimse'       Keyword
+'\n\n    '    Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'n2'          Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'n1'          Name
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'N2 = N1'     Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'fimse'       Keyword
+' \n\n    '   Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'n'           Name
+'  '          Text.Whitespace
+'mod'         Keyword
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+' '           Text.Whitespace
+'<'           Operator
+'>'           Operator
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Impar'       Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'senao'       Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Par'         Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'fimse'       Keyword
+'\n\n    '    Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'<'           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'N < 10'      Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'senao'       Keyword
+'\n        '  Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n            ' Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'N = 10'      Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n        '  Text.Whitespace
+'senao'       Keyword
+'\n            ' Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+')'           Punctuation
+' '           Text.Whitespace
+'e'           Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'<'           Operator
+' '           Text.Whitespace
+'50'          Literal.Number.Integer
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n                ' Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'10 < N < 50' Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n            ' Text.Whitespace
+'senao'       Keyword
+'\n                ' Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'50'          Literal.Number.Integer
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n                    ' Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'N = 50'      Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n                ' Text.Whitespace
+'senao'       Keyword
+'\n                    ' Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'N > 50'      Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n                ' Text.Whitespace
+'fimse'       Keyword
+'\n            ' Text.Whitespace
+'fimse'       Keyword
+'\n        '  Text.Whitespace
+'fimse'       Keyword
+'\n    '      Text.Whitespace
+'fimse'       Keyword
+'\n\n    '    Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'x'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'M'           Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'ou'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'x'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'masculino'   Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Sexo: masculino' Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'senao'       Keyword
+' \n        ' Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'x'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'F'           Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'ou'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'x'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'feminino'    Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n            ' Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Sexo: feminino' Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n        '  Text.Whitespace
+'senao'       Keyword
+'\n            ' Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Digite novamente!' Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n        '  Text.Whitespace
+'fimse'       Keyword
+'\n    '      Text.Whitespace
+'fimse'       Keyword
+'\n\n    '    Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'a'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'b'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'e'           Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'b'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'c'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n        '  Text.Whitespace
+'maior'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'a'           Name
+'\n        '  Text.Whitespace
+'menor'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'c'           Name
+'\n    '      Text.Whitespace
+'senao'       Keyword
+'\n        '  Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'a'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'c'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'e'           Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'c'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'b'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n            ' Text.Whitespace
+'maior'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'a'           Name
+'\n            ' Text.Whitespace
+'menor'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'b'           Name
+'\n        '  Text.Whitespace
+'senao'       Keyword
+'\n            ' Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'b'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'a'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'e'           Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'a'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'c'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n                ' Text.Whitespace
+'maior'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'b'           Name
+'\n                ' Text.Whitespace
+'menor'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'c'           Name
+'\n            ' Text.Whitespace
+'senao'       Keyword
+'\n                ' Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'b'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'c'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'e'           Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'c'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'a'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n                    ' Text.Whitespace
+'maior'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'b'           Name
+'\n                    ' Text.Whitespace
+'menor'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'a'           Name
+'\n                ' Text.Whitespace
+'senao'       Keyword
+'\n                    ' Text.Whitespace
+'se'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'c'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'a'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'e'           Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'a'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'b'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'entao'       Keyword
+'\n                        ' Text.Whitespace
+'maior'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'c'           Name
+'\n                        ' Text.Whitespace
+'menor'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'b'           Name
+'\n                    ' Text.Whitespace
+'senao'       Keyword
+'\n                        ' Text.Whitespace
+'maior'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'c'           Name
+'\n                        ' Text.Whitespace
+'menor'       Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'a'           Name
+'\n                    ' Text.Whitespace
+'fimse'       Keyword
+'\n                ' Text.Whitespace
+'fimse'       Keyword
+'\n            ' Text.Whitespace
+'fimse'       Keyword
+'\n        '  Text.Whitespace
+'fimse'       Keyword
+'\n    '      Text.Whitespace
+'fimse'       Keyword
+'\n\n    '    Text.Whitespace
+'escolha'     Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Janeiro'     Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'2'           Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Fevereiro'   Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Marco'       Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'4'           Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Abril'       Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'5'           Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Maio'        Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'6'           Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Junho'       Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'7'           Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Julho'       Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'8'           Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Agosto'      Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'9'           Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Setembro'    Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Outubro'     Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'11'          Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Novembro'    Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'caso'        Keyword
+' '           Text.Whitespace
+'12'          Literal.Number.Integer
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+'Dezembro'    Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'outrocaso'   Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'"'           Literal.String
+"'Numero invalido'" Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n    '      Text.Whitespace
+'fimescolha'  Keyword
+'\n\n    '    Text.Whitespace
+'enquanto'    Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'<'           Operator
+'11'          Literal.Number.Integer
+')'           Punctuation
+' '           Text.Whitespace
+'faca'        Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'n'           Name
+')'           Punctuation
+'\n        '  Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'\n    '      Text.Whitespace
+'fimenquanto' Keyword
+'\n\n    '    Text.Whitespace
+'para'        Keyword
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'de'          Name
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+' '           Text.Whitespace
+'ate'         Keyword
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+' '           Text.Whitespace
+'faca'        Keyword
+'\n        '  Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'n'           Name
+')'           Punctuation
+'\n    '      Text.Whitespace
+'fimpara'     Keyword
+'\n\n    '    Text.Whitespace
+'funcao'      Keyword
+' '           Text.Whitespace
+'soma'        Name.Function
+':'           Operator
+' '           Text.Whitespace
+'inteiro'     Keyword.Type
+'\n        '  Text.Whitespace
+'var'         Keyword
+' '           Text.Whitespace
+'aux'         Name
+':'           Operator
+' '           Text.Whitespace
+'inteiro'     Keyword.Type
+'\n        '  Text.Whitespace
+'inicio'      Keyword
+'\n        '  Text.Whitespace
+'// n, m e res são variáveis globais' Comment.Single
+'\n        '  Text.Whitespace
+'aux'         Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'m'           Name
+'\n        '  Text.Whitespace
+'retorne'     Keyword
+' '           Text.Whitespace
+'aux'         Name
+'\n    '      Text.Whitespace
+'fimfuncao'   Keyword
+'\n\n    '    Text.Whitespace
+'res'         Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'soma'        Name.Label
+'\n    '      Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'res'         Name
+')'           Punctuation
+'\n\n     '   Text.Whitespace
+'funcao'      Keyword
+' '           Text.Whitespace
+'soma'        Name.Function
+' '           Text.Whitespace
+'('           Punctuation
+'x'           Name
+','           Operator
+'y'           Name
+':'           Operator
+' '           Text.Whitespace
+'inteiro'     Keyword.Type
+')'           Punctuation
+':'           Operator
+' '           Text.Whitespace
+'inteiro'     Keyword.Type
+'\n        '  Text.Whitespace
+'inicio'      Keyword
+'\n        '  Text.Whitespace
+'retorne'     Keyword
+' '           Text.Whitespace
+'x'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'y'           Name
+'\n    '      Text.Whitespace
+'fimfuncao'   Keyword
+'\n\n    '    Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'4'           Literal.Number.Integer
+'\n    '      Text.Whitespace
+'m'           Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'-'           Operator
+'9'           Literal.Number.Integer
+'\n    '      Text.Whitespace
+'res'         Name
+' '           Text.Whitespace
+'<-'          Operator
+' '           Text.Whitespace
+'soma'        Name.Label
+'('           Punctuation
+'n'           Name
+','           Operator
+'m'           Name
+')'           Punctuation
+'\n    '      Text.Whitespace
+'Pi'          Keyword
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'\n    '      Text.Whitespace
+'escreva'     Keyword
+'('           Punctuation
+'res'         Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'Pi'          Keyword
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'exp'         Name
+'('           Punctuation
+'10'          Literal.Number.Integer
+'))'          Punctuation
+'\n'          Text.Whitespace
+
+'Fimalgoritmo' Keyword
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/postgresql/postgresql_test.txt.output b/tests/examplefiles/postgresql/postgresql_test.txt.output
index fd9e2cd56c..1e73a265d7 100644
--- a/tests/examplefiles/postgresql/postgresql_test.txt.output
+++ b/tests/examplefiles/postgresql/postgresql_test.txt.output
@@ -73,7 +73,7 @@
 '$'           Literal.String
 ''            Literal.String.Delimiter
 '$'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'if'          Keyword
@@ -84,19 +84,19 @@
 ' '           Text
 'b'           Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'return'      Keyword
 ' '           Text
 'a'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'return'      Keyword
 ' '           Text
 'b'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$'           Literal.String
 ''            Literal.String.Delimiter
diff --git a/tests/examplefiles/pot/de.MoinMoin.po.output b/tests/examplefiles/pot/de.MoinMoin.po.output
index 0ece42ccb6..c75351b369 100644
--- a/tests/examplefiles/pot/de.MoinMoin.po.output
+++ b/tests/examplefiles/pot/de.MoinMoin.po.output
@@ -1,9205 +1,9205 @@
 '## Please edit system and help pages ONLY in the moinmaster wiki! For more' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## information, please see MoinMaster:MoinPagesEditorGroup.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##master-page:None' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##master-date:None' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#acl MoinPagesEditorGroup:read,write,delete,revert All:read' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#format gettext' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#language de' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# MoinMoin de system text translation' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Project-Id-Version:' Name.Property
 ' MoinMoin 1.6\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Report-Msgid-Bugs-To:' Name.Property
 ' \\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'POT-Creation-Date:' Name.Property
 ' 2007-05-26 23:12+0200\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'PO-Revision-Date:' Name.Property
 ' 2005-09-21 00:00+0100\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Last-Translator:' Name.Property
 ' Thomas Waldmann <tw-public@gmx.de>\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Language-Team:' Name.Property
 ' German <moin-devel@lists.sourceforge.net>\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'MIME-Version:' Name.Property
 ' 1.0\\n"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Content-Type:' Name.Property
 ' text/plain; charset=utf-8\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Content-Transfer-Encoding:' Name.Property
 ' 8bit\\n"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'X-Language:' Name.Property
 ' Deutsch\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'X-Language-in-English:' Name.Property
 ' German\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'X-HasWikiMarkup:' Name.Property
 ' True\\n"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'X-Direction:' Name.Property
 ' ltr\\n"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"This wiki is not enabled for mail processing.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Contact the owner of the wiki, who can enable email."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"In diesem Wiki ist Mail-Verarbeitung nicht eingeschaltet.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bitte kontaktieren Sie den Eigentümer des Wiki, der die Mailfunktionen "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"einschalten kann."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Please provide a valid email address!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Bitte eine gültige E-Mail-Adresse angeben!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Found no account matching the given email address \'%(email)s\'!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Es wurde kein Benutzerkonto mit der E-Mail-Adresse \'%(email)s\' gefunden!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Use UserPreferences to change your settings or create an account."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Benutzen Sie BenutzerEinstellungen, um Ihre Einstellungen zu ändern oder ein "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Konto zu erzeugen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Empty user name. Please enter a user name."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Leerer Benutzername, bitte geben Sie einen Benutzernamen ein."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Invalid user name {{{\'%s\'}}}.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Name may contain any Unicode alpha numeric character, with optional one\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"space between words. Group page name is not allowed."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ungültiger Benutzername {{{\'%s\'}}}.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Der Name darf beliebige alphanumerische Unicode-Zeichen enthalten, mit "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"optional einem\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Leerzeichen zwischen den Worten. Gruppennamen sind nicht erlaubt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"This user name already belongs to somebody else."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dieser Benutzername gehört bereits jemand anderem."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Passwords don\'t match!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Passworte sind nicht gleich!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Please specify a password!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Bitte geben Sie ein Passwort an!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Please provide your email address. If you lose your login information, you "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"can get it by email."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bitte geben Sie Ihre E-Mail-Adresse an. Wenn Sie Ihre Login-Informationen "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"verlieren können Sie sie per E-Mail wieder bekommen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"This email already belongs to somebody else."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diese E-Mail-Adresse gehört bereits jemand anderem."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"User account created! You can use this account to login now..."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Es wurde ein Benutzerkonto für Sie angelegt. Sie können sich nun anmelden..."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Use UserPreferences to change settings of the selected user account"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Benutzen Sie BenutzerEinstellungen, um die Einstellungen des ausgewählten "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Benutzers zu ändern."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The theme \'%(theme_name)s\' could not be loaded!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Das Theme \'%(theme_name)s\' konnte nicht geladen werden!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"User preferences saved!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Persönliche Einstellungen gespeichert!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Default"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Standardeinstellung"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"<Browser setting>"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"<Browsereinstellung>"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"the one preferred"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"der Bevorzugte"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"free choice"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Freie Auswahl"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Select User"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Benutzer auswählen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Save"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Speichern"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Cancel"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Abbrechen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Preferred theme"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Bevorzugter Stil"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Editor Preference"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Bevorzugter Editor"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Editor shown on UI"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Angezeigter Editor"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Time zone"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Zeitzone"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Your time is"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die lokale Zeit ist"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Server time is"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Zeit des Servers ist"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Date format"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Datumsformat"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Preferred language"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Bevorzugte Sprache"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"General options"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Allgemeine Optionen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Quick links"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Expressverweise"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"This list does not work, unless you have entered a valid email address!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Änderungsnachrichten werden nur versandt, wenn eine gültige E-Mail-Adresse "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"eingegeben wurde!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Subscribed wiki pages (one regex per line)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Abonnierte Wiki-Seiten (ein regulärer Ausdruck pro Zeile)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Create Profile"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Benutzer anlegen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Mail me my account data"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"E-Mail mit den Zugangsdaten senden"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Email"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"E-Mail"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"To create an account, see the %(userprefslink)s page. To recover a lost "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"password, go to %(sendmypasswordlink)s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Siehe Seite %(userprefslink)s, um einen Account anzulegen. Um ein verlorenes "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Passwort wieder zu erhalten, siehe %(sendmypasswordlink)s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Name"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Name"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Password"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Passwort"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Login"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Anmelden"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Action"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Aktion"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Expected \\"=\\" to follow \\"%(token)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"\\"=\\" fehlt hinter dem Attribut \\"%(token)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Expected a value for key \\"%(token)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Attribut \\"%(token)s\\" wurde kein Wert zugewiesen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to edit this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen diese Seite nicht editieren."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page is immutable!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Seite ist gegen Änderungen geschützt!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Cannot edit old revisions!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Alte Versionen können nicht editiert werden!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The lock you held timed out. Be prepared for editing conflicts!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Die von Ihnen gehaltene Sperre ist abgelaufen. Das Auftreten von "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Änderungskonflikten ist wahrscheinlich!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Draft of \\"%(pagename)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Entwurf von \\"%(pagename)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Edit \\"%(pagename)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"\\"%(pagename)s\\" editieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Preview of \\"%(pagename)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Vorschau für \\"%(pagename)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Your edit lock on %(lock_page)s has expired!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ihre Sperre der Seite %(lock_page)s ist abgelaufen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Your edit lock on %(lock_page)s will expire in # minutes."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ihre Sperre der Seite %(lock_page)s läuft in # Minuten ab."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Your edit lock on %(lock_page)s will expire in # seconds."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ihre Sperre der Seite %(lock_page)s läuft in # Sekunden ab."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Someone else deleted this page while you were editing!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ein anderer Benutzer hat diese Seite inzwischen gelöscht!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Someone else changed this page while you were editing!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ein anderer Benutzer hat diese Seite inzwischen geändert!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Someone else saved this page while you were editing!\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Please review the page and save then. Do not save this page as it is!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ein anderer Benutzer hat gespeichert, während Sie editiert haben!\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bitte schauen Sie die Seite nochmal durch und speichern Sie dann. Speichern "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sie die Seite nicht so, wie sie ist!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[Content loaded from draft]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[Inhalt der Seite mit dem Entwurf geladen]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[Content of new page loaded from %s]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[Inhalt der neuen Seite auf Basis der Vorlage %s]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[Template %s not found]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[Vorlage %s nicht gefunden]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[You may not read %s]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[Sie dürfen %s nicht lesen]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'\'[[BR]]Your draft based on revision %(draft_rev)d (saved %"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(draft_timestamp_str)s) can be loaded instead of the current revision %"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(page_rev)d by using the load draft button - in case you lost your last edit "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"somehow without saving it.\'\'\' A draft gets saved for you when you do a "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"preview, cancel an edit or unsuccessfully save."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'\'[[BR]]Ihr Entwurf basierend auf Revision %(draft_rev)d (gespeichert %"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(draft_timestamp_str)s kann anstatt der aktuellen Revision %(page_rev)d "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"geladen werden, indem Sie den Knopf \'\'Entwurf laden\'\' drücken (falls Sie "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ihre letzten Änderungen verloren haben, bevor Sie sie gespeichert "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"hatten).\'\'\' Ein Entwurf wird für Sie gespeichert, wenn Sie auf Vorschau oder "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Abbrechen drücken oder das Speichern nicht funktioniert."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Describe %s here."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"%s hier beschreiben..."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Check Spelling"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Rechtschreibung prüfen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Save Changes"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Änderungen speichern"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"By hitting \'\'\'%(save_button_text)s\'\'\' you put your changes under the %"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(license_link)s.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"If you don\'t want that, hit \'\'\'%(cancel_button_text)s\'\'\' to cancel your "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"changes."'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Durch Anklicken von \'\'\'%(save_button_text)s\'\'\' stellen Sie Ihre Änderungen "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"unter die %(license_link)s.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Wenn Sie das nicht wollen, klicken Sie auf \'\'\'%(cancel_button_text)s\'\'\', um "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ihre Änderungen zu verwerfen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Preview"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Vorschau anzeigen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Text mode"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Text-Modus"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Load Draft"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Entwurf laden"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Comment:"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Kommentar:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"<No addition>"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"<Keine Änderung>"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Add to: %(category)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Zu %(category)s hinzufügen:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Trivial change"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Triviale Änderung"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Remove trailing whitespace from each line"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Leerzeichen am Ende jeder Zeile entfernen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The wiki is currently not reachable."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Das Wiki ist derzeit nicht erreichbar."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The remote version of MoinMoin is too old, version 1.6 is required at least."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Die ferne MoinMoin-Version ist zu alt, mindestens Version 1.6 wird benötigt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Invalid username or password."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ungültiger Username oder Passwort."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The remote wiki uses a different InterWiki name (%(remotename)s) internally "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"than you specified (%(localname)s)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Das ferne Wiki benutzt intern einen anderen InterWiki-Namen (%(remotename)s) "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"als Sie angegeben haben (%(localname)s)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The package needs a newer version of MoinMoin (at least %s)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Das Paket erfordert eine neuere Version von MoinMoin (mindestens %s)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The theme name is not set."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Theme-Name ist nicht gesetzt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Installing theme files is only supported for standalone type servers."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Das Installieren von Theme-Dateien wird nur für Server-Typ standalone "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"unterstützt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Installation of \'%(filename)s\' failed."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Installation von \'%(filename)s\' fehlgeschlagen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The file %s is not a MoinMoin package file."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Datei %s ist keine MoinMoin-Paket-Datei."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The page %s does not exist."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Seite %s existiert nicht."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Invalid package file header."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ungültiger Paket-Datei-Header."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Package file format unsupported."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Paket-Datei-Format nicht unterstützt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Unknown function %(func)s in line %(lineno)i."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Unbekannte Funktion %(func)s in Zeile %(lineno)i."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The file %s was not found in the package."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Datei %s wurde im Paket nicht gefunden."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Your changes are not saved!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ihre Änderungen sind nicht gesichert!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page name is too long, try shorter name."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seitenname ist zu lang, bitte kürzen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"GUI Mode"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"GUI-Modus"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Edit was cancelled."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Editierung wurde abgebrochen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You can\'t copy to an empty pagename."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie können eine Seite nicht auf einen leeren Seitennamen kopieren."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to copy this page!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen diese Seite nicht kopieren!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'\'A page with the name {{{\'%s\'}}} already exists.\'\'\'\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Try a different name."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'\'Es gibt bereits eine Seite mit dem Namen {{{\'%s\'}}}.\'\'\'\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Versuchen Sie es mit einem anderen Namen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Could not copy page because of file system error: %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Konnte die Seite nicht kopieren wegen eines Dateisystem-Fehlercodes: %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to rename this page!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen diese Seite nicht umbenennen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You can\'t rename to an empty pagename."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie können eine Seite nicht auf einen leeren Seitennamen umbenennen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'\'A page with the name {{{\'%s\'}}} already exists.\'\'\'\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Try a different name."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'\'Es gibt bereits eine Seite mit dem Namen {{{\'%s\'}}}.\'\'\'\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Versuchen Sie es mit einem anderen Namen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Could not rename page because of file system error: %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Konnte die Seite nicht umbenennen wegen eines Dateisystem-Fehlercodes: %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to delete this page!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen diese Seite nicht löschen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Thank you for your changes. Your attention to detail is appreciated."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Danke für die Änderung und die Sorgfalt beim Editieren."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page \\"%s\\" was successfully deleted!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite \\"%s\\" wurde erfolgreich gelöscht!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Dear Wiki user,\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"You have subscribed to a wiki page or wiki category on \\"%(sitename)s\\" for "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"change notification.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The following page has been changed by %(editor)s:\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"%(pagelink)s\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sehr geehrter Wikibenutzer,\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sie haben die Änderungen einer Wikiseite oder Kategorie von \\"%(sitename)s\\" "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"abonniert.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Die folgende Seite wurde durch %(editor)s verändert:\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"%(pagelink)s\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The comment on the change is:\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"%(comment)s\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Der Kommentar zur Änderung ist:\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"%(comment)s\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"New page:\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neue Seite:\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No differences found!\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Es wurden keine Änderungen gefunden!\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[%(sitename)s] %(trivial)sUpdate of \\"%(pagename)s\\" by %(username)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"[%(sitename)s] %(trivial)sÄnderung von \\"%(pagename)s\\" von %(username)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Trivial "'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Triviale "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Status of sending notification mails:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Status des Versands der Änderungsnachrichten:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[%(lang)s] %(recipients)s: %(status)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[%(lang)s] %(recipients)s: %(status)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page could not get locked. Unexpected error (errno=%d)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite konnte nicht gesperrt werden. Unerwarteter Fehler (errno=%d)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page could not get locked. Missing \'current\' file?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite konnte nicht gesperrt werden. Fehlende Datei \'current\'?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to edit this page!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen diese Seite nicht editieren!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You cannot save empty pages."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Leere Seiten können nicht gespeichert werden!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You already saved this page!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie haben diese Seite bereits gesichert!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You already edited this page! Please do not use the back button."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sie haben diese Seite bereits editiert! Bitte benutzen Sie nicht den Zurück-"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Button."'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You did not change the page content, not saved!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Der Seiteninhalt wurde nicht verändert und folglich nicht gesichert!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"You can\'t change ACLs on this page since you have no admin rights on it!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sie dürfen keine ACLs auf dieser Seite ändern, weil Sie keine admin-Rechte "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"auf ihr haben!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The lock of %(owner)s timed out %(mins_ago)d minute(s) ago, and you were "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"granted the lock for this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Die Sperre von %(owner)s ist vor %(mins_ago)d Minute(n) abgelaufen und wurde "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"an Sie übertragen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Other users will be \'\'blocked\'\' from editing this page until %(bumptime)s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Anderen Benutzern wird die Editierung dieser Seite bis %(bumptime)s "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'verweigert\'\'."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Other users will be \'\'warned\'\' until %(bumptime)s that you are editing this "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"page."'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Andere Benutzer erhalten bis %(bumptime)s eine \'\'Warnung\'\', dass Sie diese "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Seite editieren."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Use the Preview button to extend the locking period."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Mit \\"Vorschau anzeigen\\" können Sie diesen Zeitraum verlängern."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"This page is currently \'\'locked\'\' for editing by %(owner)s until %(timestamp)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"s, i.e. for %(mins_valid)d minute(s)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Diese Seite ist derzeit zur Editierung durch %(owner)s gegen Änderungen "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'gesperrt\'\' bis %(timestamp)s, also weitere %(mins_valid)d Minute(n)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"This page was opened for editing or last previewed at %(timestamp)s by %"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(owner)s.[[BR]]\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'\'You should \'\'refrain from editing\'\' this page for at least another %"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(mins_valid)d minute(s),\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"to avoid editing conflicts.\'\'\'[[BR]]\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"To leave the editor, press the Cancel button."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Diese Seite wurde zum letzten Mal um %(timestamp)s durch %(owner)s zum "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Editieren geöffnet\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"oder in der Vorschau angezeigt.[[BR]]\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'\'Sie sollten diese Seite für mindestens weitere %(mins_valid)d Minute(n) "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\'\'nicht editieren\'\', um Konflikte auszuschließen.\'\'\'[[BR]]\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Benutzen Sie \\"Abbrechen\\" zum Verlassen des Editors."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"<unknown>"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"<unbekannt>"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Login Name: %s\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Login Password: %s\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Login URL: %s/%s?action=login\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Anmelde-Name:' Name.Property
 ' %s\\n"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Anmelde-Passwort:' Name.Property
 ' %s\\n"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Anmelde-URL:' Name.Property
 ' %s/%s?action=login\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Somebody has requested to submit your account data to this email address.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"If you lost your password, please use the data below and just enter the\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"password AS SHOWN into the wiki\'s password form field (use copy and paste\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"for that).\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"After successfully logging in, it is of course a good idea to set a new and "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"known password.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Jemand hat angefordert, Ihre Accountdaten an diese E-Mail-Adresse zu "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"senden.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Wenn Sie Ihr Passwort vergessen haben, benutzen Sie bitte die Daten unten "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"und\\n"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"geben Sie das Passwort GENAUSO WIE ANGEZEIGT in das Passwort-Feld des Wikis "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"ein (benutzen Sie kopieren und einfügen dazu).\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Nachdem Sie sich erfolgreich angemeldet haben, setzen Sie bitte Ihr Passwort "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"neu.\\n"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[%(sitename)s] Your wiki account data"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[%(sitename)s] Ihre Wiki-Acount-Daten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The backed up content of this page is deprecated and will not be included in "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"search results!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Der Inhalt der letzten Sicherungskopie ist veraltet und wird von der "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Volltextsuche ignoriert!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Revision %(rev)d as of %(date)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Revision %(rev)d vom %(date)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Redirected from page \\"%(page)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Hierher umgeleitet von Seite \\"%(page)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"This page redirects to page \\"%(page)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diese Seite wird umgeleitet auf \\"%(page)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Create New Page"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neue Seite anlegen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to view this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen diese Seite nicht ansehen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Results %(bs)s%(hitsFrom)d - %(hitsTo)d%(be)s of %(aboutHits)s %(bs)s%(hits)d"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"%(be)s results out of about %(pages)d pages."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ergebnisse %(bs)s%(hitsFrom)d - %(hitsTo)d%(be)s von %(aboutHits)s %(bs)s%"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(hits)d%(be)s Ergebnisse aus ungefähr %(pages)d Seiten."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"seconds"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sekunden"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Previous"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Vorherige"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Next"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nächste"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"current"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"aktuelle"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"last modified: %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"zuletzt geändert: %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"match"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Treffer"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"matches"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Treffer"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Go To Page"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Gehe zu Seite"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Include system pages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Systemseiten einschließen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Exclude system pages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Systemseiten ausschließen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Please use a more selective search term instead of {{{\\"%s\\"}}}"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bitte verwenden Sie einen selektiveren Suchbegriff anstatt {{{\\"%s\\"}}}"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"ERROR in regex \'%s\'"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"FEHLER in regulärem Ausdruck \'%s\'"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Bad timestamp \'%s\'"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ungültige Zeitangabe \'%s\'"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Unsupported navigation scheme \'%(scheme)s\'!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nicht bekanntes Navigationsschema \'%(scheme)s\'!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No parent page found!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diese Seite ist keine Unterseite!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Wiki"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Wiki"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Edit"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Editieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Slideshow"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diaschau"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Start"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Start"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Slide %(pos)d of %(size)d"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite %(pos)d von %(size)d"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Search Titles"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Titel durchsuchen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Display context of search results"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Umgebung der Treffer anzeigen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Case-sensitive searching"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Groß-/Kleinschreibung beachten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Search Text"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Text durchsuchen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Not supported mimetype of file: %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"MIME-Typ der Datei wird nicht unterstützt: %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Embedded"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Eingebettet"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Upload new attachment \\"%(filename)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neuen Dateianhang \\"%(filename)s\\" hochladen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Invalid MonthCalendar calparms \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ungültige MonthCalendaer calparms \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Invalid MonthCalendar arguments \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ungültige MonthCalendar-Argumente: \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No orphaned pages in this wiki."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Es existieren keine verwaisten Seiten in diesem Wiki."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Python Version"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Python Version"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"MoinMoin Version"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"MoinMoin Version"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Release %s [Revision %s]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Version %s [Revision %s]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"4Suite Version"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"4Suite Version"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Number of pages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seitenanzahl"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Number of system pages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Anzahl der Systemseiten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Accumulated page sizes"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Kumulierte Seitengrößen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Disk usage of %(data_dir)s/pages/"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Plattenbelegung von %(data_dir)s/pages/"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Disk usage of %(data_dir)s/"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Plattenbelegung von %(data_dir)s/"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Entries in edit log"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Einträge in der Änderungshistorie"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"NONE"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"KEINE"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Global extension macros"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Globale Erweiterungsmakros"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Local extension macros"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Lokale Erweiterungsmakros"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Global extension actions"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Globale Erweiterungsaktionen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Local extension actions"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Lokale Erweiterungsaktionen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Global parsers"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Globale Parser"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Local extension parsers"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Lokale Erweiterungsparser"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Disabled"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Deaktiviert"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Enabled"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Aktiviert"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"index available"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Index verfügbar"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"index unavailable"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Index nicht verfügbar"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"N/A"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"k.A."'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Xapian and/or Python Xapian bindings not installed"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Xapian und/oder Python-Xapian-Bindings nicht installiert"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Xapian search"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Xapian-Suche"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Xapian Version"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Xapian-Version"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Xapian stemming"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Xapian-Wortstamm-Bildung"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Active threads"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Aktive Threads"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No quotes on %(pagename)s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Keine Zitate auf Seite %(pagename)s gefunden."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Upload of attachment \'%(filename)s\'."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang \'%(filename)s\' wurde angelegt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachment \'%(filename)s\' deleted."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang \'%(filename)s\' wurde gelöscht."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Drawing \'%(filename)s\' saved."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Zeichnung \'%(filename)s\' wurde gesichert."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Revert to revision %(rev)d."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Revision %(rev)d restauriert."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Renamed from \'%(oldpagename)s\'."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Umbenannt von \'%(oldpagename)s\'."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"%(mins)dm ago"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"vor %(mins)dm"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(no bookmark set)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(kein Lesezeichen gesetzt)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(currently set to %s)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(derzeit %s)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Delete bookmark"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Lesezeichen löschen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Set bookmark"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Lesezeichen setzen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[Bookmark reached]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[Lesezeichen erreicht]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Invalid include arguments \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ungültige \\"Include\\"-Argumente: \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Nothing found for \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Textmarkierung \\"%s\\" nicht gefunden!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"edit"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"ändern"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Contents"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Inhaltsverzeichnis"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You need to provide a chart type!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Es muss ein Diagrammtyp angegeben werden!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Bad chart type \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Unbekannter Diagrammtyp \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Search for items"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nach Items suchen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"containing all the following terms"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"die alle folgenden Ausdrücke enthalten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"containing one or more of the following terms"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"die einen oder mehrere der folgenden Ausdrücke enthalten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"not containing the following terms"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"die folgende Ausdrücke nicht enthalten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"belonging to one of the following categories"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"die einer der folgenden Kategorien angehören"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"last modified since (e.g. last 2 weeks)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"die zuletzt geändert wurden seit (z.B. \'last 2 weeks\')"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"any language"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"jede Sprache"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"any mimetype"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"jeder MIME-Typ"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Language"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sprache"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"File Type"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateityp"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Search only in titles"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nur Titel durchsuchen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Case-sensitive search"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Groß-/Kleinschreibung bei der Suche beachten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Exclude underlay"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Underlay ausschließen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No system items"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Keine System-Items"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Search in all page revisions"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"In allen Seitenrevisionen suchen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Go get it!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Los geht\'s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Check your argument %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Überprüfen Sie das Argument %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Markup"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Notation"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Display"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Anzeige"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No wanted pages in this wiki."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Es existieren keine gewünschten Seiten in diesem Wiki."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Connection to mailserver \'%(server)s\' failed: %(reason)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verbindung zum Mailserver \'%(server)s\' gestört: %(reason)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Mail not sent"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"E-Mail wurde nicht versandt"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Mail sent OK"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"E-Mail wurde erfolgreich versandt"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Date"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Datum"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"From"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Von"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"To"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"An"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Content"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Inhalt"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachments"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhänge"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"XSLT option disabled, please look at HelpOnConfiguration."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"XSLT-Option ist abgeschaltet, siehe HelpOnConfiguration."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"XSLT processing is not available, please install 4suite 1.x."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Die Verarbeitung von XSLT-Stylesheets ist nicht verfügbar, bitte 4suite 1.x "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"installieren."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"%(errortype)s processing error"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verarbeitungsfehler vom Typ \\"%(errortype)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Expected \\"%(wanted)s\\" after \\"%(key)s\\", got \\"%(token)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Erwartete \\"%(wanted)s\\" nach \\"%(key)s\\", bekam \\"%(token)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Expected an integer \\"%(key)s\\" before \\"%(token)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Erwartete eine Ganzzahl \\"%(key)s\\" vor \\"%(token)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Expected an integer \\"%(arg)s\\" after \\"%(key)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Erwartete eine Ganzzahl \\"%(arg)s\\" nach \\"%(key)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Expected a color value \\"%(arg)s\\" after \\"%(key)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Erwartete einen Farbwert \\"%(arg)s\\" nach \\"%(key)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Rendering of reStructured text is not possible, please install Docutils."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Anzeigen von reStructured Text ist nicht möglich, bitte installieren Sie "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Docutils."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"**Maximum number of allowed includes exceeded**"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"**Maximale Anzahl erlaubter Includes überschritten**"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"**Could not find the referenced page: %s**"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"**Konnte die referenzierte Seite nicht finden: %s**"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Inlined image: %(url)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Eingebettetes Bild: %(url)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Create new drawing \\"%(filename)s (opens in new window)\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neue Zeichnung \\"%(filename)s\\" anlegen (öffnet ein neues Fenster)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Edit drawing %(filename)s (opens in new window)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Zeichnung %(filename)s bearbeiten (öffnet ein neues Fenster)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Clickable drawing: %(filename)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Anklickbare Zeichnung %(filename)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Toggle line numbers"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Zeilennummern ein/ausschalten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[all]"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[alle]"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[not empty]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[nicht leer]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[empty]"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[leer]"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"filter"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Filter"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Line"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Zeile"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No differences found!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Es wurden keine Änderungen gefunden!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Deletions are marked like this."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Gelöschter Text ist auf diese Art markiert."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Additions are marked like this."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Hinzugefügter Text ist auf diese Art markiert."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sorry, can not save page because \\"%(content)s\\" is not allowed in this wiki."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Kann die Seite nicht speichern, weil der Inhalt \\"%(content)s\\" in diesem "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Wiki nicht erlaubt ist."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"User"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Benutzer"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Diffs"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"DifferenzAnzeige"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Info"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Info"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Unsubscribe"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nicht abonnieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Subscribe"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Abonnieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Raw"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Rohform"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"XML"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"XML"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Print"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Druckansicht"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"View"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Anzeigen"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Home"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Heim"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Up"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Hoch"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[RSS]"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[RSS]"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[DELETED]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[GELÖSCHT]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[UPDATED]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[AKTUALISIERT]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[RENAMED]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[UMBENANNT]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[CONFLICT]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[KONFLIKT]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[NEW]"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[NEU]"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[DIFF]"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[DIFF]"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[BOTTOM]"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[FUSS]"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[TOP]"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[KOPF]"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Click to do a full-text search for this title"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Hier klicken für eine Liste der Seiten, die auf diese verweisen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Preferences"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Einstellungen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Logout"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Abmelden"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Clear message"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nachricht löschen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"last edited %(time)s by %(editor)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"zuletzt geändert am %(time)s durch %(editor)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"last modified %(time)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"zuletzt geändert %(time)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Search:"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Suchen:"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Text"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Text"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Titles"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Titel"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Search"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Suche"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"More Actions:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Weitere Aktionen:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"------------------------"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"------------------------"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Raw Text"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Rohform"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Print View"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Druckansicht"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Delete Cache"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Cache löschen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Rename Page"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite umbenennen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Copy Page"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite kopieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Delete Page"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite löschen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Like Pages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ähnliche Seiten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Local Site Map"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"ÜbersichtsKarte"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"My Pages"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Meine Seiten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Subscribe User"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Abo für Benutzer"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Remove Spam"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Spam entfernen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Revert to this revision"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diese Revision restaurieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Package Pages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seiten paketieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Render as Docbook"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Docbook ausgeben"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Sync Pages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seiten synchronisieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Do"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Los!"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Comments"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Kommentare"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Edit (Text)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Editieren (Text)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Edit (GUI)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Editieren (GUI)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Immutable Page"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Geschützte Seite"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Remove Link"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verweis entfernen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Add Link"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verweis hinzufügen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Show %s days."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"%s Tage anzeigen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Wiki Markup"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Wiki Quelltext"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"DeleteCache"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"CacheLöschen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(cached %s)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(gecached %s)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Or try one of these actions:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Oder benutze eine dieser Aktionen:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"FrontPage"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"StartSeite"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"RecentChanges"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"AktuelleÄnderungen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"TitleIndex"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"TitelIndex"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"WordIndex"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"WortIndex"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"FindPage"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"SeiteFinden"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"SiteNavigation"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"WegWeiser"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"HelpContents"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"HilfeInhalt"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"HelpOnFormatting"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"HilfeZumFormatieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"UserPreferences"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"BenutzerEinstellungen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"WikiLicense"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"WikiLizenz"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"MissingPage"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"FehlendeSeite"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"MissingHomePage"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"FehlendePersönlicheSeite"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Mon"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Mo"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Tue"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Di"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Wed"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Mi"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Thu"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Do"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Fri"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Fr"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Sat"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sa"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Sun"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"So"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"AttachFile"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"DateiAnhänge"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"DeletePage"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"SeiteLöschen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"LikePages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"ÄhnlicheSeiten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"LocalSiteMap"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"ÜbersichtsKarte"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"RenamePage"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"SeiteUmbenennen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"SpellCheck"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"RechtSchreibung"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Unknown action %(action_name)s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Unbekannte Aktion %(action_name)s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to do %(action_name)s on this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen die Aktion %(action_name)s auf dieser Seite nicht benutzen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Login and try again."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Melden Sie sich an und probieren Sie es noch einmal."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Charts are not available!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Diagrammoption ist nicht verfügbar!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page Size Distribution"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verteilung der Seitengrößen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"page size upper bound [bytes]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Obere Grenze der Seitengröße [bytes]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"# of pages of this size"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Anzahl der Seiten in dieser Größenklasse"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"User agent"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Browsertyp"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Others"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sonstige"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Distribution of User-Agent Types"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verteilung der Zugriffe auf Browsertypen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Views/day"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Lesezugriffe/Tag"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Edits/day"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Schreibzugriffe/Tag"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page hits and edits"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seitenzugriffe und Änderungen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"%(chart_title)s for %(filterpage)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"%(chart_title)s für %(filterpage)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"green=view\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"red=edit"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"grün=Anzeigen\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"rot=Änderungen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"date"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Datum"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"# of hits"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Anzahl der Zugriffe"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Emphasis:: [[Verbatim(\'\')]]\'\'italics\'\'[[Verbatim(\'\')]]; [[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(\'\'\')]]\'\'\'bold\'\'\'[[Verbatim(\'\'\')]]; [[Verbatim(\'\'\'\'\')]]\'\'\'\'\'bold "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"italics\'\'\'\'\'[[Verbatim(\'\'\'\'\')]]; [[Verbatim(\'\')]]\'\'mixed \'\'[[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(\'\'\')]]\'\'\'\'\'bold\'\'\'[[Verbatim(\'\'\')]] and italics\'\'[[Verbatim(\'\')]]; "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"[[Verbatim(----)]] horizontal rule.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Headings:: [[Verbatim(=)]] Title 1 [[Verbatim(=)]]; [[Verbatim(==)]] Title "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"2 [[Verbatim(==)]]; [[Verbatim(===)]] Title 3 [[Verbatim(===)]];   [[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(====)]] Title 4 [[Verbatim(====)]]; [[Verbatim(=====)]] Title 5 [[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(=====)]].\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Lists:: space and one of: * bullets; 1., a., A., i., I. numbered items; 1."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"#n start numbering at n; space alone indents.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Links:: [[Verbatim(JoinCapitalizedWords)]]; [[Verbatim([\\"brackets and "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"double quotes\\"])]]; url; [url]; [url label].\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Tables:: || cell text |||| cell text spanning 2 columns ||;    no trailing "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"white space allowed after tables or titles.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(!) For more help, see HelpOnEditing or SyntaxReference.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Betonung:: [[Verbatim(\'\')]]\'\'kursiv\'\'[[Verbatim(\'\')]]; [[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(\'\'\')]]\'\'\'fett\'\'\'[[Verbatim(\'\'\')]]; [[Verbatim(\'\'\'\'\')]]\'\'\'\'\'fett und "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"kursiv\'\'\'\'\'[[Verbatim(\'\'\'\'\')]]; [[Verbatim(\'\')]]\'\'gemischt \'\'[[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(\'\'\')]]\'\'\'\'\'fett\'\'\'[[Verbatim(\'\'\')]] und kursiv\'\'[[Verbatim(\'\')]]; [[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(----)]] horizontaler Balken.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Überschriften:: [[Verbatim(=)]] Überschrift 1 [[Verbatim(=)]]; [[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(==)]] Überschrift 2 [[Verbatim(==)]]; [[Verbatim(===)]] Ü 3 [[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(===)]];   [[Verbatim(====)]] Ü 4 [[Verbatim(====)]]; [[Verbatim(=====)]] Ü "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"5 [[Verbatim(=====)]].\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Listen:: Leerzeichen und eins von: * Punkte; 1., a., A., i., I. nummerierte "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Punkte; 1.#n starte Nummerierung bei n; nur Leerzeichen rückt ein.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Links:: [[Verbatim(ZusammenGeschriebeneGroßeWorte)]]; [[Verbatim"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"([\\"Klammern und doppelte  Anführungszeichen\\"])]]; url; [url]; [url "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"label].\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Tabellen:: || Zellentext |||| Zellentext, 2 Zellen überspannend ||;    "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"keine anhängenden Leerzeichen nach Überschriften oder Tabellen.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(!) Weitere Hilfe finden Sie unter HilfeZumEditieren oder SyntaxReferenz.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Emphasis:'   Name.Property
 ' <i>*italic*</i> <b>**bold**</b> ``monospace``<br/>\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"<br/><pre>\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Headings:'   Name.Property
 ' Heading 1  Heading 2  Heading 3\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"          =========  ---------  ~~~~~~~~~\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Horizontal rule: ---- \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Links:'      Name.Property
 ' TrailingUnderscore_ `multi word with backticks`_ external_ \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '".. _external: http://external-site.net/foo/\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Lists:'      Name.Property
 ' * bullets; 1., a. numbered items.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"</pre>\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"<br/>\\n"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(!) For more help, see the \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"<a href=\\"http://docutils.sourceforge.net/docs/user/rst/quickref.html\\">\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"reStructuredText Quick Reference\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"</a>.\\n"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Betonung:'   Name.Property
 ' <i>*kursiv*</i> <b>**fett**</b> ``gleiche Zeichenbreite``<br/>\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"<br/><pre>\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Überschriften: Überschrift 1  Überschrift 2  Überschrift 3\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"               =============  -------------  ~~~~~~~~~~~~~\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Horizontale Linie: ---- \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Links:'      Name.Property
 ' AngehängterUnterstrich_ `mehrere Worte mit Rückwärtsapostroph`_ "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"extern_ \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '".. _extern: http://externe-seite.de/\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Listen:'     Name.Property
 ' * Punkte; 1., a. nummerierte Punkte.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"</pre>\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"<br/>\\n"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(!) Für mehr Hilfe siehe die \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"<a href=\\"http://docutils.sourceforge.net/docs/user/rst/quickref.html\\">\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"reStructuredText Quick Reference\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"</a>.\\n"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"UnSubscribe"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nicht abonnieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Publish my email (not my wiki homepage) in author info"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Veröffentliche meine E-Mail-Adresse (nicht meine Wiki-Homepage) in der "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Autoren-Info"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Open editor on double click"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Editor per Doppelklick öffnen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"After login, jump to last visited page"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nach dem Anmelden zur zuletzt besuchten Seite springen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Show comment sections"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Kommentarabschnitte anzeigen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Show question mark for non-existing pagelinks"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verweise auf unbekannte Seiten mit Fragezeichen markieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Show page trail"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Kürzlich besuchte Seiten anzeigen (Verlauf)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Show icon toolbar"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Werkzeugleiste mit Bildsymbolen anzeigen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Show top/bottom links in headings"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verweise zum Anfang und Ende der Seite in Überschriften anzeigen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Show fancy diffs"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Unterschiede farbig markiert anzeigen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Add spaces to displayed wiki names"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Angezeigte Wikinamen mit Leerzeichen trennen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Remember login information"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Speichere Login-Informationen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Subscribe to trivial changes"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Triviale Änderungen abonnieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Disable this account forever"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dieses Benutzerkonto für immer deaktivieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(Use Firstname\'\'\'\'\'\'Lastname)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(Vorname\'\'\'\'\'\'Nachname verwenden)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Alias-Name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Alias-Name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Password repeat"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Passwort wiederholen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(Only for password change or new account)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(Nur für Passwort-Änderung oder neue Benutzerkonten)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"User CSS URL"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Benutzer CSS URL"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(Leave it empty for disabling user CSS)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Leer lassen, um benutzerdefiniertes CSS auszuschalten)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Editor size"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Größe des Texteingabefelds"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Do it."'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ausführen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Execute action %(actionname)s?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Aktion %(actionname)s ausführen?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Action %(actionname)s is excluded in this wiki!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Aktion %(actionname)s ist ausgeschlossen in diesem Wiki!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to use action %(actionname)s on this page!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen die Aktion %(actionname)s auf dieser Seite nicht benutzen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Please use the interactive user interface to use action %(actionname)s!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Für die Aktion %(actionname)s bitte nur die vorgesehenen Webseiten benutzen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You must login to add a quicklink."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie müssen sich anmelden, um einen Expressverweis hinzuzufügen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Your quicklink to this page has been removed."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ihr Expressverweis für diese Seite wurde entfernt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Your quicklink to this page could not be removed."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ihr Expressverweis für diese Seite konnte nicht entfernt werden."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"A quicklink to this page has been added for you."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ein Expressverweis für diese Seite wurde hinzugefügt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"A quicklink to this page could not be added for you."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ein Expressverweis für diese Seite konnte nicht hinzugefügt werden."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Missing password. Please enter user name and password."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Fehlendes Passwort. Bitte geben Sie Benutzername und Passwort ein."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Sorry, login failed."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Login fehlgeschlagen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"[%d attachments]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[%d Anhänge]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"There are <a href=\\"%(link)s\\">%(count)s attachment(s)</a> stored for this "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"page."'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Es sind <a href=\\"%(link)s\\">%(count)s Anhänge</a> für diese Seite "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"gespeichert."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachment \'%(target)s\' already exists."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang \'%(target)s\' existiert bereits."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Filename of attachment not specified!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateiname des Anhangs fehlt oder ist leer!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachment \'%(filename)s\' does not exist!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang \'%(filename)s\' existiert nicht!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"To refer to attachments on a page, use \'\'\'{{{attachment:filename}}}\'\'\', \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"as shown below in the list of files. \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Do \'\'\'NOT\'\'\' use the URL of the {{{[get]}}} link, \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"since this is subject to change and can break easily."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Um Dateianhänge in eine Seite einzufügen sollte unbedingt eine Angabe \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"wie \'\'\'{{{attachment:dateiname}}}\'\'\' benutzt werden, \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"wie sie auch in der folgenden Liste der Dateien erscheint. \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Es sollte \'\'\'niemals\'\'\' die URL des Verweises (\\"laden\\") kopiert werden, \\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"da sich diese jederzeit ändern kann und damit der Verweis auf die Datei "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"brechen würde."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"del"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"löschen"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"move"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"verschieben"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"get"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"laden"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"view"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"anzeigen"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"unzip"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"auspacken"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"install"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"installieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No attachments stored for %(pagename)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Es wurden keine Anhänge für die Seite %(pagename)s gespeichert."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Edit drawing"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Zeichnung editieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"New Attachment"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neuer Dateianhang"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"An upload will never overwrite an existing file. If there is a name\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"conflict, you have to rename the file that you want to upload.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Otherwise, if \\"Rename to\\" is left blank, the original filename will be "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"used."'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ein neuer Anhang überschreibt niemals einen bereits vorhandenen gleichen "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Namens.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Besteht ein Namenskonflikt, muss dem neuen Anhang ein alternativer Name "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"zugewiesen werden.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ansonsten kann das Feld \\"Umbenennen auf\\" leer bleiben und es wird der "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"originale Dateiname benutzt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"File to upload"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neuer Dateianhang"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Rename to"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Umbenennen auf"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Overwrite existing attachment of same name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Anhänge gleichen Namens überschreiben"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Upload"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Datei hochladen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attached Files"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Gespeicherte Dateianhänge"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to attach a file to this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen keine Anhänge an diese Seite anhängen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"File attachments are not allowed in this wiki!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhänge sind in diesem Wiki nicht erlaubt!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to save a drawing on this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen auf dieser Seite keine Zeichnung speichern."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"No file content. Delete non ASCII characters from the file name and try "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"again."'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Kein Dateiinhalt. Löschen Sie nicht-ASCII-Zeichen aus dem Dateinamen und "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"probieren Sie es noch einmal."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to delete attachments on this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen keine Anhänge dieser Seite löschen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to move attachments from this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen keine Anhänge von dieser Seite verschieben."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Move aborted!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verschieben abgebrochen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Please use the interactive user interface to move attachments!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Für die das Verschieben von Anhängen bitte nur die vorgesehenen Webseiten "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"benutzen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to get attachments from this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen auf keine Anhänge dieser Seite zugreifen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to unzip attachments of this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen keine Anhänge dieser Seite auspacken."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to install files."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen keine Dateien installieren."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to view attachments of this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen keine Anhänge dieser Seite ansehen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Unsupported upload action: %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Unbekannte Aktion für Dateianhang: %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachments for \\"%(pagename)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhänge für \\"%(pagename)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Attachment \'%(target)s\' (remote name \'%(filename)s\') with %(bytes)d bytes "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"saved."'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Dateianhang \'%(target)s\' (ursprünglicher Name \'%(filename)s\') mit %(bytes)d "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bytes gesichert."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachment \'%(target)s\' (remote name \'%(filename)s\') already exists."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Dateianhang \'%(target)s\' (ursprünglicher Name \'%(filename)s\') existiert "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"bereits."'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachment \'%(filename)s\' already exists."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang \'%(filename)s\' existiert bereits."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachment \'%(filename)s\' moved to %(page)s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang \'%(filename)s\' auf Seite %(page)s verschoben."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Nothing changed"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Keine Änderung."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page %(newpagename)s does not exists or you don\'t have enough rights."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Seite %(newpagename)s existiert nicht oder Sie haben nicht ausreichend "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Rechte."'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Move aborted because empty page name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie können eine Seite nicht auf einen leeren Seitennamen umbenennen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Please use a valid filename for attachment \'%(filename)s\'."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bitte benutzen Sie einen gültigen Dateinamen für Dateianhang \'%(filename)s\'."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Move aborted because empty attachment name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verschieben wegen eines leeren Anhangsnamens abgebrochen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Move"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verschieben"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"New page name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neuer Seitenname"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"New attachment name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neuer Name des Dateianhangs"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachment \'%(filename)s\' installed."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang \'%(filename)s\' wurde installiert."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Attachment \'%(filename)s\' could not be unzipped because the resulting files "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"would be too large (%(space)d kB missing)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Dateianhang \'%(filename)s\' konnte nicht ausgepackt werden, weil die "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"ausgepackten Dateien zu groß wären (%(space)d kB fehlen)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Attachment \'%(filename)s\' could not be unzipped because the resulting files "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"would be too many (%(count)d missing)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Dateianhang \'%(filename)s\' konnte nicht ausgepackt werden, weil die "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"ausgepackten Dateien zu viele wären (%(count)d fehlen)."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachment \'%(filename)s\' unzipped."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang \'%(filename)s\' wurde ausgepackt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Attachment \'%(filename)s\' not unzipped because the files are too big, .zip "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"files only, exist already or reside in folders."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Dateianhang \'%(filename)s\' wurde nicht ausgepackt, weil die Datei zu groß "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"sind, weil nur .zip-Dateien erlaubt sind, weil sie bereits existieren oder "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"weil Dateien in Ordnern enthalten sind."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The file %(filename)s is not a .zip file."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Datei %(filename)s ist keine .zip-Datei."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Attachment \'%(filename)s\'"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang \'%(filename)s\'"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Package script:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Paket-Skript:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"File Name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateiname"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Modified"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Modifiziert"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Size"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Größe"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Unknown file type, cannot display this attachment inline."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Dieser Anhang besitzt einen unbekannten Dateityp und kann deshalb nicht "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"direkt angezeigt werden."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"attachment:%(filename)s of %(pagename)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"[[Verbatim(attachment:)]]%(filename)s für %(pagename)s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"This page is already deleted or was never created!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diese Seite wurde bereits gelöscht oder wurde bisher nicht angelegt!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Rename all /subpages too?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Alle /UnterSeiten auch umbenennen?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"New name"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neuer Name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Optional reason for the renaming"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Optionale Begründung für das Umbenennen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Really rename this page?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diese Seite wirklich umbenennen?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Full Link List for \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Liste aller Seitenverweise für \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Editor"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Autor"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Pages"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seiten"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Select Author"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Autor auswählen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Revert all!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Alle restaurieren!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to use this action."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen diese Aktion nicht ausführen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Rolled back changes to the page %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Änderungen an der Seite %s rückgängig gemacht"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Exception while calling rollback function:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Fehler beim Aufrufen der Rollback-Funktion:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Please enter your password of your account at the remote wiki below. "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"[[BR]] /!\\\\ You should trust both wikis because the password could be read "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"by the particular administrators."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bitte geben Sie das Passwort Ihres Accounts im fernen Wiki unten ein. "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"[[BR]] /!\\\\ Sie sollten beiden Wikis vertrauen, weil das Passwort von den "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"entsprechenden Administratoren gelesen werden könnte."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Operation was canceled."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Operation wurde abgebrochen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The only supported directions are BOTH and DOWN."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Es werden nur die Richtungen BOTH und DOWN unterstützt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Please set an interwikiname in your wikiconfig (see HelpOnConfiguration) to "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"be able to use this action."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bitte setzen Sie interwikiname in Ihrer wikiconfig (siehe "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"HilfeZurKonfiguration), um diese Aktion benutzen zu können."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Incorrect parameters. Please supply at least the \'\'remoteWiki\'\' parameter. "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Refer to HelpOnSynchronisation for help."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ungültige Parameter, bitte geben Sie mindestens den \'\'remoteWiki\'\'-Parameter "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"an. Siehe HilfeZurSynchronisation für weitere Informationen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The \'\'remoteWiki\'\' is unknown."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Das \'\'remoteWiki\'\' ist nicht bekannt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"A severe error occured:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ein schwerwiegender Fehler ist aufgetreten:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Synchronisation finished. Look below for the status messages."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Synchronisierung beendet, siehe Status-Nachrichten unten."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Synchronisation started -"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Synchronisierung gestartet -"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Got a list of %s local and %s remote pages. This results in %s different "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"pages over-all."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"%s lokale und %s ferne Seiten, resultierend in insgesamt %s "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"unterschiedlichen Seiten."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"After filtering: %s pages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nach dem Filtern: %s Seiten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Skipped page %s because of no write access to local page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Seite %s wurde wegen fehlenden Schreibrechten auf die lokale Seite "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"übersprungen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Deleted page %s locally."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Lokale Seite %s gelöscht."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Error while deleting page %s locally:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Fehler beim lokalen Löschen der Seite %s:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Deleted page %s remotely."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ferne Seite %s gelöscht."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Error while deleting page %s remotely:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Fehler beim fernen Löschen der Seite %s:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The item %s cannot be merged automatically but was changed in both wikis. "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Please delete it in one of both wikis and try again."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Das Objekt %s kann nicht automatisch zusammengeführt werden, wurde aber in "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"beiden Wikis geändert. Bitte löschen Sie es in einem der beiden Wikis und "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"versuchen Sie es erneut."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The item %s has different mime types in both wikis and cannot be merged. "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Please delete it in one of both wikis or unify the mime type, and try again."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Das Objekt %s hat einen unterschiedlichen Mime-Typ in beiden Wikis und kann "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"nicht zusammengeführt werden. Bitte löschen Sie es in einem der beiden Wikis "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"oder vereinheitlichen Sie den Mime-Typ und probieren Sie es nochmal."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The item %s was renamed locally. This is not implemented yet. Therefore the "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"full synchronisation history is lost for this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Seite %s wurde lokal umbenannt. Dies wird noch nicht unterstützt, daher geht "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"für diese Seite die ganze Synchronisierungs-Historie verloren."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Synchronising page %s with remote page %s ..."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Synchronisiere Seite %s mit der entfernten Seite %s ..."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The page %s was deleted remotely but changed locally."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite %s wurde lokal geändert, aber ferne gelöscht."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The page %s could not be synced. The remote page was renamed. This is not "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"supported yet. You may want to delete one of the pages to get it synced."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Seite %s konnte nicht synchronisiert werden. Die entfernte Seite wurde "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"umbenannt, was bis jetzt noch nicht unterstützt wird. Vielleicht möchten Sie "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"eine der Seiten löschen, um die Seite erfolgreich zu synchronisieren."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Skipped page %s because of a locally or remotely unresolved conflict."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Seite %s wurde wegen eines lokalen oder entfernten nicht beseitigten "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Konflikts übersprungen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"This is the first synchronisation between the local and the remote wiki for "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"the page %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Dies ist die erste Synchronisation zwischen dem lokalen und fernen Wiki für "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"die Seite %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The page %s could not be merged because you are not allowed to modify the "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"page in the remote wiki."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Die Seite %s konnte nicht zusammengeführt werden, weil Sie die Seite im "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"fernen Wiki nicht ändern dürfen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page %s successfully merged."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite \\"%s\\" wurde erfolgreich zusammengeführt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page %s contains conflicts that were introduced on the remote side."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite %s enthält von der fernen Seite eingeführte Konflikte."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page %s merged with conflicts."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite %s wurde mit Konflikten zusammengeführt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Load"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Laden"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"New Page or New Attachment"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neue Seite oder neuer Dateianhang"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"You can upload a file to a new page or choose to upload a file as attachment "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"for the current page"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sie können eine Datei in eine neue Seite hochladen oder eine Datei als "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Dateianhang an die aktuelle Seite hochladen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"attachment"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Dateianhang"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"overwrite"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"überschreiben"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"New Name"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Neuer Name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(including %(localwords)d %(pagelink)s)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(inklusive %(localwords)d %(pagelink)s)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"The following %(badwords)d words could not be found in the dictionary of %"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(totalwords)d words%(localwords)s and are highlighted below:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Die nachfolgenden %(badwords)d Worte konnten nicht im Wörterbuch mit %"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(totalwords)d Worten%(localwords)s gefunden werden und sind im Text "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'hervorgehoben:' Name.Property
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Add checked words to dictionary"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Markierte Wörter zum Wörterbuch hinzufügen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No spelling errors found!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Keine Rechtschreibfehler gefunden!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You can\'t save spelling words."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie können keine Rechtschreibkorrektur-Wörter abspeichern."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You can\'t check spelling on a page you can\'t read."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sie dürfen keine Seite auf Rechtschreibung prüfen, die Sie nicht lesen "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"können."'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are now logged out."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie sind nun abgemeldet."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to subscribe to a page you can\'t read."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen keine Seiten abonnieren, die Sie nicht lesen dürfen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"This wiki is not enabled for mail processing."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"In diesem Wiki ist Mail-Verarbeitung nicht eingeschaltet."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You must log in to use subscriptions."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie müssen sich anmelden, um Abonnements verwenden zu können."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Add your email address in your UserPreferences to use subscriptions."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Fügen Sie Ihre E-Mail-Adresse in den BenutzerEinstellungen hinzu, um "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Abonnements benutzen zu können."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Your subscription to this page has been removed."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ihr Abonnementsfür diese Seite wurde entfernt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Can\'t remove regular expression subscription!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Kann nicht Abonnement mit regulärem Ausdruck entfernen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Edit the subscription regular expressions in your UserPreferences."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Editieren Sie die regulären Ausdrücke für Abonnements in Ihren "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"BenutzerEinstellungen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You have been subscribed to this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Seite wurde zur Liste abonnierter Seiten hinzugefügt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You could not get subscribed to this page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Die Seite konnte nicht zur Liste abonnierter Seiten hinzugefügt werden."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"General Information"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Allgemeine Informationen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Page size: %d"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seitengröße: %d"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"SHA digest of this page\'s content is:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Signatur des Seiteninhalts nach dem SHA-Verfahren:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The following users subscribed to this page:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Nachfolgende Benutzer haben diese Seite abonniert:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"This page links to the following pages:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diese Seite verweist auf die folgenden Seiten:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Diff"'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Differenz"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Comment"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Kommentar"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Revision History"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Versionshistorie"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No log entries found."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Keine Log-Einträge gefunden."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Info for \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Info für \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Show \\"%(title)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"\\"%(title)s\\" anzeigen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"General Page Infos"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Allgemeine Seiten-Informationen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Please log in first."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Bitte melden Sie sich vorher an."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Please first create a homepage before creating additional pages."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bitte erzeugen Sie zuerst eine Homepage, bevor Sie weitere Seiten anlegen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"You can add some additional sub pages to your already existing homepage "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"here.\\n"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"You can choose how open to other readers or writers those pages shall be,\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"access is controlled by group membership of the corresponding group page.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Just enter the sub page\'s name and click on the button to create a new "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"page.\\n"'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Before creating access protected pages, make sure the corresponding group "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"page\\n"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"exists and has the appropriate members in it. Use HomepageGroupsTemplate for "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"creating\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"the group pages.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"||\'\'\'Add a new personal page:\'\'\'||\'\'\'Related access control list "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'group:'      Name.Property
 '\'\'\'||\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"||[[NewPage(HomepageReadWritePageTemplate,read-write page,%(username)s)]]||"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"[\\"%(username)s/ReadWriteGroup\\"]||\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"||[[NewPage(HomepageReadPageTemplate,read-only page,%(username)s)]]||[\\"%"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(username)s/ReadGroup\\"]||\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"||[[NewPage(HomepagePrivatePageTemplate,private page,%(username)s)]]||%"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(username)s only||\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Hier können Sie zusätzliche Unterseiten zu Ihrer bereits existierenden "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Homepage hinzufügen.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sie können wählen, wie offen diese Seiten für andere Leser oder Autoren sein "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"sollen,\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"der Zugriff wird über Gruppenmitgliedschaft in der entsprechenden Gruppe "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"kontrolliert.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Geben Sie einfach den Namen der Unterseite ein und klicken Sie auf den "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Knopf, um eine neue Seite zu erzeugen.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bevor Sie zugriffsgeschützte Seiten erzeugen, stellen Sie sicher, dass die "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"entsprechende Gruppenseite existiert und die richtigen Mitglieder hat. "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Benutzen Sie HomepageGroupsTemplate für das Erzeugen der Gruppenseiten.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"||\'\'\'Neue persönliche Seite hinzufügen:\'\'\'||\'\'\'Zugeordnete ACL-Gruppe:\'\'\'||\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"||[[NewPage(HomepageReadWritePageTemplate,Seite (read/write),%(username)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"s)]]||[\\"%(username)s/ReadWriteGroup\\"]||\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"||[[NewPage(HomepageReadPageTemplate,Seite (read-only),%(username)s)]]||[\\"%"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(username)s/ReadGroup\\"]||\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"||[[NewPage(HomepagePrivatePageTemplate,Seite (privat),%(username)s)]]||nur %"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(username)s||\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"MyPages management"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Verwaltung meiner Seiten"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Subscribe users to the page %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seite %s für Benutzer abonnieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Subscribed for %s:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Abonnenten von %s:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Not a user:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Kein Benutzer:"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to perform this action."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen diese Aktion nicht ausführen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(!) Only pages changed since \'\'\'%s\'\'\' are being displayed!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(!) Nur Seiten, die seit \'\'\'%s\'\'\' geändert wurden, werden angezeigt!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"/!\\\\ The modification date you entered was not recognized and is therefore "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"not considered for the search results!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"/!\\\\ Das eingegebene Änderungsdatum wurde nicht erkannt und wird deshalb "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"nicht bei der Suche berücksichtigt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Title Search: \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Titelsuche: \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Advanced Search: \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Erweiterte Suche: \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Full Text Search: \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Volltextsuche: \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Your search query {{{\\"%s\\"}}} is invalid. Please refer to HelpOnSearching "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"for more information."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ihre Suchanfrage {{{\\"%s\\"}}} ist ungültig. Siehe HilfeZumSuchen für weitere "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Informationen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Your search query {{{\\"%s\\"}}} didn\'t return any results. Please change some "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"terms and refer to HelpOnSearching for more information.%s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Ihre Suche nach {{{\\"%s\\"}}} hat keine Resultate ergeben. Bitte ändern Sie "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"einige Suchbegriffe und lesen Sie für weitere Informationen auf "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"HilfeZumSuchen nach. %s"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(!) Consider performing a"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(!) Erwägen Sie eine"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"full-text search with your search terms"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Volltextsuche mit Ihren Suchbegriffen"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(!) You\'re performing a title search that might not include all related "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"results of your search query in this wiki. [[BR]]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(!) Sie führen eine Titelsuche durch, die möglicherweise nicht alle "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"relevanten Ergebnisse Ihrer Sucheanfrage in diesem Wiki enthält. [[BR]]"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Click here to perform a full-text search with your search terms!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Hier klicken für eine Volltextsuche mit diesen Suchbegriffen!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Restored Backup: %(filename)s to target dir: %(targetdir)s.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Files:'      Name.Property
 ' %(filecount)d, Directories: %(dircount)d"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Wiederhergestelltes Backup: %(filename)s nach Zielverzeichnis: %(targetdir)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"s.\\n"'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Dateien:'    Name.Property
 ' %(filecount)d, Verzeichnisse: %(dircount)d"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Restoring backup: %(filename)s to target dir: %(targetdir)s failed."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Wiederherstellen von Backup %(filename)s in das Zielverzeichnis %(targetdir)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"s fehlgeschlagen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Wiki Backup / Restore"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Wiki Sicherung / Wiederherstellung"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Some hints:\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" * To restore a backup:\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"  * Restoring a backup will overwrite existing data, so be careful.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"  * Rename it to <siteid>.tar.<compression> (remove the --date--time--UTC "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"stuff).\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"  * Put the backup file into the backup_storage_dir (use scp, ftp, ...).\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"  * Hit the [[GetText(Restore)]] button below.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" * To make a backup, just hit the [[GetText(Backup)]] button and save the "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"file\\n"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"   you get to a secure place.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Please make sure your wiki configuration backup_* values are correct and "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"complete.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'Hinweise:'   Name.Property
 '\\n"'        Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" * Um ein Backup wiederherzustellen:\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"  * Das Wiederherstellen eines Backups wird bestehende Daten überschreiben, "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"also seien Sie vorsichtig.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"  * Benennen Sie es auf <siteid>.tar.<compression> um (entfernen Sie --date--"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"time--UTC).\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"  * Legen Sie die Backupdatei in das backup_storage_dir (mit scp, "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"ftp, ...).\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"  * Drücken Sie unten auf [[GetText(Restore)]]-Knopf unten.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" * Um ein Backup zu erstellen, drücken Sie einfach auf den [[GetText"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"(Backup)]]-Knopf und sichern Sie die Datei,\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"   die Sie erhalten an eine sichere Stelle.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"\\n"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Bitte stellen Sie sicher, dass die backup_* Werte in Ihrer Wiki-"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Konfiguration korrekt und vollständig sind.\\n"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Backup"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Datensicherung"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Restore"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Datenwiederherstellung"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to do remote backup."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen kein Remote-Backup ausführen."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Unknown backup subaction: %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Unbekannte backup Unteraktion: %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"You are not allowed to revert this page!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Sie dürfen diese Seite nicht restaurieren!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"You were viewing the current revision of this page when you called the "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"revert action. If you want to revert to an older revision, first view that "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"older revision and then call revert to this (older) revision again."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Sie haben die aktuelle Revision dieser Seite angeschaut als Sie die "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Restaurieren-Funktion aufgerufen haben. Wenn Sie eine ältere Revision "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"restaurieren wollen, betrachten Sie erst diese ältere Revision und rufen Sie "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"dann die Restaurieren-Funktion für diese ältere Revision erneut auf."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Local Site Map for \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Lokale Seitenverweise für \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No pages like \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Keine Seite ähnlich wie \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Invalid filename \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ungültiger Dateiname \\"%s\\"!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Created the package %s containing the pages %s."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Paket %s, das die Seiten %s enthält wurde erzeugt."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Package pages"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seiten paketieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Package name"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Paketname"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"List of page names - separated by a comma"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Liste von Seitennamen - getrennt durch ein Komma"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"No older revisions available!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Es sind keine älteren Versionen dieser Seite verfügbar!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Diff for \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Änderungen von \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Differences between revisions %d and %d"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Unterschiede zwischen den Revisionen %d und %d"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(spanning %d versions)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(über %d Versionen hinweg)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"The page was saved %(count)d times, though!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Die Seite wurde jedoch %(count)d mal gespeichert!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"(ignoring whitespace)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"(ignoriere Leerraum)"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Ignore changes in the amount of whitespace"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Ausschließlich Leerraum betreffende Änderungen ignorieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Exactly one page like \\"%s\\" found, redirecting to page."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Genau eine Seite wie \\"%s\\" gefunden, leite dorthin weiter."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Pages like \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Seiten ähnlich wie \\"%s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#, python-format' Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"%(matchcount)d %(matches)s for \\"%(title)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"%(matchcount)d %(matches)s passen zu \\"%(title)s\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Copy all /subpages too?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Alle /UnterSeiten auch kopieren?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Optional reason for the copying"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Optionale Begründung für das Kopieren"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Really copy this page?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diese Seite wirklich kopieren?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Cannot create a new page without a page name.  Please specify a page name."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '""'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Kann keine neue Seite ohne Seitennamen anlegen - bitte geben Sie einen "' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Seitennamen an."' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Delete"'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Löschen"'   Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Delete all /subpages too?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Alle /UnterSeiten auch löschen?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Optional reason for the deletion"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Optionale Begründung für die Löschung"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgid'       Name.Variable
 ' '           Text
 '"Really delete this page?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'msgstr'      Name.Variable
 ' '           Text
 '"Diese Seite wirklich löschen?"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ msgid "filename"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ msgstr "Dateiname"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ msgid ""' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "~-If you submit this form, the submitted values will be displayed.\\n"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "To use this form on other pages, insert a\\n"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "[[BR]][[BR]]\'\'\'{{{    [[Form(\\"%(pagename)s\\")]]}}}\'\'\'[[BR]][[BR]]\\n"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "macro call.-~\\n"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ msgstr ""' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "~-Das Absenden dieses Formulars zeigt die eingegebenen Werte an.\\n"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "Um das Formular auf anderen Seiten zu benutzen, muss folgender "' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "Makroaufruf\\n"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "[[BR]][[BR]]\'\'\'{{{    [[Form(\\"%(pagename)s\\")]]}}}\'\'\'[[BR]][[BR]]\\n"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "auf diesen Seiten platziert werden.-~\\n"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ msgid ""' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "Unknown user name: {{{\\"%s\\"}}}. Please enter user name and password."' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ msgstr ""' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "Unbekannter Benutzername: {{{\\"%s\\"}}}. Bitte geben Sie Benutzername und "' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#~ "Passwort ein."' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/praat/example.praat.output b/tests/examplefiles/praat/example.praat.output
index 542af12b08..f6a20057d4 100644
--- a/tests/examplefiles/praat/example.praat.output
+++ b/tests/examplefiles/praat/example.praat.output
@@ -1,722 +1,736 @@
 'form'        Keyword
-' '           Text
+' '           Text.Whitespace
 'Highlighter test' Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# This is a regular comment' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'sentence'    Keyword
-' Blank'      Text
-'\n'          Text
+' '           Text.Whitespace
+'Blank'       Literal.String
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'sentence'    Keyword
-' My_sentence' Text
-' '           Text
+' '           Text.Whitespace
+'My_sentence' Literal.String
+' '           Text.Whitespace
 'This should all be a string' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'text'        Keyword
-' My_text'    Text
-' '           Text
+' '           Text.Whitespace
+'My_text'     Literal.String
+' '           Text.Whitespace
 'This should also all be a string' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'word'        Keyword
-' My_word '   Text
-'Only'        Literal.String
-' the first word is a string, the rest is discarded' Text
-'\n  '        Text
+' '           Text.Whitespace
+'My_word'     Text
+' '           Text.Whitespace
+'Only'        Text
+' '           Text.Whitespace
+'the first word is a string, the rest is discarded' Text
+'\n  '        Text.Whitespace
 'boolean'     Keyword
-' Binary '    Text
+' Binary '    Text.Whitespace
 '1'           Name.Variable
-'\n  '        Text
+'\n  '        Text.Whitespace
 'boolean'     Keyword
-' Text '      Text
+' Text '      Text.Whitespace
 'no'          Name.Variable
-'\n  '        Text
+'\n  '        Text.Whitespace
 'boolean'     Keyword
-' Quoted '    Text
+' Quoted '    Text.Whitespace
 '"yes"'       Name.Variable
-'\n  '        Text
+'\n  '        Text.Whitespace
 'comment'     Keyword
-' '           Text
+' '           Text.Whitespace
 'This should be a string' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'optionmenu'  Keyword
-' Drop-down: ' Text
+' '           Text.Whitespace
+'Drop-down'   Text
+':'           Punctuation
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'option'      Keyword
-' '           Text
+' '           Text.Whitespace
 'Foo'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'option'      Keyword
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'choice'      Keyword
-' Radio: '    Text
+' '           Text.Whitespace
+'Radio'       Text
+':'           Punctuation
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'option'      Keyword
-' '           Text
+' '           Text.Whitespace
 'Foo'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'option'      Keyword
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'real'        Keyword
-' left_Range ' Text
+' left_Range ' Text.Whitespace
 '-'           Operator
 '123.6'       Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 'positive'    Keyword
-' right_Range_max ' Text
+' right_Range_max ' Text.Whitespace
 '3.3'         Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 'integer'     Keyword
-' Int '       Text
+' Int '       Text.Whitespace
 '4'           Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 'natural'     Keyword
-' Nat '       Text
+' Nat '       Text.Whitespace
 '4'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endform'     Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'beginPause'  Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Highlighter test' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'sentence'    Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Blank'       Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'sentence'    Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'My sentence' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'This should all be a string' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'text'        Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'My text'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'This should also all be a string' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'word'        Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'My word'     Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Only the first word is a string, the rest is discarded' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'boolean'     Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Binary'      Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'comment'     Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'This should be a string' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'optionMenu'  Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Drop-down'   Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'option'      Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Foo'         Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'option'      Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '100'         Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'choice'      Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Choice'      Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'option'      Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Foo'         Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'option'      Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '100'         Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'real'        Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'left Range'  Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '123.6'       Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'positive'    Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'right Range max' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3.3'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'integer'     Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Int'         Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'natural'     Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Nat'         Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'button'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'endPause'    Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Cancel'      Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'OK'          Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-')'           Text
-'\n\n'        Text
+')'           Punctuation
+'\n\n'        Text.Whitespace
 
 '# Periods do not establish boundaries for keywords' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'form.var'    Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Or operators' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'not.an.operator$' Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Bad variable name' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'bad.or.not'  Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# External scripts' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'include'     Keyword
-' '           Text
+' '           Text.Whitespace
 '/path/to/file' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'runScript'   Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '/path/to/file' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'execute'     Keyword
-' '           Text
+' '           Text.Whitespace
 '/path/to/file' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Predefined variables' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'praatVersion' Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'pi'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'all'         Text
 '+'           Operator
 'right'       Text
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 'left'        Text
-' '           Text
+' '           Text.Whitespace
 'mod'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'average'     Text
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'mono'        Text
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'stereo'      Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a$'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'homeDirectory$' Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'tab$'        Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'newline$'    Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a$'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'temporaryDirectory$' Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a$'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'praatVersion$' Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a$'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'shellDirectory$' Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a$'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'homeDirectory$' Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a$'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'preferencesDirectory$' Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a$'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'defaultDirectory$' Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 'nocheck'     Keyword
-' '           Text
+' '           Text.Whitespace
 'selectObject' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'undefined'   Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Not predefined variables' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a$'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'e$'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a$'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pi$'         Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Arrays are not comments' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a#'          Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'zero#'       Name.Function
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '5'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '6'           Literal.Number
-')'           Text
-'\n'          Text
+')'           Punctuation
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 '3'           Literal.Number
-']'           Text
+']'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '7'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printline'   Keyword
-' '           Text
+' '           Text.Whitespace
 "'a[3,5]'"    Literal.String.Interpol
 ', '          Literal.String
 "'a[3]'"      Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 '1'           Literal.Number
-']'           Text
-' '           Text
+']'           Punctuation
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'b'           Text
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 '1'           Literal.Number
-']'           Text
-']'           Text
-' '           Text
+']'           Punctuation
+']'           Punctuation
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-' '           Text
+' '           Text.Whitespace
 'b'           Text
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 '1'           Literal.Number
-']'           Text
-']'           Text
-' '           Text
+']'           Punctuation
+']'           Punctuation
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printline'   Keyword
-' '           Text
+' '           Text.Whitespace
 "'b[2]'"      Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# if-block with built-in variables' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'windows'     Name.Variable.Global
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# We are on Windows' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'unix'        Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 'macintosh'   Name.Variable.Global
-'\n  '        Text
+'\n  '        Text.Whitespace
 'exitScript'  Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'We are on Linux' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'macintosh'   Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 'exit'        Keyword
-' '           Text
+' '           Text.Whitespace
 'We are on Mac' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif'       Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Interpolation with precision digits' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 "'a:3'"       Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 "'a.a:3'"     Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 "'a[1]:3'"    Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 "'a1:3'"      Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 "'a:3'"       Literal.String.Interpol
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 "'a.a:3'"     Literal.String.Interpol
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 "'a[1]:3'"    Literal.String.Interpol
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 "'a1:3'"      Literal.String.Interpol
 '"'           Literal.String
-'\n\n'        Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
 
 '# Interpolations are not recursive' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 "'a'"         Literal.String.Interpol
 '1'           Literal.String
 "'"           Literal.String
 ':3'          Literal.String
 "'"           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 "'a'"         Literal.String.Interpol
@@ -725,208 +739,212 @@
 ':3'          Literal.String
 "'"           Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
 
 '# Interpolation without precision digits' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 "'var'"       Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'numeric'     Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 "'var$'"      Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'string'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 '\'var["a"]\'' Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'numeric hash' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 '\'var$["a"]\'' Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'string hash' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 "'var[1]'"    Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'numeric indexed variable' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unquoted '   Literal.String
 "'var$[1]'"   Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'string indexed variable' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 "'var'"       Literal.String.Interpol
 ' numeric'    Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 "'var$'"      Literal.String.Interpol
 ' string'     Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 '\'var["a"]\'' Literal.String.Interpol
 ' numeric hash' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 '\'var$["a"]\'' Literal.String.Interpol
 ' string hash' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 "'var[1]'"    Literal.String.Interpol
 ' numeric indexed variable' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted '     Literal.String
 "'var$[1]'"   Literal.String.Interpol
 ' string indexed variable' Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
 
 '# Indeces in interpolations must be literal' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'var[a]'      Literal.String
 "'"           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'var[a$]'     Literal.String
 "'"           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string$'     Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'But don'     Literal.String
 "'"           Literal.String
 't interpolate everything!' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string$'     Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'interpolatin' Literal.String
 "'"           Literal.String
 ' '           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'across'      Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' strings ain' Literal.String
 "'"           Literal.String
 't cool either' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string$'     Name.Function
 '('           Punctuation
 '10'          Literal.Number
-')'           Text
-' '           Text
+')'           Punctuation
+' '           Text.Whitespace
 '; This is a function' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'repeat'      Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'string$'     Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string$'     Text
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'right$'      Name.Function
 '('           Punctuation
 'string$'     Text
-')'           Text
-'\n'          Text
+')'           Punctuation
+'\n'          Text.Whitespace
 
 'until'       Keyword
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 'length'      Name.Function
 '('           Punctuation
 'string$'     Text
-')'           Text
-'\n\n'        Text
+')'           Punctuation
+'\n\n'        Text.Whitespace
 
 'T'           Keyword
 'ext'         Keyword
@@ -948,7 +966,7 @@
 '-'           Operator
 '-'           Operator
 'hyphens'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'T'           Keyword
 'ext'         Keyword
@@ -966,7 +984,7 @@
 'ottom'       Text
 ' '           Text
 'aحبيبa'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'T'           Keyword
 'ext'         Keyword
@@ -985,7 +1003,7 @@
 ' '           Text
 '日'           Text
 '本'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'D'           Keyword
 'raw '        Keyword
@@ -998,24 +1016,24 @@
 '0.5'         Literal.Number
 ' '           Text
 'i'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'rows'        Text
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Object'      Name.Builtin
 '_'           Name.Builtin
 "'table'"     Literal.String.Interpol
 '.nrow'       Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'value$'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Table'       Name.Builtin
 '_'           Name.Builtin
 "'table'"     Literal.String.Interpol
@@ -1023,78 +1041,78 @@
 '['           Text
 '25'          Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'f0'          Literal.String
 '"'           Literal.String
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fixed'       Text
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Sound'       Name.Builtin
 '_'           Name.Builtin
 '10'          Name.Builtin
 '.xmin'       Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fixed'       Text
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Object'      Name.Builtin
 '_'           Name.Builtin
 'foo'         Name.Builtin
 '.xmin'       Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fixed'       Text
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Procrustes'  Name.Builtin
 '_'           Name.Builtin
 'foo'         Name.Builtin
 '.nx'         Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Text
 '['           Punctuation
 '"'           Literal.String
 'vaa'         Literal.String
 '"'           Literal.String
-']'           Text
-' '           Text
+']'           Punctuation
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '; Hash'      Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Special two-word keyword' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'select'      Keyword
-' '           Text
+' '           Text.Whitespace
 'all'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Keyword with a predefined variable' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'select'      Keyword
-'  '          Text
+'  '          Text.Whitespace
 'all'         Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# old-style procedure call' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'call'        Keyword
-' '           Text
+' '           Text.Whitespace
 'oldStyle'    Name.Function
 ' '           Text
 '"'           Literal.String
@@ -1106,508 +1124,512 @@
 'unquoted'    Text
 ' '           Text
 'string'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-' '           Text
+' '           Text.Whitespace
 'oldStyle.local' Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# New-style procedure call with parens' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@'           Name.Function
 'newStyle'    Name.Function
-'('           Text
+'('           Punctuation
 '"'           Literal.String
 'quoted'      Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted string' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'praatVersion' Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '>='          Operator
-' '           Text
+' '           Text.Whitespace
 '5364'        Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# New-style procedure call with colon' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '@'           Name.Function
 'newStyle'    Name.Function
-':'           Text
-' '           Text
+':'           Punctuation
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted'      Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'quoted string' Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endif'       Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# inline if with inline comment' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'macintosh'   Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '; This is an inline comment' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# for-loop with explicit from using local variable' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# and paren-style function calls and variable interpolation' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'n'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'numberOfSelected' Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Sound'       Literal.String
 '"'           Literal.String
-')'           Text
-'\n'          Text
+')'           Punctuation
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'from'        Keyword
-' '           Text
+' '           Text.Whitespace
 'newStyle.local' Text
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Text
-'\n  '        Text
+'\n  '        Text.Whitespace
 'name'        Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'selected$'   Name.Function
 '('           Punctuation
 'extractWord$' Name.Function
 '('           Punctuation
 'selected$'   Name.Function
 '('           Punctuation
-')'           Text
+')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
-')'           Text
-')'           Text
-'\n  '        Text
+')'           Punctuation
+')'           Punctuation
+'\n  '        Text.Whitespace
 'sound'       Text
 "'i'"         Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'selected'    Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Sound'       Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'i'           Text
 '+'           Operator
 '('           Text
 'a'           Text
 '*'           Operator
 'b'           Text
-')'           Text
 ')'           Punctuation
-'\n  '        Text
+')'           Punctuation
+'\n  '        Text.Whitespace
 'sound'       Text
 '['           Punctuation
 'i'           Text
-']'           Text
-' '           Text
+']'           Punctuation
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sound'       Text
 "'i'"         Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endfor'      Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Text
-'\n  '        Text
+'\n  '        Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Different styles of object selection' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'select'      Keyword
-' '           Text
+' '           Text.Whitespace
 'sound'       Text
 "'i'"         Literal.String.Interpol
-'\n  '        Text
+'\n  '        Text.Whitespace
 'sound'       Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'selected'    Name.Function
 '('           Punctuation
-')'           Text
-'\n  '        Text
+')'           Punctuation
+'\n  '        Text.Whitespace
 'sound$'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'selected$'   Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Sound'       Literal.String
 '"'           Literal.String
-')'           Text
-'\n  '        Text
+')'           Punctuation
+'\n  '        Text.Whitespace
 'select'      Keyword
-' '           Text
+' '           Text.Whitespace
 'Sound'       Name.Class
-' '           Text
+' '           Text.Whitespace
 "'sound$'"    Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'selectObject' Name.Function
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sound'       Text
 '['           Punctuation
 'i'           Text
-']'           Text
-')'           Text
-'\n  '        Text
+']'           Punctuation
+')'           Punctuation
+'\n  '        Text.Whitespace
 'selectObject' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sound'       Text
-'\n\n'        Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '# Pause commands' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'beginPause'  Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Viewing '    Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'sound$'      Text
-')'           Text
-'\n  '        Text
+')'           Punctuation
+'\n  '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 'button'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'endPause'    Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Stop'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Previous'    Literal.String
 '"'           Literal.String
 ','           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '...'         Punctuation
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'total_sounds' Text
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Finish'      Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Next'        Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
 ','           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '...'         Punctuation
 '3'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-')'           Text
-'\n  '        Text
+')'           Punctuation
+'\n  '        Text.Whitespace
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'button'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'endPause'    Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Stop'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '...'         Punctuation
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'total_sounds' Text
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Finish'      Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Next'        Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
 ','           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '...'         Punctuation
 '2'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-')'           Text
-'\n  '        Text
+')'           Punctuation
+'\n  '        Text.Whitespace
 'endif'       Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'editor_name$' Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'total_textgrids' Text
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'TextGrid '   Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Sound '      Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'name$'       Text
-'\n  '        Text
+'\n  '        Text.Whitespace
 'nocheck'     Keyword
-' '           Text
+' '           Text.Whitespace
 'editor'      Keyword
-' '           Text
+' '           Text.Whitespace
 'Sound'       Name.Class
-' '           Text
+' '           Text.Whitespace
 "'editor_name$'" Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'nocheck'     Keyword
-' '           Text
+' '           Text.Whitespace
 'C'           Keyword
 'lose'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'nocheck'     Keyword
-' '           Text
+' '           Text.Whitespace
 'endeditor'   Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'editor_id'   Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'editor'      Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'editor_name$' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'C'           Keyword
 'lose'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'endeditor'   Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# New-style standalone command call' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'R'           Keyword
 'ename'       Keyword
 ':'           Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'SomeName'    Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '# Command call with assignment' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'duration'    Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'G'           Keyword
 'et '         Keyword
 'total '      Keyword
 'duration'    Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Multi-line command with modifier' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'pitch'       Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'noprogress'  Keyword
-' '           Text
+' '           Text.Whitespace
 'T'           Keyword
 'o '          Keyword
 'Pitch '      Keyword
 '(ac)'        Keyword
 ':'           Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '75'          Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '15'          Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'no'          Literal.String
 '"'           Literal.String
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '...'         Punctuation
 '0.03'        Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0.45'        Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0.01'        Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0.35'        Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0.14'        Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '600'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '# Formulas are strings' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'F'           Keyword
 'ormula'      Keyword
 ':'           Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'if col = 1 then row * Object_' Literal.String
 "'pitch'"     Literal.String.Interpol
@@ -1615,44 +1637,46 @@
 "'first'"     Literal.String.Interpol
 ' else self fi' Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'\n'          Text.Whitespace
+
+'  '          Text.Whitespace
 '# do-style command with assignment' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'minimum'     Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'do'          Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Get minimum...' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Hertz'       Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Parabolic'   Literal.String
 '"'           Literal.String
-')'           Text
-'\n\n  '      Text
+')'           Punctuation
+'\n\n  '      Text.Whitespace
 '# New-style multi-line command call with broken strings' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'table'       Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'C'           Keyword
 'reate '      Keyword
 'Table '      Keyword
@@ -1660,92 +1684,96 @@
 'column '     Keyword
 'names'       Keyword
 ':'           Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'table'       Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '...'         Punctuation
 '"'           Literal.String
 'file subject speaker' Literal.String
-'\n    '      Text
+'\n    '      Text.Whitespace
 '...'         Punctuation
 ' f0 f1 f2 f' Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'string$'     Name.Function
 '('           Punctuation
 '3'           Literal.Number
-')'           Text
-' '           Text
+')'           Punctuation
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '...'         Punctuation
 '"'           Literal.String
 'duration response' Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '# Function call with trailing space' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'removeObject' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pitch'       Text
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'table'       Text
-'\n\n'        Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '# Picture window commands' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'selectObject' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sound'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '# do-style command' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'do'          Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Select inner viewport...' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '6'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0.5'         Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1.5'         Literal.Number
-')'           Text
-'\n  '        Text
+')'           Punctuation
+'\n  '        Text.Whitespace
 'B'           Keyword
 'lack'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'D'           Keyword
 'raw'         Keyword
 '...'         Keyword
@@ -1764,48 +1792,48 @@
 ' '           Text
 'C'           Text
 'urve'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'D'           Keyword
 'raw '        Keyword
 'inner '      Keyword
 'box'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'T'           Keyword
 'ext '        Keyword
 'bottom'      Keyword
 ':'           Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'yes'         Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sound$'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'E'           Keyword
 'rase '       Keyword
 'all'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Demo window commands' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'demo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'E'           Keyword
 'rase '       Keyword
 'all'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'demo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'S'           Keyword
 'elect '      Keyword
 'inner '      Keyword
@@ -1819,11 +1847,11 @@
 '0'           Literal.Number
 ' '           Text
 '100'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'demo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'A'           Keyword
 'xes'         Keyword
 '...'         Keyword
@@ -1835,11 +1863,11 @@
 '0'           Literal.Number
 ' '           Text
 '100'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'demo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'P'           Keyword
 'aint '       Keyword
 'rectangle'   Keyword
@@ -1854,11 +1882,11 @@
 '0'           Literal.Number
 ' '           Text
 '100'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'demo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'T'           Keyword
 'ext'         Keyword
 '...'         Keyword
@@ -1877,181 +1905,182 @@
 'to'          Text
 ' '           Text
 'finish'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'demoWaitForInput' Name.Function
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-' )'          Text
-'\n  '        Text
+' '           Text.Whitespace
+')'           Punctuation
+'\n  '        Text.Whitespace
 'demo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'E'           Keyword
 'rase '       Keyword
 'all'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'demo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'T'           Keyword
 'ext'         Keyword
 ':'           Keyword
-' '           Text
+' '           Text.Whitespace
 '50'          Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'centre'      Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '50'          Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'half'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Finished'    Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endwhile'    Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'switch$'     Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'switch'      Text
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'a'           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '...'         Punctuation
-'     '       Text
+'     '       Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'switch'      Text
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'b'           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '...'         Punctuation
-'     '       Text
+'     '       Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'switch'      Text
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'c'           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '...'         Punctuation
-'     '       Text
+'     '       Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'switch'      Text
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'd'           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '...'         Punctuation
-'     '       Text
+'     '       Text.Whitespace
 '"'           Literal.String
 'default'     Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# An old-style sendpraat block' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# All these lines should be a string!' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sendpraat'   Keyword
-' '           Text
+' '           Text.Whitespace
 'Praat'       Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 '...'         Punctuation
 "'newline$'"  Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'Create Sound as pure tone... "tone" 1 0 0.4 44100 440 0.2 0.01 0.01' Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 '...'         Punctuation
 "'newline$'"  Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'Play'        Literal.String
-'\n  '        Text
+'\n  '        Text.Whitespace
 '...'         Punctuation
 "'newline$'"  Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'Remove'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# A new-style sendpraat block' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'beginSendPraat' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Praat'       Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'C'           Keyword
 'reate '      Keyword
 'Sound '      Keyword
@@ -2059,142 +2088,144 @@
 'pure '       Keyword
 'tone'        Keyword
 ':'           Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'tone'        Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0.4'         Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '44100'       Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '440'         Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0.2'         Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0.01'        Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0.01'        Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'duration'    Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'G'           Keyword
 'et '         Keyword
 'total '      Keyword
 'duration'    Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'R'           Keyword
 'emove'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endSendPraat' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'duration'    Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'The generated sound lasted for ' Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'duration'    Text
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'seconds'     Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
 
 '# Number types' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'   '         Text
+'   '         Text.Whitespace
 '10%'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 '-'           Operator
 '10'          Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 '+'           Operator
 '10'          Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'   '         Text
+'   '         Text.Whitespace
 '10.4'        Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 '294e12'      Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'    '        Text
+'    '        Text.Whitespace
 '2.94e12'     Literal.Number
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Operators' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '^'           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '6'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '('           Punctuation
 '1'           Literal.Number
@@ -2203,257 +2234,257 @@
 ')'           Punctuation
 '^'           Operator
 '6'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number
 '^'           Operator
 '3'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '^'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '54'          Literal.Number
-' '           Text
+' '           Text.Whitespace
 'div'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '5.1'         Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '54.3'        Literal.Number
-' '           Text
+' '           Text.Whitespace
 'mod'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '7'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '8'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '7'           Literal.Number
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '7'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '3'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '('           Punctuation
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Logical operators' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'   '         Text
+'   '         Text.Whitespace
 'b'           Text
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'c'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-'  '          Text
+'  '          Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'b'           Text
-'  '          Text
+'  '          Text.Whitespace
 'or'          Operator.Word
-'  '          Text
+'  '          Text.Whitespace
 'c'           Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-'  '          Text
+'  '          Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '<='          Operator
-'  '          Text
+'  '          Text.Whitespace
 'b'           Text
-'  '          Text
+'  '          Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'c'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-'  '          Text
+'  '          Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '>='          Operator
-'  '          Text
+'  '          Text.Whitespace
 'b'           Text
-'     '       Text
+'     '       Text.Whitespace
 '!'           Operator
 'c'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-'  '          Text
+'  '          Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-'  '          Text
+'  '          Text.Whitespace
 'b'           Text
-'  '          Text
+'  '          Text.Whitespace
 '&'           Operator
-'   '         Text
+'   '         Text.Whitespace
 'c'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-'  '          Text
+'  '          Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-'  '          Text
+'  '          Text.Whitespace
 'b'           Text
-'  '          Text
+'  '          Text.Whitespace
 '&&'          Operator
-'  '          Text
+'  '          Text.Whitespace
 'c'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-'  '          Text
+'  '          Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '>'           Operator
-'  '          Text
+'  '          Text.Whitespace
 'b'           Text
-'  '          Text
+'  '          Text.Whitespace
 '||'          Operator
-'  '          Text
+'  '          Text.Whitespace
 'c'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-'  '          Text
+'  '          Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-'   '         Text
+'   '         Text.Whitespace
 'b'           Text
-'  '          Text
+'  '          Text.Whitespace
 '|'           Operator
-'   '         Text
+'   '         Text.Whitespace
 'c'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-'  '          Text
+'  '          Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-'   '         Text
+'   '         Text.Whitespace
 'b'           Text
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'assert'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Text
 ')'           Punctuation
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'b'           Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Text
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
 '('           Punctuation
 'b'           Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Text
 ')'           Punctuation
@@ -2461,140 +2492,140 @@
 '('           Punctuation
 'b'           Text
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'assert'      Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'hello'       Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 '"'           Literal.String
 'he'          Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'llo'         Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'hello'       Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'hello world' Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' world'      Literal.String
 '"'           Literal.String
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'stopwatch'   Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'time'        Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'stopwatch'   Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'clearinfo'   Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Keyword
-' '           Text
+' '           Text.Whitespace
 'This script took' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Keyword
-' '           Text
+' '           Text.Whitespace
 "'time'"      Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'seconds to'  Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printline'   Keyword
-' '           Text
+' '           Text.Whitespace
 'execute.'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Old-style procedure declaration' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'oldStyle'    Name.Function
 ' .str1$ .num .str2$' Text
-'\n  '        Text
+'\n  '        Text.Whitespace
 '.local'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endproc'     Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# New-style procedure declaration with parentheses' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 'newStyle'    Name.Function
-' ('          Text
+' ('          Text.Whitespace
 '.str1$'      Text
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '.num'        Text
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '.str2$'      Text
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Command with "local" variable' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '.local'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'G'           Keyword
 'et '         Keyword
 'total '      Keyword
 'duration'    Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '.local'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'G'           Keyword
 'et '         Keyword
 "'some'"      Literal.String.Interpol
 ' duration'   Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '.local'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'G'           Keyword
 'et '         Keyword
 "'some[1]'"   Literal.String.Interpol
@@ -2608,194 +2639,194 @@
 'p'           Text
 '['           Punctuation
 'i'           Text
-']'           Text
-'\n'          Text
+']'           Punctuation
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '.local'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'G'           Keyword
 'et '         Keyword
 "'some[1,3]'" Literal.String.Interpol
 ' value'      Keyword
 ':'           Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'hello'       Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '10'          Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'p'           Text
 '['           Punctuation
 'i'           Text
-']'           Text
-'\n'          Text
+']'           Punctuation
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '.local'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'G'           Keyword
 'et '         Keyword
 "'some$'"     Literal.String.Interpol
 ' duration'   Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '.local'      Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'G'           Keyword
 'et '         Keyword
 "'some$[1]'"  Literal.String.Interpol
 ' duration'   Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endproc'     Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# New-style procedure declaration with colon' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'procedure'   Keyword
-' '           Text
+' '           Text.Whitespace
 '_new_style'  Name.Function
-':'           Text
-' '           Text
+':'           Text.Whitespace
+' '           Text.Whitespace
 '.str1$'      Text
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '.num'        Text
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '.str2$'      Text
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Command with "local" variable' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Initial underscores in variables not allowed (unless interpolated)' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '_new_style.local' Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'G'           Keyword
 'et '         Keyword
 'total '      Keyword
 'duration'    Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endproc'     Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'asserterror' Keyword
-' '           Text
+' '           Text.Whitespace
 'Unknown symbol:' Literal.String
 "'newline$'"  Literal.String.Interpol
 '« _'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assert'      Keyword
-' '           Text
+' '           Text.Whitespace
 "'_new_style.local'" Literal.String.Interpol
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '@'           Name.Function
 'proc'        Name.Function
-':'           Text
-' '           Text
+':'           Punctuation
+' '           Text.Whitespace
 'a'           Text
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'selected'    Name.Function
 '('           Punctuation
 '"'           Literal.String
 'string'      Literal.String
 '"'           Literal.String
-')'           Text
+')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Comment'   Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Text
-' '           Text
+' '           Text.Whitespace
 'to'          Keyword
-' '           Text
+' '           Text.Whitespace
 'saveSelection.n' Text
-'\n  '        Text
+'\n  '        Text.Whitespace
 'selectObject' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'saveSelection.id' Text
 '['           Punctuation
 'i'           Text
-']'           Text
-'\n'          Text
+']'           Punctuation
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 'appendInfoLine' Name.Function
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'selected$'   Name.Function
 '('           Punctuation
-')'           Text
-'\n'          Text
+')'           Punctuation
+'\n'          Text.Whitespace
 
 'endfor'      Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '@'           Name.Function
 'ok'          Name.Function
-'('           Text
+'('           Punctuation
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'selected$'   Name.Function
 '('           Punctuation
 '"'           Literal.String
 'Sound'       Literal.String
 '"'           Literal.String
-')'           Text
-' '           Text
+')'           Punctuation
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'tone'        Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
 ','           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 '...'         Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'selected sound is tone' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '@'           Name.Function
 'ok_formula'  Name.Function
-'('           Text
+'('           Punctuation
 '"'           Literal.String
 'selected$('  Literal.String
 '"'           Literal.String
@@ -2811,9 +2842,9 @@
 '"'           Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'selected sound is tone' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/properties/java.properties b/tests/examplefiles/properties/java.properties
index 72ad0f964c..d5b594e3d8 100644
--- a/tests/examplefiles/properties/java.properties
+++ b/tests/examplefiles/properties/java.properties
@@ -1,16 +1,24 @@
-foo = bar
-foo: bar
-foo.oof: \
-    bar=baz; \
-    asdf
+#https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Properties.htm
+# mixing spaces
+	Truth = Beauty
+  Truth:Beauty
+Truth	Beauty
+Truth                    :Beauty
+ 
+! line continuations and escapes
+ fruits                           apple, banana, pear, \
+                                  cantaloupe, watermelon, \
+                                  kiwi, mango
+key = \
+    value1 \\\
+    and value2\\
+key\ 2 = value
+key\\ 3 = value3
 
-// comment
-# comment
-; comment
-
-x:a\
-b
-x: a \
-  b
-
-x = \
+! empty keys and edge cases
+key1 =
+key2
+key3 the value3
+key4 the:value4
+key5 the=value5
+key6=the value6
diff --git a/tests/examplefiles/properties/java.properties.output b/tests/examplefiles/properties/java.properties.output
index 3efd7e2a4f..0c1fdeebf7 100644
--- a/tests/examplefiles/properties/java.properties.output
+++ b/tests/examplefiles/properties/java.properties.output
@@ -1,50 +1,94 @@
-'foo'         Name.Attribute
+'#https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Properties.htm' Comment.Single
+'\n'          Text.Whitespace
+
+'# mixing spaces' Comment.Single
+'\n\t'        Text.Whitespace
+'Truth'       Name.Attribute
 ' '           Text.Whitespace
 '='           Operator
 ' '           Text.Whitespace
-'bar'         Literal.String
+'Beauty'      Literal.String
+'\n  '        Text.Whitespace
+'Truth'       Name.Attribute
+':'           Operator
+'Beauty'      Literal.String
 '\n'          Text.Whitespace
 
-'foo'         Name.Attribute
-':'           Operator
-' '           Text.Whitespace
-'bar'         Literal.String
+'Truth'       Name.Attribute
+'\t'          Text.Whitespace
+'Beauty'      Literal.String
 '\n'          Text.Whitespace
 
-'foo.oof'     Name.Attribute
+'Truth'       Name.Attribute
+'                    ' Text.Whitespace
 ':'           Operator
-' '           Text.Whitespace
-'\\\n    bar=baz; \\\n    asdf' Literal.String
-'\n'          Text.Whitespace
+'Beauty'      Literal.String
+'\n \n'       Text.Whitespace
 
+'! line continuations and escapes' Comment.Single
+'\n '         Text.Whitespace
+'fruits'      Name.Attribute
+'                           ' Text.Whitespace
+'apple, banana, pear, ' Literal.String
+'\\'          Text
+'\n                                  ' Text.Whitespace
+'cantaloupe, watermelon, ' Literal.String
+'\\'          Text
+'\n                                  ' Text.Whitespace
+'kiwi, mango' Literal.String
 '\n'          Text.Whitespace
 
-'// comment'  Comment
+'key'         Name.Attribute
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'\\'          Text
+'\n    '      Text.Whitespace
+'value1 \\\\' Literal.String
+'\\'          Text
+'\n    '      Text.Whitespace
+'and value2\\\\' Literal.String
 '\n'          Text.Whitespace
 
-'# comment'   Comment
+'key\\ 2'     Name.Attribute
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'value'       Literal.String
 '\n'          Text.Whitespace
 
-'; comment'   Comment
+'key\\\\'     Name.Attribute
+' '           Text.Whitespace
+'3 = value3'  Literal.String
+'\n\n'        Text.Whitespace
+
+'! empty keys and edge cases' Comment.Single
 '\n'          Text.Whitespace
 
+'key1'        Name.Attribute
+' '           Text.Whitespace
+'='           Operator
 '\n'          Text.Whitespace
 
-'x'           Name.Attribute
-':'           Operator
-'a\\\nb'      Literal.String
+'key2'        Name.Attribute
 '\n'          Text.Whitespace
 
-'x'           Name.Attribute
-':'           Operator
+'key3'        Name.Attribute
 ' '           Text.Whitespace
-'a \\\n  b'   Literal.String
+'the value3'  Literal.String
 '\n'          Text.Whitespace
 
+'key4'        Name.Attribute
+' '           Text.Whitespace
+'the:value4'  Literal.String
 '\n'          Text.Whitespace
 
-'x'           Name.Attribute
+'key5'        Name.Attribute
 ' '           Text.Whitespace
+'the=value5'  Literal.String
+'\n'          Text.Whitespace
+
+'key6'        Name.Attribute
 '='           Operator
-' '           Text.Whitespace
-'\\\n'        Literal.String
+'the value6'  Literal.String
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/protobuf/addressbook.proto.output b/tests/examplefiles/protobuf/addressbook.proto.output
index 34875e788e..6f5e45c77a 100644
--- a/tests/examplefiles/protobuf/addressbook.proto.output
+++ b/tests/examplefiles/protobuf/addressbook.proto.output
@@ -1,14 +1,14 @@
 '// See README.txt for information and build instructions.\n' Comment.Single
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'package'     Keyword.Namespace
 ' '           Text.Whitespace
 'tutorial'    Name.Namespace
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'option'      Keyword
 ' '           Text.Whitespace
@@ -18,7 +18,7 @@
 ' '           Text.Whitespace
 '"com.example.tutorial"' Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'option'      Keyword
 ' '           Text.Whitespace
@@ -28,16 +28,16 @@
 ' '           Text.Whitespace
 '"AddressBookProtos"' Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'message'     Keyword.Declaration
 ' '           Text.Whitespace
 'Person'      Name.Class
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'required'    Keyword
@@ -50,7 +50,7 @@
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'required'    Keyword
@@ -77,9 +77,9 @@
 ' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'enum'        Keyword.Declaration
@@ -87,7 +87,7 @@
 'PhoneType'   Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'MOBILE'      Name.Attribute
@@ -96,7 +96,7 @@
 ' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'HOME'        Name.Attribute
@@ -105,7 +105,7 @@
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'WORK'        Name.Attribute
@@ -114,13 +114,13 @@
 ' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'message'     Keyword.Declaration
@@ -128,7 +128,7 @@
 'PhoneNumber' Name.Class
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'required'    Keyword
@@ -141,7 +141,7 @@
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'optional'    Keyword
@@ -162,13 +162,13 @@
 'HOME'        Name
 ']'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'repeated'    Keyword
@@ -181,12 +181,12 @@
 ' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '// Our address book file is just one of these.\n' Comment.Single
 
@@ -195,7 +195,7 @@
 'AddressBook' Name.Class
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'repeated'    Keyword
@@ -208,7 +208,7 @@
 ' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pycon/pycon_ctrlc_traceback.output b/tests/examplefiles/pycon/pycon_ctrlc_traceback.output
index 2cdae0cf81..6bdb3e01ef 100644
--- a/tests/examplefiles/pycon/pycon_ctrlc_traceback.output
+++ b/tests/examplefiles/pycon/pycon_ctrlc_traceback.output
@@ -4,13 +4,13 @@
 'import'      Keyword.Namespace
 ' '           Text
 'os'          Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>> '        Generic.Prompt
 'print'       Name.Builtin
 ' '           Text
 'os'          Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 "<module 'os' from '/file/path.py'>\n" Generic.Output
 
@@ -26,7 +26,7 @@
 '10'          Literal.Number.Integer
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '    '        Text
@@ -39,7 +39,7 @@
 '+'           Operator
 ' '           Text
 '2'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '    '        Text
@@ -47,7 +47,7 @@
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '    '        Text
@@ -59,17 +59,17 @@
 ' '           Text
 '5'           Literal.Number.Integer
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '        '    Text
 'raise'       Keyword
 ' '           Text
 'Exception'   Name.Exception
-'\n'          Text
+'\n'          Text.Whitespace
 
 '...'         Generic.Prompt
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0\n'         Generic.Output
 
@@ -93,10 +93,10 @@
 '5'           Literal.Number
 ', in '       Text
 '<module>'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Exception'   Generic.Error
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>>\n'       Generic.Output
 
@@ -105,15 +105,15 @@
 ' '           Text
 'True'        Keyword.Constant
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '    '        Text
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '...'         Generic.Prompt
-'\n'          Text
+'\n'          Text.Whitespace
 
 '^CTraceback (most recent call last):\n' Generic.Output
 
@@ -132,10 +132,10 @@
 ')'           Punctuation
 ':'           Punctuation
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '...'         Generic.Prompt
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>> '        Generic.Prompt
 'class'       Keyword
@@ -146,21 +146,21 @@
 ')'           Punctuation
 ':'           Punctuation
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '...'         Generic.Prompt
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>> '        Generic.Prompt
 'try'         Keyword
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '    '        Text
 'try'         Keyword
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '        '    Text
@@ -172,13 +172,13 @@
 'first'       Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '    '        Text
 'finally'     Keyword
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '        '    Text
@@ -190,7 +190,7 @@
 'second'      Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 'except'      Keyword
@@ -201,7 +201,7 @@
 ' '           Text
 'c'           Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '    '        Text
@@ -209,10 +209,10 @@
 '('           Punctuation
 'c'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '...'         Generic.Prompt
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
@@ -222,12 +222,12 @@
 '3'           Literal.Number
 ', in '       Text
 '<module>'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '__main__.A'  Generic.Error
 ': '          Text
 'first'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Generic.Output
 
@@ -243,12 +243,12 @@
 '5'           Literal.Number
 ', in '       Text
 '<module>'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '__main__.B'  Generic.Error
 ': '          Text
 'second'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Generic.Output
 
@@ -256,29 +256,29 @@
 'x'           Name
 ' '           Text
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Generic.Traceback
 '  File '     Text
 '"<stdin>"'   Name.Builtin
 ', line '     Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'x'           Name
 ' '           Text
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'       '     Text
+'       '     Text.Whitespace
 '^'           Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SyntaxError' Generic.Error
 ': '          Text
 'invalid syntax' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>>\n'       Generic.Output
 
@@ -290,7 +290,7 @@
 '='           Operator
 ' '           Text
 '3'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>> '        Generic.Prompt
 'with'        Keyword
@@ -301,7 +301,7 @@
 ' '           Text
 'y'           Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '... '        Generic.Prompt
 '   '         Text
@@ -313,10 +313,10 @@
 ' '           Text
 'y'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '...'         Generic.Prompt
-'\n'          Text
+'\n'          Text.Whitespace
 
 '8\n'         Generic.Output
 
@@ -351,14 +351,14 @@
 'detail'      Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
 ' .123\nValueError' Generic.Error
 ': '          Text
 'multi'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    line\n'  Generic.Output
 
@@ -379,20 +379,20 @@
 'detail'      Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
-'    '        Text
+'    '        Text.Whitespace
 '.'           Operator
 '.'           Operator
 '.'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ValueError'  Generic.Error
 ': '          Text
 'multi'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    line\n'  Generic.Output
 
@@ -413,21 +413,21 @@
 'detail'      Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
-'    '        Text
+'    '        Text.Whitespace
 '.'           Operator
 '.'           Operator
 '.'           Operator
 '.'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ValueError'  Generic.Error
 ': '          Text
 'multi'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    line\n'  Generic.Output
 
@@ -448,22 +448,22 @@
 'detail'      Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
-'    '        Text
+'    '        Text.Whitespace
 ' '           Text
 '.'           Operator
 '.'           Operator
 '.'           Operator
 '.'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ValueError'  Generic.Error
 ': '          Text
 'multi'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    line\n'  Generic.Output
 
@@ -484,18 +484,18 @@
 'detail'      Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
-'  '          Text
+'  '          Text.Whitespace
 '...'         Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ValueError'  Generic.Error
 ': '          Text
 'multi'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    line\n'  Generic.Output
 
@@ -507,7 +507,7 @@
 'raise'       Keyword
 ' '           Text
 'Exception'   Name.Exception
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
@@ -517,16 +517,16 @@
 '1'           Literal.Number
 ', in '       Text
 '<module>'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Exception'   Generic.Error
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>> '        Generic.Prompt
 'import'      Keyword.Namespace
 ' '           Text
 'somemodule'  Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>> '        Generic.Prompt
 'somemodule'  Name
@@ -534,7 +534,7 @@
 'blah'        Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
@@ -544,7 +544,7 @@
 '1'           Literal.Number
 ', in '       Text
 '<module>'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/path/to/stuff/somemodule/blah.py"' Name.Builtin
@@ -552,9 +552,9 @@
 '658'         Literal.Number
 ', in '       Text
 'blah'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'raise'       Keyword
 ' '           Text
 'Exception'   Name.Exception
@@ -563,9 +563,9 @@
 'Hi.'         Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Exception'   Generic.Error
 ': '          Text
 'Hi.'         Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pycon/pycon_test.pycon.output b/tests/examplefiles/pycon/pycon_test.pycon.output
index 2ab6654bde..309468762f 100644
--- a/tests/examplefiles/pycon/pycon_test.pycon.output
+++ b/tests/examplefiles/pycon/pycon_test.pycon.output
@@ -1,29 +1,29 @@
 '>>> '        Generic.Prompt
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Generic.Traceback
 '  File '     Text
 '"<stdin>"'   Name.Builtin
 ', line '     Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '^'           Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SyntaxError' Generic.Error
 ': '          Text
 'invalid syntax' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>> '        Generic.Prompt
-'\n'          Text
+'\n'          Text.Whitespace
 
 'KeyboardInterrupt\n' Name.Class
 
@@ -35,16 +35,16 @@
 '1'           Literal.Number.Integer
 '/'           Operator
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
-'   '         Text
+'   '         Text.Whitespace
 '...'         Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ZeroDivisionError' Generic.Error
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Generic.Output
 
@@ -54,10 +54,10 @@
 '0'           Literal.Number.Integer
 '   '         Text
 '# this used to swallow the traceback' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
-'   '         Text
+'   '         Text.Whitespace
 '...'         Comment
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pytb/database.pytb.output b/tests/examplefiles/pytb/database.pytb.output
index e942261340..6ae72773c6 100644
--- a/tests/examplefiles/pytb/database.pytb.output
+++ b/tests/examplefiles/pytb/database.pytb.output
@@ -1,6 +1,6 @@
 'Text before\n' Other
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Traceback (most recent call last):\n' Generic.Traceback
 
@@ -10,16 +10,16 @@
 '314'         Literal.Number
 ', in '       Text
 'dispatch_request' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'dispatcher'  Name
 '.'           Operator
 'dispatch'    Name
 '('           Punctuation
 'req'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/web/main.py"' Name.Builtin
@@ -27,9 +27,9 @@
 '186'         Literal.Number
 ', in '       Text
 'dispatch'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'req'         Name
 '.'           Operator
 'session'     Name
@@ -45,7 +45,7 @@
 ' '           Text
 'req'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/web/session.py"' Name.Builtin
@@ -53,16 +53,16 @@
 '52'          Literal.Number
 ', in '       Text
 '__init__'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'self'        Name.Builtin.Pseudo
 '.'           Operator
 'promote_session' Name
 '('           Punctuation
 'sid'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/web/session.py"' Name.Builtin
@@ -70,9 +70,9 @@
 '125'         Literal.Number
 ', in '       Text
 'promote_session' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '"'           Literal.String.Double
 'AND authenticated=0' Literal.String.Double
 '"'           Literal.String.Double
@@ -83,7 +83,7 @@
 ','           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/db/util.py"' Name.Builtin
@@ -91,9 +91,9 @@
 '47'          Literal.Number
 ', in '       Text
 'execute'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
 ' '           Text
 'self'        Name.Builtin.Pseudo
@@ -110,7 +110,7 @@
 ' '           Text
 'args'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py"' Name.Builtin
@@ -118,9 +118,9 @@
 '44'          Literal.Number
 ', in '       Text
 'execute'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'args'        Name
 ' '           Text
 'or'          Operator.Word
@@ -128,7 +128,7 @@
 '['           Punctuation
 ']'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py"' Name.Builtin
@@ -136,9 +136,9 @@
 '36'          Literal.Number
 ', in '       Text
 '_rollback_on_error' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
 ' '           Text
 'function'    Name
@@ -154,13 +154,13 @@
 '*'           Operator
 'kwargs'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'OperationalError' Generic.Error
 ': '          Text
 'database is locked' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Text after\n' Other
diff --git a/tests/examplefiles/pytb/error_locations.pytb.output b/tests/examplefiles/pytb/error_locations.pytb.output
index 52a5c18725..1589d9bfc0 100644
--- a/tests/examplefiles/pytb/error_locations.pytb.output
+++ b/tests/examplefiles/pytb/error_locations.pytb.output
@@ -6,17 +6,17 @@
 '13'          Literal.Number
 ', in '       Text
 '<module>'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'in_Python_3_11' Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '^^^^^^^^^^^^^^^^' Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/home/tb.py"' Name.Builtin
@@ -24,19 +24,19 @@
 '2'           Literal.Number
 ', in '       Text
 'in_Python_3_11' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
 ' '           Text
 'error_locations' Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'           ' Text
+'           ' Text.Whitespace
 '^^^^^^^^^^^^^^^^^' Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/home/tb.py"' Name.Builtin
@@ -44,9 +44,9 @@
 '5'           Literal.Number
 ', in '       Text
 'error_locations' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
 ' '           Text
 'are_provided' Name
@@ -56,11 +56,11 @@
 'is'          Operator.Word
 ' '           Text
 'True'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
-'           ' Text
+'           ' Text.Whitespace
 '^^^^^^^^^^^^^^' Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/home/tb.py"' Name.Builtin
@@ -68,19 +68,19 @@
 '8'           Literal.Number
 ', in '       Text
 'are_provided' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
 ' '           Text
 'in_tracebacks' Name
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'           ' Text
+'           ' Text.Whitespace
 '^^^^^^^^^^^^^^^' Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/home/tb.py"' Name.Builtin
@@ -88,21 +88,21 @@
 '11'          Literal.Number
 ', in '       Text
 'in_tracebacks' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
 ' '           Text
 '1'           Literal.Number.Integer
 '/'           Operator
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'           ' Text
+'           ' Text.Whitespace
 '~^~'         Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ZeroDivisionError' Generic.Error
 ': '          Text
 'division by zero' Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pytb/py3tb_test.py3tb.output b/tests/examplefiles/pytb/py3tb_test.py3tb.output
index 05445c72b1..245b8e2fad 100644
--- a/tests/examplefiles/pytb/py3tb_test.py3tb.output
+++ b/tests/examplefiles/pytb/py3tb_test.py3tb.output
@@ -3,18 +3,18 @@
 '"<stdin>"'   Name.Builtin
 ', line '     Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '1'           Literal.Number.Integer
 '+'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'     '       Text
+'     '       Text.Whitespace
 '^'           Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SyntaxError' Generic.Error
 ': '          Text
 'invalid syntax' Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pytb/pytb_test2.pytb.output b/tests/examplefiles/pytb/pytb_test2.pytb.output
index aa26c7ef24..019199fdb8 100644
--- a/tests/examplefiles/pytb/pytb_test2.pytb.output
+++ b/tests/examplefiles/pytb/pytb_test2.pytb.output
@@ -3,9 +3,9 @@
 '"temp.py"'   Name.Builtin
 ', line '     Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SyntaxError' Generic.Error
 ': '          Text
 "Non-ASCII character '\\xc3' in file temp.py on line 1, but no encoding declared; see http://www.python.org/peps/pep-0263.html for details" Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pytb/pytb_test3.pytb.output b/tests/examplefiles/pytb/pytb_test3.pytb.output
index 073aea2add..a083afb65c 100644
--- a/tests/examplefiles/pytb/pytb_test3.pytb.output
+++ b/tests/examplefiles/pytb/pytb_test3.pytb.output
@@ -8,12 +8,12 @@
 '1'           Literal.Number
 ', in '       Text
 '<module>'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TypeError'   Generic.Error
 ': '          Text
 "unsupported operand type(s) for /: 'int' and 'str'" Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '>>> blah\n'  Other
 
@@ -25,7 +25,7 @@
 '1'           Literal.Number
 ', in '       Text
 '<module>'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'builtins.NameError' Generic.Error
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pytb/syntax_error.py2tb.output b/tests/examplefiles/pytb/syntax_error.py2tb.output
index f7ae91bfc8..e5edf23283 100644
--- a/tests/examplefiles/pytb/syntax_error.py2tb.output
+++ b/tests/examplefiles/pytb/syntax_error.py2tb.output
@@ -3,19 +3,19 @@
 '"<stdin>"'   Name.Builtin
 ', line '     Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'mismatch'    Name
 '('           Punctuation
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'           ' Text
+'           ' Text.Whitespace
 '^'           Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SyntaxError' Generic.Error
 ': '          Text
 "closing parenthesis ']' does not match opening parenthesis '('" Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pytb/syntax_error.pytb.output b/tests/examplefiles/pytb/syntax_error.pytb.output
index f7ae91bfc8..e5edf23283 100644
--- a/tests/examplefiles/pytb/syntax_error.pytb.output
+++ b/tests/examplefiles/pytb/syntax_error.pytb.output
@@ -3,19 +3,19 @@
 '"<stdin>"'   Name.Builtin
 ', line '     Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'mismatch'    Name
 '('           Punctuation
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'           ' Text
+'           ' Text.Whitespace
 '^'           Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
 
 'SyntaxError' Generic.Error
 ': '          Text
 "closing parenthesis ']' does not match opening parenthesis '('" Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pytb/syntax_error_caret_code.py2tb.output b/tests/examplefiles/pytb/syntax_error_caret_code.py2tb.output
index 8e51a86802..177c9b9477 100644
--- a/tests/examplefiles/pytb/syntax_error_caret_code.py2tb.output
+++ b/tests/examplefiles/pytb/syntax_error_caret_code.py2tb.output
@@ -3,12 +3,12 @@
 '"<stdin>"'   Name.Builtin
 ', line '     Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '^'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '^'           Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pytb/syntax_error_caret_code.pytb.output b/tests/examplefiles/pytb/syntax_error_caret_code.pytb.output
index 8e51a86802..177c9b9477 100644
--- a/tests/examplefiles/pytb/syntax_error_caret_code.pytb.output
+++ b/tests/examplefiles/pytb/syntax_error_caret_code.pytb.output
@@ -3,12 +3,12 @@
 '"<stdin>"'   Name.Builtin
 ', line '     Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '^'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '^'           Punctuation.Marker
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/pytb/truncated.pytb.output b/tests/examplefiles/pytb/truncated.pytb.output
index 5b8c94acaf..e4e202d3d5 100644
--- a/tests/examplefiles/pytb/truncated.pytb.output
+++ b/tests/examplefiles/pytb/truncated.pytb.output
@@ -5,16 +5,16 @@
 '314'         Literal.Number
 ', in '       Text
 'dispatch_request' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'dispatcher'  Name
 '.'           Operator
 'dispatch'    Name
 '('           Punctuation
 'req'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/web/main.py"' Name.Builtin
@@ -22,9 +22,9 @@
 '186'         Literal.Number
 ', in '       Text
 'dispatch'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'req'         Name
 '.'           Operator
 'session'     Name
@@ -40,7 +40,7 @@
 ' '           Text
 'req'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/web/session.py"' Name.Builtin
@@ -48,16 +48,16 @@
 '52'          Literal.Number
 ', in '       Text
 '__init__'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'self'        Name.Builtin.Pseudo
 '.'           Operator
 'promote_session' Name
 '('           Punctuation
 'sid'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/web/session.py"' Name.Builtin
@@ -65,9 +65,9 @@
 '125'         Literal.Number
 ', in '       Text
 'promote_session' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '"'           Literal.String.Double
 'AND authenticated=0' Literal.String.Double
 '"'           Literal.String.Double
@@ -78,7 +78,7 @@
 ','           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/db/util.py"' Name.Builtin
@@ -86,9 +86,9 @@
 '47'          Literal.Number
 ', in '       Text
 'execute'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
 ' '           Text
 'self'        Name.Builtin.Pseudo
@@ -105,7 +105,7 @@
 ' '           Text
 'args'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py"' Name.Builtin
@@ -113,9 +113,9 @@
 '44'          Literal.Number
 ', in '       Text
 'execute'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'args'        Name
 ' '           Text
 'or'          Operator.Word
@@ -123,7 +123,7 @@
 '['           Punctuation
 ']'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  File '     Text
 '"/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py"' Name.Builtin
@@ -131,9 +131,9 @@
 '36'          Literal.Number
 ', in '       Text
 '_rollback_on_error' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
 ' '           Text
 'function'    Name
@@ -149,9 +149,9 @@
 '*'           Operator
 'kwargs'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'OperationalError' Generic.Error
 ': '          Text
 'database is locked' Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/python/linecontinuation.py.output b/tests/examplefiles/python/linecontinuation.py.output
index 78680c3ebd..91d4157b07 100644
--- a/tests/examplefiles/python/linecontinuation.py.output
+++ b/tests/examplefiles/python/linecontinuation.py.output
@@ -7,7 +7,7 @@
 ' '           Text
 'y'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'apple'       Name
 '.'           Operator
@@ -21,9 +21,9 @@
 ' '           Text
 'y'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number.Integer
 ' '           Text
@@ -36,9 +36,9 @@
 
 '    '        Text
 '__str__'     Name.Function.Magic
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'from'        Keyword.Namespace
 ' '           Text
@@ -47,7 +47,7 @@
 'import'      Keyword.Namespace
 ' '           Text
 'path'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'from'        Keyword.Namespace
 ' \\\n        ' Text
@@ -59,9 +59,9 @@
 'import'      Keyword.Namespace
 ' \\\n        ' Text
 'path'        Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword.Namespace
 ' '           Text
@@ -72,9 +72,9 @@
 'as'          Keyword
 ' '           Text
 'something'   Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword.Namespace
 ' \\\n        ' Text
@@ -91,21 +91,21 @@
 
 '        '    Text
 'something'   Name
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
 ' \\\n '      Text
 'Spam'        Name.Class
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
 ' '           Text
@@ -113,9 +113,9 @@
 ':'           Punctuation
 ' '           Text
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
 ' '           Text
@@ -124,13 +124,13 @@
 'object'      Name.Builtin
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
 ' \\\n '      Text
@@ -140,11 +140,11 @@
 
 '  '          Text
 '('           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 'object'      Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ')'           Punctuation
@@ -153,15 +153,15 @@
 
 ' '           Text
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
 ' \\\n '      Text
@@ -186,4 +186,4 @@
 
 '  '          Text
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/python/py3_test.txt.output b/tests/examplefiles/python/py3_test.txt.output
index 785c16953c..66a93d53b1 100644
--- a/tests/examplefiles/python/py3_test.txt.output
+++ b/tests/examplefiles/python/py3_test.txt.output
@@ -2,8 +2,8 @@
 ' '           Text
 'Käse'        Name.Class
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/python/switch_case.txt.output b/tests/examplefiles/python/switch_case.txt.output
index 2abf65a5e0..3c07db9c5a 100644
--- a/tests/examplefiles/python/switch_case.txt.output
+++ b/tests/examplefiles/python/switch_case.txt.output
@@ -6,7 +6,7 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'case'        Keyword
@@ -30,13 +30,13 @@
 '.'           Operator
 'route'       Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
 ' '           Text
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'case'        Keyword
@@ -51,13 +51,13 @@
 'bar'         Literal.String.Single
 "'"           Literal.String.Single
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
 ' '           Text
 '2'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'case'        Keyword
@@ -70,17 +70,17 @@
 ' '           Text
 'name'        Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
 ' '           Text
 '3'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 "'"           Literal.String.Single
 'to'          Literal.String.Single
@@ -90,41 +90,41 @@
 '_'           Keyword
 ']'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
 ' '           Text
 '4'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'case'        Keyword
 ' '           Text
 'else_bar'    Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
 ' '           Text
 '5'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '_'           Keyword
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
 ' '           Text
 '6'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'match'       Keyword
 ' '           Text
@@ -134,7 +134,7 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'case'        Keyword
@@ -143,46 +143,46 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
 ' '           Text
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '_'           Keyword
 ' '           Text
 'as'          Keyword
 ' '           Text
 'default'     Name
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'return'      Keyword
 ' '           Text
 '2'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'case'        Name
 ' '           Text
 '='           Operator
 ' '           Text
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'match'       Name
 ' '           Text
 '='           Operator
 ' '           Text
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'match'       Name
 ' '           Text
@@ -193,4 +193,4 @@
 'else'        Keyword
 ' '           Text
 'bar'         Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/python/unicodedoc.py.output b/tests/examplefiles/python/unicodedoc.py.output
index 0d40ef2182..9fb70e7ce3 100644
--- a/tests/examplefiles/python/unicodedoc.py.output
+++ b/tests/examplefiles/python/unicodedoc.py.output
@@ -4,14 +4,14 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'ur'          Literal.String.Affix
 '"""unicode-raw"""' Literal.String.Doc
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
 ' '           Text
@@ -19,14 +19,14 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'u'           Literal.String.Affix
 '"""unicode"""' Literal.String.Doc
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
 ' '           Text
@@ -34,16 +34,16 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'r'           Literal.String.Affix
 "'"           Literal.String.Single
 'raw'         Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
 ' '           Text
@@ -51,8 +51,8 @@
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '"""docstring"""' Literal.String.Doc
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rb/condensed_ruby.rb.output b/tests/examplefiles/rb/condensed_ruby.rb.output
index dc18301e7c..436bfa8bd5 100644
--- a/tests/examplefiles/rb/condensed_ruby.rb.output
+++ b/tests/examplefiles/rb/condensed_ruby.rb.output
@@ -1,14 +1,14 @@
 '# Server: ruby p2p.rb password server server-uri merge-servers' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Sample: ruby p2p.rb foobar server druby://localhost:1337 druby://foo.bar:1337' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Client: ruby p2p.rb password client server-uri download-pattern' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Sample: ruby p2p.rb foobar client druby://localhost:1337 *.rb' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'require'     Name.Builtin
 "'"           Literal.String.Single
@@ -40,7 +40,7 @@
 'ARGV'        Name.Constant
 ';'           Punctuation
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 's'           Name.Function
 '('           Punctuation
 'p'           Name.Builtin
@@ -59,13 +59,13 @@
 '['           Operator
 '-'           Operator
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 ']'           Operator
 'end'         Keyword
 ';'           Punctuation
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'c'           Name.Function
 '('           Punctuation
 'u'           Name
@@ -83,7 +83,7 @@
 'end'         Keyword
 ';'           Punctuation
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name.Function
 '('           Punctuation
 'u'           Name
@@ -111,7 +111,7 @@
 '.'           Operator
 'f'           Name
 '('           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'x'           Name
 '('           Punctuation
@@ -159,7 +159,7 @@
 'f'           Name
 '|'           Operator
 's'           Name
-' '           Text
+' '           Text.Whitespace
 'f'           Name
 '}'           Punctuation
 '-'           Operator
@@ -182,7 +182,7 @@
 '('           Punctuation
 'f'           Name
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String.Double
 'w'           Literal.String.Double
@@ -212,7 +212,7 @@
 'DRb'         Name.Constant
 '.'           Operator
 'start_service' Name
-' '           Text
+' '           Text.Whitespace
 'U'           Name
 ','           Punctuation
 'C'           Name
@@ -220,7 +220,7 @@
 'new'         Name
 '{'           Punctuation
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'f'           Name.Function
 '('           Punctuation
 'c'           Name
@@ -242,7 +242,7 @@
 ')'           Punctuation
 '&&'          Operator
 '('           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 't'           Name
 '=='          Operator
@@ -278,7 +278,7 @@
 'end'         Keyword
 ';'           Punctuation
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'y'           Name.Function
 '('           Punctuation
 ')'           Punctuation
@@ -308,7 +308,7 @@
 'u'           Name
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p'           Name.Builtin
 '('           Punctuation
@@ -327,7 +327,7 @@
 'private'     Keyword.Pseudo
 ';'           Punctuation
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name.Function
 '('           Punctuation
 'x'           Name
@@ -357,4 +357,4 @@
 ';'           Punctuation
 'sleep'       Name.Builtin
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rb/example.rb.output b/tests/examplefiles/rb/example.rb.output
index 1b86d5932b..a82d20cd8a 100644
--- a/tests/examplefiles/rb/example.rb.output
+++ b/tests/examplefiles/rb/example.rb.output
@@ -1,227 +1,227 @@
 'module'      Keyword
-' '           Text
+' '           Text.Whitespace
 'CodeRay'     Name.Namespace
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'module'      Keyword
-' '           Text
+' '           Text.Whitespace
 'Scanners'    Name.Namespace
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Ruby'        Name.Class
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'Scanner'     Name.Constant
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'RESERVED_WORDS' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "'"           Literal.String.Single
 'and'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'def'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'end'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'in'          Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'or'          Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'unless'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'begin'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "'"           Literal.String.Single
 'defined?'    Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'ensure'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'module'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'redo'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'super'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'until'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "'"           Literal.String.Single
 'BEGIN'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'break'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'do'          Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'next'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'rescue'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'then'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "'"           Literal.String.Single
 'when'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'END'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'case'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'else'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'for'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'retry'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "'"           Literal.String.Single
 'while'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'alias'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'class'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'elsif'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'if'          Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'not'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'return'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "'"           Literal.String.Single
 'undef'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'yield'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ']'           Operator
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'DEF_KEYWORDS' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 "'"           Literal.String.Single
 'def'         Literal.String.Single
 "'"           Literal.String.Single
 ']'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'MODULE_KEYWORDS' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 "'"           Literal.String.Single
 'class'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'module'      Literal.String.Single
 "'"           Literal.String.Single
 ']'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'DEF_NEW_STATE' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'WordList'    Name.Constant
 '.'           Operator
 'new'         Name
@@ -229,80 +229,80 @@
 ':initial'    Literal.String.Symbol
 ')'           Punctuation
 '.'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name
 '('           Punctuation
 'DEF_KEYWORDS' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':def_expected' Literal.String.Symbol
 ')'           Punctuation
 '.'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name
 '('           Punctuation
 'MODULE_KEYWORDS' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':module_expected' Literal.String.Symbol
 ')'           Punctuation
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'WORDS_ALLOWING_REGEXP' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "'"           Literal.String.Single
 'and'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'or'          Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'not'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'while'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'until'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'unless'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'if'          Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'elsif'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'when'        Literal.String.Single
 "'"           Literal.String.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ']'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'REGEXP_ALLOWED' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'WordList'    Name.Constant
 '.'           Operator
 'new'         Name
@@ -310,72 +310,72 @@
 'false'       Keyword.Pseudo
 ')'           Punctuation
 '.'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name
 '('           Punctuation
 'WORDS_ALLOWING_REGEXP' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':set'        Literal.String.Symbol
 ')'           Punctuation
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'PREDEFINED_CONSTANTS' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "'"           Literal.String.Single
 'nil'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'true'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'false'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'self'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "'"           Literal.String.Single
 'DATA'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'ARGV'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'ARGF'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '__FILE__'    Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '__LINE__'    Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 ']'           Operator
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'IDENT_KIND'  Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'WordList'    Name.Constant
 '.'           Operator
 'new'         Name
@@ -383,26 +383,26 @@
 ':ident'      Literal.String.Symbol
 ')'           Punctuation
 '.'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name
 '('           Punctuation
 'RESERVED_WORDS' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':reserved'   Literal.String.Symbol
 ')'           Punctuation
 '.'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'add'         Name
 '('           Punctuation
 'PREDEFINED_CONSTANTS' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':pre_constant' Literal.String.Symbol
 ')'           Punctuation
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'METHOD_NAME' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -412,9 +412,9 @@
 '}'           Literal.String.Interpol
 ' [?!]? '     Literal.String.Regex
 '/xo'         Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'METHOD_NAME_EX' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -450,9 +450,9 @@
 '#'           Literal.String.Regex
 ' simple equality and case equality\n\t' Literal.String.Regex
 '/ox'         Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'GLOBAL_VARIABLE' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -470,9 +470,9 @@
 '\\\\'        Literal.String.Regex
 '] | -[a-zA-Z_0-9] ) ' Literal.String.Regex
 '/ox'         Literal.String.Regex
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'DOUBLEQ'     Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -497,9 +497,9 @@
 '\\\\'        Literal.String.Regex
 ']*  )* "?  ' Literal.String.Regex
 '/ox'         Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'SINGLEQ'     Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -511,9 +511,9 @@
 '\\\\'        Literal.String.Regex
 "]*    )* '?  " Literal.String.Regex
 '/ox'         Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'STRING'      Name.Constant
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -527,9 +527,9 @@
 '}'           Literal.String.Interpol
 ' '           Literal.String.Regex
 '/ox'         Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'SHELL'       Name.Constant
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -554,9 +554,9 @@
 '\\\\'        Literal.String.Regex
 ']*  )* `?  ' Literal.String.Regex
 '/ox'         Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'REGEXP'      Name.Constant
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -589,9 +589,9 @@
 '\\/'         Literal.String.Regex
 '? '          Literal.String.Regex
 '/ox'         Literal.String.Regex
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'DECIMAL'     Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -600,35 +600,35 @@
 '\\'          Literal.String.Regex
 'd+)*'        Literal.String.Regex
 '/'           Literal.String.Regex
-'  '          Text
+'  '          Text.Whitespace
 "# doesn't recognize 09 as octal error" Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'OCTAL'       Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
 '0_?[0-7]+(?:_[0-7]+)*' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'HEXADECIMAL' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
 '0x[0-9A-Fa-f]+(?:_[0-9A-Fa-f]+)*' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'BINARY'      Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
 '0b[01]+(?:_[01]+)*' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'EXPONENT'    Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -638,9 +638,9 @@
 '}'           Literal.String.Interpol
 ' '           Literal.String.Regex
 '/ox'         Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'FLOAT'       Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -664,9 +664,9 @@
 '}'           Literal.String.Interpol
 '? ) '        Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'INTEGER'     Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -686,41 +686,41 @@
 'DECIMAL'     Name.Constant
 '}'           Literal.String.Interpol
 '/'           Literal.String.Regex
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'reset'       Name.Function
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'super'       Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@regexp_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'next_token'  Name.Function
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'eos?'        Name
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':error'      Literal.String.Symbol
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -730,27 +730,27 @@
 's+'          Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '# in every state' Comment.Single
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':space'      Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '@regexp_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':set'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@regexp_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'matched'     Name
@@ -759,19 +759,19 @@
 '('           Punctuation
 '?\\n'        Literal.String.Char
 ')'           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '# delayed flag setting' Comment.Single
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@state'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 ':def_expected' Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -796,43 +796,43 @@
 ' '           Literal.String.Regex
 '/ox'         Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':method'     Literal.String.Symbol
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@state'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':initial'    Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'else'        Keyword
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'getch'       Name
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '@state'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':initial'    Literal.String.Symbol
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@state'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 ':module_expected' Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -841,17 +841,17 @@
 '<<'          Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':operator'   Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'else'        Keyword
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -870,52 +870,52 @@
 ' '           Literal.String.Regex
 '/ox'         Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':method'     Literal.String.Symbol
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'else'        Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'getch'       Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@state'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':initial'    Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '# state == :initial' Comment.Single
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '# IDENTIFIERS, KEYWORDS' Comment.Single
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
 '('           Punctuation
 'GLOBAL_VARIABLE' Name.Constant
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':global_variable' Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -928,15 +928,15 @@
 ' '           Literal.String.Regex
 '/ox'         Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':class_variable' Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -949,15 +949,15 @@
 ' '           Literal.String.Regex
 '/ox'         Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':instance_variable' Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -989,137 +989,137 @@
 'n]*)? '      Literal.String.Regex
 '/mx'         Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':comment'    Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
 '('           Punctuation
 'METHOD_NAME' Name.Constant
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@last_token_dot' Name.Variable.Instance
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':ident'      Literal.String.Symbol
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'else'        Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'matched'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'matched'     Name
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'IDENT_KIND'  Name.Constant
 '['           Operator
 'matched'     Name
 ']'           Operator
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 ':ident'      Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'matched'     Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
 '^[A-Z]'      Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':constant'   Literal.String.Symbol
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 ':reserved'   Literal.String.Symbol
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 '@state'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'DEF_NEW_STATE' Name.Constant
 '['           Operator
 'matched'     Name
 ']'           Operator
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 '@regexp_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'REGEXP_ALLOWED' Name.Constant
 '['           Operator
 'matched'     Name
 ']'           Operator
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
 '('           Punctuation
 'STRING'      Name.Constant
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':string'     Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
 '('           Punctuation
 'SHELL'       Name.Constant
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':shell'      Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -1148,15 +1148,15 @@
 '6$ | .* )\n\t\t\t\t)\n\t\t\t' Literal.String.Regex
 '/mxo'        Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':string'     Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -1165,28 +1165,28 @@
 '\\/'         Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '@regexp_allowed' Name.Variable.Instance
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'unscan'      Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
 '('           Punctuation
 'REGEXP'      Name.Constant
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':regexp'     Literal.String.Symbol
-'\n'          Text
+'\n'          Text.Whitespace
 
 '/'           Literal.String.Regex
 '%(?:[Qqxrw](?:' Literal.String.Regex
@@ -1444,9 +1444,9 @@
 '\\\\'        Literal.String.Regex
 '?)'          Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -1467,15 +1467,15 @@
 ')'           Literal.String.Regex
 '/ox'         Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':symbol'     Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -1502,15 +1502,15 @@
 ' (?: . | [0-7]{3} | x[0-9A-Fa-f][0-9A-Fa-f] )\n\t\t\t\t)\n\t\t\t' Literal.String.Regex
 '/mox'        Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':integer'    Literal.String.Symbol
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -1531,21 +1531,21 @@
 '.? | ::? '   Literal.String.Regex
 '/x'          Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':operator'   Literal.String.Symbol
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@regexp_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':set'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'matched'     Name
@@ -1555,7 +1555,7 @@
 ','           Punctuation
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -1572,76 +1572,76 @@
 '\\'          Literal.String.Regex
 'z'           Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
 '('           Punctuation
 'FLOAT'       Name.Constant
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':float'      Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
 '('           Punctuation
 'INTEGER'     Name.Constant
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':integer'    Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'else'        Keyword
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'getch'       Name
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'token'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Token'       Name.Constant
 '.'           Operator
 'new'         Name
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'matched'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'kind'        Name
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 ':regexp'     Literal.String.Symbol
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'token'       Name
 '.'           Operator
 'text'        Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 '@scanner'    Name.Variable.Instance
 '.'           Operator
 'scan'        Name
@@ -1650,63 +1650,63 @@
 '[eimnosux]*' Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '@regexp_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '@regexp_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 ':set'        Literal.String.Symbol
 ')'           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '# delayed flag setting' Comment.Single
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'token'       Name
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'register'    Name
-' '           Text
+' '           Text.Whitespace
 'Ruby'        Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'ruby'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'rb'          Literal.String.Single
 "'"           Literal.String.Single
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Set'         Name.Class
-'\n  '        Text
+'\n  '        Text.Whitespace
 'include'     Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'Enumerable'  Name.Constant
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Creates a new set containing the given objects.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Class
 '.'           Operator
 '[]'          Name.Function
@@ -1714,72 +1714,72 @@
 '*'           Operator
 'ary'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'new'         Keyword.Pseudo
 '('           Punctuation
 'ary'         Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Creates a new set containing the elements of the given enumerable' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# object.'   Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#'           Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# If a block is given, the elements of enum are preprocessed by the' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# given block.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'initialize'  Name.Function
 '('           Punctuation
 'enum'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 'block'       Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# :yields: o' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Hash'        Name.Constant
 '.'           Operator
 'new'         Name
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'enum'        Name
 '.'           Operator
 'nil?'        Name
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'block'       Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 'enum'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'add'         Name
 '('           Punctuation
 'block'       Name
@@ -1787,33 +1787,33 @@
 'o'           Name
 ']'           Operator
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'merge'       Name
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Copy internal hash.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'initialize_copy' Name.Function
 '('           Punctuation
 'orig'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'orig'        Name
 '.'           Operator
 'instance_eval' Name
@@ -1822,76 +1822,76 @@
 '}'           Punctuation
 '.'           Operator
 'dup'         Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns the number of elements.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'size'        Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'size'        Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 'length'      Name
-' '           Text
+' '           Text.Whitespace
 'size'        Name
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns true if the set contains no elements.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'empty?'      Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'empty?'      Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Removes all elements and returns self.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'clear'       Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'clear'       Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Replaces the contents of the set with the contents of the given' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# enumerable object and returns self.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'replace'     Name.Function
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'enum'        Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'replace'     Name
@@ -1899,181 +1899,181 @@
 'enum'        Name
 '.'           Operator
 'instance_eval' Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@hash'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'enum'        Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Enumerable'  Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be enumerable' Literal.String.Double
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'clear'       Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 'enum'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'add'         Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Converts the set to an array.  The order of elements is uncertain.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'to_a'        Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'keys'        Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'flatten_merge' Name.Function
 '('           Punctuation
 'set'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'seen'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Set'         Name.Constant
 '.'           Operator
 'new'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Set'         Name.Constant
 ')'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'seen'        Name
 '.'           Operator
 'include?'    Name
 '('           Punctuation
 'e_id'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '.'           Operator
 'object_id'   Name
 ')'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'tried to flatten recursive Set' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'seen'        Name
 '.'           Operator
 'add'         Name
 '('           Punctuation
 'e_id'        Name
 ')'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'flatten_merge' Name
 '('           Punctuation
 'e'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'seen'        Name
 ')'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'seen'        Name
 '.'           Operator
 'delete'      Name
 '('           Punctuation
 'e_id'        Name
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'else'        Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'add'         Name
 '('           Punctuation
 'e'           Name
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'protected'   Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':flatten_merge' Literal.String.Symbol
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns a new set that is a copy of the set, flattening each' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# containing set recursively.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'flatten'     Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
@@ -2084,608 +2084,608 @@
 '('           Punctuation
 'self'        Name.Builtin
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Equivalent to Set#flatten, but replaces the receiver with the' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# result in place.  Returns nil if no modifications were made.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'flatten!'    Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'detect'      Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Set'         Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'replace'     Name
 '('           Punctuation
 'flatten'     Name
 '('           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns true if the set contains the given object.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'include?'    Name.Function
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'include?'    Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 'member?'     Name
-' '           Text
+' '           Text.Whitespace
 'include'     Keyword.Pseudo
 '?'           Punctuation
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns true if the set is a superset of the given set.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'superset?'   Name.Function
 '('           Punctuation
 'set'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Set'         Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be a set' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'set'         Name
 '.'           Operator
 'size'        Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name
 '.'           Operator
 'all?'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'include'     Keyword.Pseudo
 '?'           Punctuation
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns true if the set is a proper superset of the given set.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'proper_superset?' Name.Function
 '('           Punctuation
 'set'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Set'         Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be a set' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'set'         Name
 '.'           Operator
 'size'        Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name
 '.'           Operator
 'all?'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'include'     Keyword.Pseudo
 '?'           Punctuation
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns true if the set is a subset of the given set.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'subset?'     Name.Function
 '('           Punctuation
 'set'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Set'         Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be a set' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'set'         Name
 '.'           Operator
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'size'        Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'all?'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'set'         Name
 '.'           Operator
 'include?'    Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns true if the set is a proper subset of the given set.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'proper_subset?' Name.Function
 '('           Punctuation
 'set'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Set'         Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be a set' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'set'         Name
 '.'           Operator
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'size'        Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'all?'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'set'         Name
 '.'           Operator
 'include?'    Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Calls the given block once for each element in the set, passing' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# the element as parameter.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'each'        Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'each_key'    Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'yield'       Keyword
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Adds the given object to the set and returns self.  Use +merge+ to' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# add several elements at once.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'add'         Name.Function
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '['           Operator
 'o'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'add'         Name
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Adds the given object to the set and returns self.  If the' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# object is already in the set, returns nil.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'add?'        Name.Function
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'include'     Keyword.Pseudo
 '?'           Punctuation
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'add'         Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Deletes the given object from the set and returns self.  Use +subtract+ to' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# delete several items at once.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'delete'      Name.Function
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'delete'      Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Deletes the given object from the set and returns self.  If the' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# object is not in the set, returns nil.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'delete?'     Name.Function
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'include'     Keyword.Pseudo
 '?'           Punctuation
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'delete'      Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Deletes every element of the set for which block evaluates to' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# true, and returns self.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'delete_if'   Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'delete_if'   Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 ','           Punctuation
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'yield'       Keyword
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Do collect() destructively.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'collect!'    Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
 '.'           Operator
 'new'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'set'         Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'yield'       Keyword
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'replace'     Name
 '('           Punctuation
 'set'         Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 'map!'        Name
-' '           Text
+' '           Text.Whitespace
 'collect!'    Name
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Equivalent to Set#delete_if, but returns nil if no changes were' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# made.'     Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'reject!'     Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'size'        Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'delete_if'   Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'yield'       Keyword
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Merges the elements of the given enumerable object to the set and' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# returns self.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'merge'       Name.Function
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'enum'        Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Set'         Name.Constant
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'update'      Name
@@ -2693,475 +2693,475 @@
 'enum'        Name
 '.'           Operator
 'instance_eval' Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@hash'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'enum'        Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Enumerable'  Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be enumerable' Literal.String.Double
 '"'           Literal.String.Double
-'\n      '    Text
+'\n      '    Text.Whitespace
 'enum'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'add'         Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Deletes every element that appears in the given enumerable object' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# and returns self.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'subtract'    Name.Function
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'enum'        Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Enumerable'  Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be enumerable' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'enum'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'delete'      Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'self'        Name.Builtin
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns a new set built by merging the set and the elements of the' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# given enumerable object.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Name.Function
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'enum'        Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Enumerable'  Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be enumerable' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'dup'         Name.Builtin
 '.'           Operator
 'merge'       Name
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '##'          Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 'union'       Name
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '##'          Comment.Single
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns a new set built by duplicating the set, removing every' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# element that appears in the given enumerable object.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-'           Name.Function
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'enum'        Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Enumerable'  Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be enumerable' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'dup'         Name.Builtin
 '.'           Operator
 'subtract'    Name
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '##'          Comment.Single
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns a new array containing elements common to the set and the' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# given enumerable object.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '&'           Name.Function
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'enum'        Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Enumerable'  Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be enumerable' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
 '.'           Operator
 'new'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'enum'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '.'           Operator
 'add'         Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'include'     Keyword.Pseudo
 '?'           Punctuation
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 'intersection' Name
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-'\t'          Text
+'\t'          Text.Whitespace
 '##'          Comment.Single
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns a new array containing elements exclusive between the set' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# and the given enumerable object.  (set ^ enum) is equivalent to' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# ((set | enum) - (set & enum)).' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '^'           Name.Function
 '('           Punctuation
 'enum'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'enum'        Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Enumerable'  Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'value must be enumerable' Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'dup'         Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'enum'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '.'           Operator
 'include?'    Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '.'           Operator
 'delete'      Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '.'           Operator
 'add'         Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns true if two sets are equal.  The equality of each couple' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# of elements is defined according to Object#eql?.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '=='          Name.Function
 '('           Punctuation
 'set'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'equal?'      Name.Builtin
 '('           Punctuation
 'set'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'set'         Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Set'         Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'set'         Name
 '.'           Operator
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'hash'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'dup'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'set'         Name
 '.'           Operator
 'all?'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'hash'        Name.Builtin
 '.'           Operator
 'include?'    Name
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'hash'        Name.Function
-'\t'          Text
+'\t'          Text.Whitespace
 '# :nodoc:'   Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'hash'        Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'eql?'        Name.Function
 '('           Punctuation
 'o'           Name
 ')'           Punctuation
-'\t'          Text
+'\t'          Text.Whitespace
 '# :nodoc:'   Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'o'           Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Set'         Name.Constant
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@hash'       Name.Variable.Instance
 '.'           Operator
 'eql?'        Name
@@ -3173,74 +3173,74 @@
 '@hash'       Name.Variable.Instance
 '}'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Classifies the set by the return value of the given block and' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# returns a hash of {value => set of elements} pairs.  The block is' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# called once for each element of the set, passing the element as' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# parameter.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#'           Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# e.g.:'     Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#'           Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 "#   require 'set'" Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#   files = Set.new(Dir.glob("*.rb"))' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#   hash = files.classify { |f| File.mtime(f).year }' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#   p hash    # => {2000=>#<Set: {"a.rb", "b.rb"}>,' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#             #     2001=>#<Set: {"c.rb", "d.rb", "e.rb"}>,' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#             #     2002=>#<Set: {"f.rb"}>}' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'classify'    Name.Function
-' '           Text
+' '           Text.Whitespace
 '# :yields: o' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'i'           Name
 '|'           Operator
-'\n      '    Text
+'\n      '    Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'yield'       Keyword
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '('           Punctuation
 'h'           Name
 '['           Operator
 'x'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
@@ -3252,103 +3252,103 @@
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'h'           Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Divides the set into a set of subsets according to the commonality' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# defined by the given block.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#'           Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# If the arity of the block is 2, elements o1 and o2 are in common' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# if block.call(o1, o2) is true.  Otherwise, elements o1 and o2 are' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# in common if block.call(o1) == block.call(o2).' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#'           Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# e.g.:'     Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#'           Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 "#   require 'set'" Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#   numbers = Set[1, 3, 4, 6, 9, 10, 11]' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#   set = numbers.divide { |i,j| (i - j).abs == 1 }' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#   p set     # => #<Set: {#<Set: {1}>,' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#             #            #<Set: {11, 9, 10}>,' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#             #            #<Set: {3, 4}>,' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '#             #            #<Set: {6}>}>' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'divide'      Name.Function
 '('           Punctuation
 '&'           Operator
 'func'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'func'        Name
 '.'           Operator
 'arity'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-'\n      '    Text
+'\n      '    Text.Whitespace
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'tsort'       Literal.String.Single
 "'"           Literal.String.Single
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'dig'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 '# :nodoc:'   Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'include'     Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'TSort'       Name.Constant
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 'tsort_each_node' Name
-' '           Text
+' '           Text.Whitespace
 'each_key'    Name
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'tsort_each_child' Name.Function
 '('           Punctuation
 'node'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 'block'       Name
 ')'           Punctuation
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'fetch'       Name
 '('           Punctuation
 'node'        Name
@@ -3359,82 +3359,82 @@
 '&'           Operator
 'block'       Name
 ')'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'u'           Name
 '|'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'dig'         Name
 '['           Operator
 'u'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'each'        Name
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'v'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'func'        Name
 '.'           Operator
 'call'        Name
 '('           Punctuation
 'u'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'v'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'v'           Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '}'           Punctuation
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'set'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Set'         Name.Constant
 '.'           Operator
 'new'         Name
 '('           Punctuation
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'dig'         Name
 '.'           Operator
 'each_strongly_connected_component' Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'css'         Name
 '|'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'set'         Name
 '.'           Operator
 'add'         Name
@@ -3448,13 +3448,13 @@
 'css'         Name
 ')'           Punctuation
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 '}'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'set'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'Set'         Name.Constant
 '.'           Operator
 'new'         Name
@@ -3467,31 +3467,31 @@
 '.'           Operator
 'values'      Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'InspectKey'  Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':__inspect_key__' Literal.String.Symbol
-'         '   Text
+'         '   Text.Whitespace
 '# :nodoc:'   Comment.Single
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '# Returns a string containing a human-readable representation of the' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# set. ("#<Set: {element1, element2, ...}>")' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inspect'     Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ids'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'Thread'      Name.Constant
 '.'           Operator
@@ -3499,25 +3499,25 @@
 '['           Operator
 'InspectKey'  Name.Constant
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
 ')'           Punctuation
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ids'         Name
 '.'           Operator
 'include?'    Name
 '('           Punctuation
 'object_id'   Name.Builtin
 ')'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'sprintf'     Name.Builtin
 '('           Punctuation
 "'"           Literal.String.Single
@@ -3525,26 +3525,26 @@
 '<%s: {...}>' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
 '.'           Operator
 'name'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'begin'       Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'ids'         Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'object_id'   Name.Builtin
-'\n      '    Text
+'\n      '    Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'sprintf'     Name.Builtin
 '('           Punctuation
 "'"           Literal.String.Single
@@ -3552,12 +3552,12 @@
 '<%s: {%s}>'  Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'to_a'        Name.Builtin
 '.'           Operator
 'inspect'     Name
@@ -3568,30 +3568,30 @@
 '2'           Literal.Number.Integer
 ']'           Operator
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ensure'      Keyword
-'\n      '    Text
+'\n      '    Text.Whitespace
 'ids'         Name
 '.'           Operator
 'pop'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'pretty_print' Name.Function
 '('           Punctuation
 'pp'          Name
 ')'           Punctuation
-'\t'          Text
+'\t'          Text.Whitespace
 '# :nodoc:'   Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'pp'          Name
 '.'           Operator
 'text'        Name
-' '           Text
+' '           Text.Whitespace
 'sprintf'     Name.Builtin
 '('           Punctuation
 "'"           Literal.String.Single
@@ -3599,69 +3599,69 @@
 '<%s: {'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
 '.'           Operator
 'name'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'pp'          Name
 '.'           Operator
 'nest'        Name
 '('           Punctuation
 '1'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 'pp'          Name
 '.'           Operator
 'seplist'     Name
 '('           Punctuation
 'self'        Name.Builtin
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'o'           Name
 '|'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'pp'          Name
 '.'           Operator
 'pp'          Name
-' '           Text
+' '           Text.Whitespace
 'o'           Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'pp'          Name
 '.'           Operator
 'text'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '}>'          Literal.String.Double
 '"'           Literal.String.Double
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'pretty_print_cycle' Name.Function
 '('           Punctuation
 'pp'          Name
 ')'           Punctuation
-'\t'          Text
+'\t'          Text.Whitespace
 '# :nodoc:'   Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'pp'          Name
 '.'           Operator
 'text'        Name
-' '           Text
+' '           Text.Whitespace
 'sprintf'     Name.Builtin
 '('           Punctuation
 "'"           Literal.String.Single
@@ -3669,106 +3669,106 @@
 '<%s: {%s}>'  Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
 '.'           Operator
 'name'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'empty?'      Name
-' '           Text
+' '           Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '...'         Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# SortedSet implements a set which elements are sorted in order.  See Set.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'SortedSet'   Name.Class
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 'Set'         Name.Constant
-'\n  '        Text
+'\n  '        Text.Whitespace
 '@@setup'     Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '[]'          Name.Function
 '('           Punctuation
 '*'           Operator
 'ary'         Name
 ')'           Punctuation
-'\t'          Text
+'\t'          Text.Whitespace
 '# :nodoc:'   Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 'new'         Keyword.Pseudo
 '('           Punctuation
 'ary'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'setup'       Name.Function
-'\t'          Text
+'\t'          Text.Whitespace
 '# :nodoc:'   Comment.Single
-'\n      '    Text
+'\n      '    Text.Whitespace
 '@@setup'     Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'return'      Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 'begin'       Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'rbtree'      Literal.String.Single
 "'"           Literal.String.Single
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'module_eval' Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '%{'          Literal.String.Other
 '\n\t  def initialize(*args, &block)\n\t    @hash = RBTree.new\n\t    super\n\t  end\n\t' Literal.String.Other
 '}'           Literal.String.Other
-'\n      '    Text
+'\n      '    Text.Whitespace
 'rescue'      Keyword
-' '           Text
+' '           Text.Whitespace
 'LoadError'   Name.Constant
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'module_eval' Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '%{'          Literal.String.Other
 '\n\t  def initialize(*args, &block)\n\t    @keys = nil\n\t    super\n\t  end\n\n\t  def clear\n\t    @keys = nil\n\t    super\n\t  end\n\n\t  def replace(enum)\n\t    @keys = nil\n\t    super\n\t  end\n\n\t  def add(o)\n\t    @keys = nil\n\t    @hash[o] = true\n\t    self\n\t  end\n\t  alias << add\n\n\t  def delete(o)\n\t    @keys = nil\n\t    @hash.delete(o)\n\t    self\n\t  end\n\n\t  def delete_if\n\t    n = @hash.size\n\t    @hash.delete_if ' Literal.String.Other
 '{'           Literal.String.Other
@@ -3780,969 +3780,969 @@
 '}'           Literal.String.Other
 '\n\t  end\n\n\t  def to_a\n\t    (@keys = @hash.keys).sort! unless @keys\n\t    @keys\n\t  end\n\t' Literal.String.Other
 '}'           Literal.String.Other
-'\n      '    Text
+'\n      '    Text.Whitespace
 'end'         Keyword
-'\n\n      '  Text
+'\n\n      '  Text.Whitespace
 '@@setup'     Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'initialize'  Name.Function
 '('           Punctuation
 '*'           Operator
 'args'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 'block'       Name
 ')'           Punctuation
-'\t'          Text
+'\t'          Text.Whitespace
 '# :nodoc:'   Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'SortedSet'   Name.Constant
 '.'           Operator
 'setup'       Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'initialize'  Keyword.Pseudo
 '('           Punctuation
 '*'           Operator
 'args'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 'block'       Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'module'      Keyword
-' '           Text
+' '           Text.Whitespace
 'Enumerable'  Name.Namespace
-'\n  '        Text
+'\n  '        Text.Whitespace
 '# Makes a set from the enumerable object with given arguments.' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'to_set'      Name.Function
 '('           Punctuation
 'klass'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Set'         Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
 'args'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 'block'       Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'klass'       Name
 '.'           Operator
 'new'         Name
 '('           Punctuation
 'self'        Name.Builtin
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
 'args'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 'block'       Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# =begin'    Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# == RestricedSet class' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# RestricedSet implements a set with restrictions defined by a given' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# block.'    Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Super class' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     Set'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Class Methods' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# --- RestricedSet::new(enum = nil) { |o| ... }' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# --- RestricedSet::new(enum = nil) { |rset, o| ... }' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     Creates a new restricted set containing the elements of the given' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     enumerable object.  Restrictions are defined by the given block.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "#     If the block's arity is 2, it is called with the RestrictedSet" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     itself and an object to see if the object is allowed to be put in' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     the set.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     Otherwise, the block is called with an object to see if the object' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     is allowed to be put in the set.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Instance Methods' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# --- restriction_proc' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     Returns the restriction procedure of the set.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# =end'      Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# class RestricedSet < Set' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   def initialize(*args, &block)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     @proc = block or raise ArgumentError, "missing a block"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     if @proc.arity == 2' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#       instance_eval %{' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tdef add(o)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  @hash[o] = true if @proc.call(self, o)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  self'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \talias << add' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tdef add?(o)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  if include?(o) || !@proc.call(self, o)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t    nil' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  else'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t    @hash[o] = true' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t    self' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  end'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tdef replace(enum)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  clear' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  enum.each { |o| add(o) }' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  self'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tdef merge(enum)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  enum.each { |o| add(o) }' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  self'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#       }'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     else'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#       instance_eval %{' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tdef add(o)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#         if @proc.call(o)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t    @hash[o] = true' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#         end' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  self'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \talias << add' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tdef add?(o)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  if include?(o) || !@proc.call(o)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t    nil' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  else'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t    @hash[o] = true' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t    self' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t  end'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#       }'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     end'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     super(*args)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   end'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   def restriction_proc' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#     @proc' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   end'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# end'       Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$0'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '__FILE__'    Name.Builtin.Pseudo
-'\n  '        Text
+'\n  '        Text.Whitespace
 'eval'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'DATA'        Name.Constant
 '.'           Operator
 'read'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$0'          Name.Variable.Global
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '__LINE__'    Name.Builtin.Pseudo
 '+'           Operator
 '4'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# = rweb - CGI Support Library' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Author:: Johannes Barre (mailto:rweb@igels.net)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Copyright:: Copyright (c) 2003, 04 by Johannes Barre' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# License:: GNU Lesser General Public License (COPYING, http://www.gnu.org/copyleft/lesser.html)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Version:: 0.1.0' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# CVS-ID:: $Id: example.rb 39 2005-11-05 03:33:55Z murphy $' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# == What is Rweb?' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Rweb is a replacement for the cgi class included in the ruby distribution.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# == How to use' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Basics' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# This class is made to be as easy as possible to use. An example:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \trequire "rweb"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb = Rweb.new' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb.out do' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t\tweb.puts "Hello world!"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# The visitor will get a simple "Hello World!" in his browser. Please notice,' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# that won't set html-tags for you, so you should better do something like this:" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \trequire "rweb"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb = Rweb.new' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb.out do' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t\tweb.puts "<html><body>Hello world!</body></html>"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Set headers' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Of course, it's also possible to tell the browser, that the content of this" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# page is plain text instead of html code:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \trequire "rweb"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb = Rweb.new' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb.out do' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t\tweb.header("content-type: text/plain")' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t\tweb.puts "Hello plain world!"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Please remember, headers can't be set after the page content has been send." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# You have to set all nessessary headers before the first puts oder print. It's" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# possible to cache the content until everything is complete. Doing it this' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# way, you can set headers everywhere.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# If you set a header twice, the second header will replace the first one. The' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# header name is not casesensitive, it will allways converted in to the' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# capitalised form suggested by the w3c (http://w3.org)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Set cookies' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Setting cookies is quite easy:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# \tinclude 'rweb'" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb = Rweb.new' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tCookie.new("Visits", web.cookies[\'visits\'].to_i +1)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb.out do' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t\tweb.puts "Welcome back! You visited this page #{web.cookies[\'visits\'].to_i +1} times"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# See the class Cookie for more details.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# === Get form and cookie values' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# There are four ways to submit data from the browser to the server and your' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# ruby script: via GET, POST, cookies and file upload. Rweb doesn't support" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# file upload by now.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# \tinclude 'rweb'" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb = Rweb.new' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tweb.out do' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t\tweb.print "action: #{web.get[\'action\']} "' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t\tweb.puts "The value of the cookie \'visits\' is #{web.cookies[\'visits\']}"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \t\tweb.puts "The post parameter \'test[\'x\']\' is #{web.post[\'test\'][\'x\']}"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# \tend'     Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'RWEB_VERSION' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '0.1.0'       Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'RWEB'        Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'rweb/'       Literal.String.Double
 '#{'          Literal.String.Interpol
 'RWEB_VERSION' Name.Constant
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "#require 'rwebcookie' -> edit by bunny :-)" Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Rweb'        Name.Class
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# All parameter submitted via the GET method are available in attribute' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# get. This is Hash, where every parameter is available as a key-value' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# pair.'     Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#'           Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "# If your input tag has a name like this one, it's value will be available" Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# as web.get["fieldname"]' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  <input name="fieldname">' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# You can submit values as a Hash' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  <input name="text[\'index\']">' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  <input name="text[\'index2\']">' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# will be available as' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.get["text"]["index"]' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.get["text"]["index2"]' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# Integers are also possible' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  <input name="int[2]">' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  <input name="int[3][\'hi\']>' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# will be available as' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.get["int"][2]' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.get["int"][3]["hi"]' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# If you specify no index, the lowest unused index will be used:' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  <input name="int[]"><!-- First Field -->' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  <input name="int[]"><!-- Second one -->' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# will be available as' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.get["int"][0] # First Field' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.get["int"][1] # Second one' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 "# Please notice, this doesn'd work like you might expect:" Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  <input name="text[index]">' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# It will not be available as web.get["text"]["index"] but' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.get["text[index]"]' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'attr_reader' Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':get'        Literal.String.Symbol
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# All parameters submitted via POST are available in the attribute post. It' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# works like the get attribute.' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  <input name="text[0]">' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# will be available as' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.post["text"][0]' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'attr_reader' Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':post'       Literal.String.Symbol
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# All cookies submitted by the browser are available in cookies. This is a' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# Hash, where every cookie is a key-value pair.' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'attr_reader' Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':cookies'    Literal.String.Symbol
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# The name of the browser identification is submitted as USER_AGENT and' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# available in this attribute.' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'attr_reader' Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':user_agent' Literal.String.Symbol
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# The IP address of the client.' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'attr_reader' Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':remote_addr' Literal.String.Symbol
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Creates a new Rweb object. This should only done once. You can set various' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# options via the settings hash.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '#'           Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# "cache" => true: Everything you script send to the client will be cached' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# until the end of the out block or until flush is called. This way, you' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# can modify headers and cookies even after printing something to the client.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '#'           Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# "safe" => level: Changes the $SAFE attribute. By default, $SAFE will be set' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 "# to 1. If $SAFE is already higher than this value, it won't be changed." Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '#'           Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# "silend" => true: Normaly, Rweb adds automaticly a header like this' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# "X-Powered-By: Rweb/x.x.x (Ruby/y.y.y)". With the silend option you can' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# suppress this.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'initialize'  Name.Function
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'settings'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@header'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@cookies'    Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@get'        Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@post'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# Internal attributes' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@status'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@reasonPhrase' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@setcookies' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@output_started' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@output_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ';'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '@mod_ruby'   Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@env'        Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ENV'         Name.Constant
 '.'           Operator
 'to_hash'     Name
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 'MOD_RUBY'    Name.Constant
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@output_method' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'mod_ruby'    Literal.String.Double
 '"'           Literal.String.Double
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@mod_ruby'   Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '['           Operator
 "'"           Literal.String.Single
 'SERVER_SOFTWARE' Literal.String.Single
 "'"           Literal.String.Single
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
 '^Microsoft-IIS' Literal.String.Regex
 '/i'          Literal.String.Regex
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@output_method' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'nph'         Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@output_method' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'ph'          Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'settings'    Name
 '.'           Operator
 'is_a?'       Name
 '('           Punctuation
 'Hash'        Name.Constant
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'settings must be a Hash' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@settings'   Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'settings'    Name
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -4751,48 +4751,48 @@
 'safe'        Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@settings'   Name.Variable.Instance
 '['           Operator
 '"'           Literal.String.Double
 'safe'        Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$SAFE'       Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '['           Operator
 '"'           Literal.String.Double
 'safe'        Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 '$SAFE'       Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '['           Operator
 '"'           Literal.String.Double
 'safe'        Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -4801,24 +4801,24 @@
 'cache'       Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@settings'   Name.Variable.Instance
 '['           Operator
 '"'           Literal.String.Double
 'cache'       Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# mod_ruby sets no QUERY_STRING variable, if no GET-Parameters are given' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -4827,27 +4827,27 @@
 'QUERY_STRING' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@env'        Name.Variable.Instance
 '['           Operator
 '"'           Literal.String.Double
 'QUERY_STRING' Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '# Now we split the QUERY_STRING by the seperators & and ; or, if' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 "# specified, settings['get seperator']" Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -4856,11 +4856,11 @@
 'get seperator' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'get_args'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '['           Operator
 "'"           Literal.String.Single
@@ -4874,13 +4874,13 @@
 '[&;]'        Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'get_args'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '['           Operator
 "'"           Literal.String.Single
@@ -4897,28 +4897,28 @@
 "'"           Literal.String.Single
 ']'           Operator
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'get_args'    Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'arg'         Name
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'arg_key'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'arg_val'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'arg'         Name
 '.'           Operator
 'split'       Name
@@ -4927,36 +4927,36 @@
 '='           Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'arg_key'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Rweb'        Name.Constant
 '::'          Operator
 'unescape'    Name
 '('           Punctuation
 'arg_key'     Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'arg_val'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Rweb'        Name.Constant
 '::'          Operator
 'unescape'    Name
 '('           Punctuation
 'arg_val'     Name
 ')'           Punctuation
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 "# Parse names like name[0], name['text'] or name[]" Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 'pattern'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -4970,202 +4970,202 @@
 '\\'          Literal.String.Regex
 ']$'          Literal.String.Regex
 '/'           Literal.String.Regex
-'\n            ' Text
+'\n            ' Text.Whitespace
 'keys'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'match'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pattern'     Name
 '.'           Operator
 'match'       Name
 '('           Punctuation
 'arg_key'     Name
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'arg_key'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'match'       Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'keys'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'match'       Name
 '['           Operator
 '2'           Literal.Number.Integer
 ']'           Operator
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'keys'        Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'keys'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'arg_key'     Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'keys'        Name
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'akt'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@get'        Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'last'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n            ' Text
+'\n            ' Text.Whitespace
 'lastkey'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n            ' Text
+'\n            ' Text.Whitespace
 'keys'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'key'         Name
 '|'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '# No key specified (like in "test[]"), so we use the' Comment.Single
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '# lowerst unused Integer as key' Comment.Single
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'akt'         Name
 '.'           Operator
 'has_key?'    Name
 '('           Punctuation
 'key'         Name
 ')'           Punctuation
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'end'         Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '/'           Literal.String.Regex
 '^[0-9]*$'    Literal.String.Regex
 '/'           Literal.String.Regex
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '# If the index is numerical convert it to an Integer' Comment.Single
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '.'           Operator
 'to_i'        Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
 '.'           Operator
 'chr'         Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
 '.'           Operator
 'chr'         Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '"'           Literal.String.Single
 "'"           Literal.String.Single
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '['           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '.'           Operator
 'length'      Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '2'           Literal.Number.Integer
 ']'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 'akt'         Name
 '.'           Operator
@@ -5173,9 +5173,9 @@
 '('           Punctuation
 'key'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 'akt'         Name
 '['           Operator
@@ -5183,76 +5183,76 @@
 ']'           Operator
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Hash'        Name.Constant
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 "# create an empty Hash if there isn't already one" Comment.Single
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'akt'         Name
 '['           Operator
 'key'         Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 'last'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'akt'         Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'lastkey'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'akt'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'akt'         Name
 '['           Operator
 'key'         Name
 ']'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'last'        Name
 '['           Operator
 'lastkey'     Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'arg_val'     Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '['           Operator
 "'"           Literal.String.Single
 'REQUEST_METHOD' Literal.String.Single
 "'"           Literal.String.Single
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'POST'        Literal.String.Double
 '"'           Literal.String.Double
-'\n            ' Text
+'\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -5261,24 +5261,24 @@
 'CONTENT_TYPE' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '['           Operator
 "'"           Literal.String.Single
 'CONTENT_TYPE' Literal.String.Single
 "'"           Literal.String.Single
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'application/x-www-form-urlencoded' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -5287,9 +5287,9 @@
 'CONTENT_LENGTH' Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -5298,11 +5298,11 @@
 'post seperator' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'post_args'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$stdin'      Name.Variable.Global
 '.'           Operator
 'read'        Name
@@ -5323,13 +5323,13 @@
 '[&;]'        Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'else'        Keyword
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'post_args'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$stdin'      Name.Variable.Global
 '.'           Operator
 'read'        Name
@@ -5353,28 +5353,28 @@
 "'"           Literal.String.Single
 ']'           Operator
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 'post_args'   Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'arg'         Name
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'arg_key'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'arg_val'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'arg'         Name
 '.'           Operator
 'split'       Name
@@ -5383,36 +5383,36 @@
 '='           Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'arg_key'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Rweb'        Name.Constant
 '::'          Operator
 'unescape'    Name
 '('           Punctuation
 'arg_key'     Name
 ')'           Punctuation
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'arg_val'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Rweb'        Name.Constant
 '::'          Operator
 'unescape'    Name
 '('           Punctuation
 'arg_val'     Name
 ')'           Punctuation
-'\n\n                    ' Text
+'\n\n                    ' Text.Whitespace
 "# Parse names like name[0], name['text'] or name[]" Comment.Single
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'pattern'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -5426,202 +5426,202 @@
 '\\'          Literal.String.Regex
 ']$'          Literal.String.Regex
 '/'           Literal.String.Regex
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'keys'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'match'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pattern'     Name
 '.'           Operator
 'match'       Name
 '('           Punctuation
 'arg_key'     Name
 ')'           Punctuation
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'arg_key'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'match'       Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'keys'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'match'       Name
 '['           Operator
 '2'           Literal.Number.Integer
 ']'           Operator
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'keys'        Name
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'end'         Keyword
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'keys'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'arg_key'     Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'keys'        Name
-'\n\n                    ' Text
+'\n\n                    ' Text.Whitespace
 'akt'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@post'       Name.Variable.Instance
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'last'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'lastkey'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'keys'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'key'         Name
 '|'           Operator
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '# No key specified (like in "test[]"), so we use' Comment.Single
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '# the lowerst unused Integer as key' Comment.Single
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'akt'         Name
 '.'           Operator
 'has_key?'    Name
 '('           Punctuation
 'key'         Name
 ')'           Punctuation
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 'end'         Keyword
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '/'           Literal.String.Regex
 '^[0-9]*$'    Literal.String.Regex
 '/'           Literal.String.Regex
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '# If the index is numerical convert it to an Integer' Comment.Single
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '.'           Operator
 'to_i'        Name
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
 '.'           Operator
 'chr'         Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 "'"           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
 '.'           Operator
 'chr'         Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '"'           Literal.String.Single
 "'"           Literal.String.Single
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '['           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '.'           Operator
 'length'      Name
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '2'           Literal.Number.Integer
 ']'           Operator
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'end'         Keyword
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 'akt'         Name
 '.'           Operator
@@ -5629,9 +5629,9 @@
 '('           Punctuation
 'key'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 'akt'         Name
 '['           Operator
@@ -5639,63 +5639,63 @@
 ']'           Operator
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Hash'        Name.Constant
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 "# create an empty Hash if there isn't already one" Comment.Single
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 'akt'         Name
 '['           Operator
 'key'         Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'end'         Keyword
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'last'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'akt'         Name
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'lastkey'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'akt'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'akt'         Name
 '['           Operator
 'key'         Name
 ']'           Operator
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'end'         Keyword
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'last'        Name
 '['           Operator
 'lastkey'     Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'arg_val'     Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'else'        Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 '# Maybe we should print a warning here?' Comment.Single
-'\n                ' Text
+'\n                ' Text.Whitespace
 '$stderr'     Name.Variable.Global
 '.'           Operator
 'print'       Name
@@ -5704,13 +5704,13 @@
 'Unidentified form data recived and discarded.' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -5719,11 +5719,11 @@
 'HTTP_COOKIE' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'cookie'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '['           Operator
 "'"           Literal.String.Single
@@ -5737,26 +5737,26 @@
 '; ?'         Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'cookie_key'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'cookie_val'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'c'           Name
 '.'           Operator
 'split'       Name
@@ -5765,12 +5765,12 @@
 '='           Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
-'\n\n                ' Text
+'\n\n                ' Text.Whitespace
 '@cookies'    Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'Rweb'        Name.Constant
 '::'          Operator
@@ -5779,22 +5779,22 @@
 'cookie_key'  Name
 ')'           Punctuation
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Rweb'        Name.Constant
 '::'          Operator
 'unescape'    Name
 '('           Punctuation
 'cookie_val'  Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 '@env'        Name.Variable.Instance
@@ -5804,31 +5804,31 @@
 "'"           Literal.String.Single
 ']'           Operator
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@user_agent' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '['           Operator
 "'"           Literal.String.Single
 'HTTP_USER_AGENT' Literal.String.Single
 "'"           Literal.String.Single
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@user_agent' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 '@env'        Name.Variable.Instance
@@ -5838,317 +5838,317 @@
 "'"           Literal.String.Single
 ']'           Operator
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@remote_addr' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@env'        Name.Variable.Instance
 '['           Operator
 "'"           Literal.String.Single
 'REMOTE_ADDR' Literal.String.Single
 "'"           Literal.String.Single
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@remote_addr' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Prints a String to the client. If caching is enabled, the String will' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# buffered until the end of the out block ends.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'print'       Name.Function
 '('           Punctuation
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_allowed' Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'You just can write to output inside of a Rweb::out-block' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '['           Operator
 '"'           Literal.String.Double
 'cache'       Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@buffer'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'str'         Name
 '.'           Operator
 'to_s'        Name
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_started' Name.Variable.Instance
-'\n                ' Text
+'\n                ' Text.Whitespace
 'sendHeaders' Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 '$stdout'     Name.Variable.Global
 '.'           Operator
 'print'       Name
 '('           Punctuation
 'str'         Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Prints a String to the client and adds a line break at the end. Please' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# remember, that a line break is not visible in HTML, use the <br> HTML-Tag' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# for this. If caching is enabled, the String will buffered until the end' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# of the out block ends.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'puts'        Name.Function
 '('           Punctuation
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'print'       Name
 '('           Punctuation
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '# Alias to print.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'write'       Name.Function
 '('           Punctuation
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'print'       Name
 '('           Punctuation
 'str'         Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# If caching is enabled, all cached data are send to the cliend and the' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# cache emptied.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'flush'       Name.Function
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_allowed' Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 "You can't use flush outside of a Rweb::out-block" Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'buffer'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@buffer'     Name.Variable.Instance
 '.'           Operator
 'join'        Name
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_started' Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'sendHeaders' Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '$stdout'     Name.Variable.Global
 '.'           Operator
 'print'       Name
 '('           Punctuation
 'buffer'      Name
 ')'           Punctuation
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 '@buffer'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Sends one or more header to the client. All headers are cached just' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# before body data are send to the client. If the same header are set' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# twice, only the last value is send.' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#'           Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# Example:'  Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.header("Last-Modified: Mon, 16 Feb 2004 20:15:41 GMT")' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.header("Location: http://www.ruby-lang.org")' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#'           Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# You can specify more than one header at the time by doing something like' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# this:'     Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.header("Content-Type: text/plain\\nContent-Length: 383")' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# or'        Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.header(["Content-Type: text/plain", "Content-Length: 383"])' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'header'      Name.Function
 '('           Punctuation
 'str'         Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_started' Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 "HTTP-Headers are already send. You can't change them after output has started!" Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_allowed' Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'You just can set headers inside of a Rweb::out-block' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'str'         Name
 '.'           Operator
 'is_a?'       Name
 'Array'       Name.Builtin
-'\n            ' Text
+'\n            ' Text.Whitespace
 'str'         Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'header'      Name
 '('           Punctuation
 'value'       Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'str'         Name
 '.'           Operator
 'split'       Name
@@ -6160,11 +6160,11 @@
 ')'           Punctuation
 '.'           Operator
 'length'      Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 'str'         Name
 '.'           Operator
 'split'       Name
@@ -6176,32 +6176,32 @@
 ')'           Punctuation
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'header'      Name
 '('           Punctuation
 'value'       Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'str'         Name
 '.'           Operator
 'is_a?'       Name
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-'\n            ' Text
+'\n            ' Text.Whitespace
 'str'         Name
 '.'           Operator
 'gsub!'       Name
@@ -6211,16 +6211,16 @@
 'r'           Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -6231,13 +6231,13 @@
 '.[01] [0-9]{3} ?.*$' Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n                ' Text
+'\n                ' Text.Whitespace
 'pattern'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -6245,18 +6245,18 @@
 '\\/'         Literal.String.Regex
 '1.[01] ([0-9]{3}) ?(.*)$' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\n                ' Text
+'\n\n                ' Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pattern'     Name
 '.'           Operator
 'match'       Name
 '('           Punctuation
 'str'         Name
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'setstatus'   Name
@@ -6266,48 +6266,48 @@
 '0'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'result'      Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
 '^status: [0-9]{3} ?.*$' Literal.String.Regex
 '/i'          Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n                ' Text
+'\n                ' Text.Whitespace
 'pattern'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
 '^status: ([0-9]{3}) ?(.*)$' Literal.String.Regex
 '/i'          Literal.String.Regex
-'\n\n                ' Text
+'\n\n                ' Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'pattern'     Name
 '.'           Operator
 'match'       Name
 '('           Punctuation
 'str'         Name
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'setstatus'   Name
@@ -6317,19 +6317,19 @@
 '0'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'result'      Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'else'        Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'str'         Name
 '.'           Operator
 'split'       Name
@@ -6338,10 +6338,10 @@
 ': ?'         Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
-'\n\n                ' Text
+'\n\n                ' Text.Whitespace
 '@header'     Name.Variable.Instance
 '['           Operator
 'a'           Name
@@ -6351,117 +6351,117 @@
 '.'           Operator
 'downcase'    Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Changes the status of this page. There are several codes like "200 OK",' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# "302 Found", "404 Not Found" or "500 Internal Server Error". A list of' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# all codes is available at' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#'           Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# You can just send the code number, the reason phrase will be added' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# automaticly with the recommendations from the w3c if not specified. If' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# you set the status twice or more, only the last status will be send.' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# Examples:' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.status("401 Unauthorized")' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.status("410 Sad but true, this lonely page is gone :(")' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.status(206)' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.status("400")' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#'           Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# The default status is "200 OK". If a "Location" header is set, the' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# default status is "302 Found".' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name.Function
 '('           Punctuation
 'str'         Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_started' Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 "HTTP-Headers are already send. You can't change them after output has started!" Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_allowed' Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'You just can set headers inside of a Rweb::out-block' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'str'         Name
 '.'           Operator
 'is_a?'       Name
 'Integer'     Name.Builtin
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@status'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'str'         Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'str'         Name
 '.'           Operator
 'is_a?'       Name
 'String'      Name.Builtin
-'\n            ' Text
+'\n            ' Text.Whitespace
 'p1'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
 '^([0-9]{3}) ?(.*)$' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n            ' Text
+'\n            ' Text.Whitespace
 'p2'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -6471,22 +6471,22 @@
 '\\'          Literal.String.Regex
 '.[01] ([0-9]{3}) ?(.*)$' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n            ' Text
+'\n            ' Text.Whitespace
 'p3'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
 '^status: ([0-9]{3}) ?(.*)$' Literal.String.Regex
 '/i'          Literal.String.Regex
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'p1'          Name
 '.'           Operator
 'match'       Name
@@ -6494,18 +6494,18 @@
 'str'         Name
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n                ' Text
+'\n                ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'p2'          Name
 '.'           Operator
 'match'       Name
@@ -6513,18 +6513,18 @@
 'str'         Name
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'p3'          Name
 '.'           Operator
 'match'       Name
@@ -6532,145 +6532,145 @@
 'str'         Name
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Invalid argument' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'end'         Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@status'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
 '.'           Operator
 'to_i'        Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '2'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n                ' Text
+'\n                ' Text.Whitespace
 '@reasonPhrase' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '2'           Literal.Number.Integer
 ']'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'else'        Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 '@reasonPhrase' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'getReasonPhrase' Name
 '('           Punctuation
 '@status'     Name.Variable.Instance
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'ArgumentError' Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Argument of setstatus must be integer or string' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Handles the output of your content and rescues all exceptions. Send all' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# data in the block to this method. For example:' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  web.out do' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#      web.header("Content-Type: text/plain")' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#      web.puts("Hello, plain world!")' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '#  end'      Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'out'         Name.Function
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@output_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@buffer'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "# We use an array as buffer, because it's more performant :)" Comment.Single
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'begin'       Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'yield'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'rescue'      Keyword
-' '           Text
+' '           Text.Whitespace
 'Exception'   Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'exception'   Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 '$stderr'     Name.Variable.Global
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Ruby exception rescued (' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -6685,11 +6685,11 @@
 'message'     Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n            ' Text
+'\n            ' Text.Whitespace
 '$stderr'     Name.Variable.Global
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 'exception'   Name
 '.'           Operator
 'backtrace'   Name
@@ -6700,29 +6700,29 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_started' Name.Variable.Instance
-'\n                ' Text
+'\n                ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'setstatus'   Name
 '('           Punctuation
 '500'         Literal.Number.Integer
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 '@header'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '@settings'   Name.Variable.Instance
 '.'           Operator
@@ -6732,25 +6732,25 @@
 'hide errors' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '['           Operator
 '"'           Literal.String.Double
 'hide errors' Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_started' Name.Variable.Instance
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'header'      Name
@@ -6759,11 +6759,11 @@
 'Content-Type: text/html' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '<!DOCTYPE HTML PUBLIC ' Literal.String.Double
 '\\"'         Literal.String.Escape
@@ -6775,51 +6775,51 @@
 '\\"'         Literal.String.Escape
 '>'           Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '<html>'      Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '<head>'      Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '<title>500 Internal Server Error</title>' Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '</head>'     Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '<body>'      Literal.String.Double
 '"'           Literal.String.Double
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@header'     Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -6828,9 +6828,9 @@
 'content-type' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '@header'     Name.Variable.Instance
 '['           Operator
@@ -6838,7 +6838,7 @@
 'content-type' Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -6847,39 +6847,39 @@
 'html'        Literal.String.Regex
 '/i'          Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '<h1>Internal Server Error</h1>' Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '<p>The server encountered an exception and was unable to complete your request.</p>' Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '<p>The exception has provided the following information:</p>' Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '<pre style=' Literal.String.Double
 '\\"'         Literal.String.Escape
@@ -6901,15 +6901,15 @@
 '}'           Literal.String.Interpol
 ' <b>on</b>'  Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'exception'   Name
@@ -6925,45 +6925,45 @@
 '}'           Literal.String.Interpol
 '</pre>'      Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '</body>'     Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '</html>'     Literal.String.Double
 '"'           Literal.String.Double
-'\n                ' Text
+'\n                ' Text.Whitespace
 'else'        Keyword
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The server encountered an exception and was unable to complete your request' Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The exception has provided the following information:' Literal.String.Double
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'exception'   Name
@@ -6977,15 +6977,15 @@
 'message'     Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'puts'        Name
-' '           Text
+' '           Text.Whitespace
 'exception'   Name
 '.'           Operator
 'backtrace'   Name
@@ -6996,36 +6996,36 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '['           Operator
 '"'           Literal.String.Double
 'cache'       Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'buffer'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@buffer'     Name.Variable.Instance
 '.'           Operator
 'join'        Name
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_started' Name.Variable.Instance
-'\n                ' Text
+'\n                ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@header'     Name.Variable.Instance
 '.'           Operator
 'has_key?'    Name
@@ -7034,7 +7034,7 @@
 'content-length' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'header'      Name
@@ -7048,67 +7048,67 @@
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n\n                ' Text
+'\n\n                ' Text.Whitespace
 'sendHeaders' Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 '$stdout'     Name.Variable.Global
 '.'           Operator
 'print'       Name
 '('           Punctuation
 'buffer'      Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '@output_started' Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'sendHeaders' Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@output_allowed' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ';'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 '# Decodes URL encoded data, %20 for example stands for a space.' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Rweb'        Name.Class
 '.'           Operator
 'unescape'    Name.Function
 '('           Punctuation
 'str'         Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
-' '           Text
+' '           Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'str'         Name
 '.'           Operator
 'is_a?'       Name
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-'\n            ' Text
+'\n            ' Text.Whitespace
 'str'         Name
 '.'           Operator
 'gsub!'       Name
@@ -7118,12 +7118,12 @@
 '+'           Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'str'         Name
 '.'           Operator
 'gsub'        Name
@@ -7132,15 +7132,15 @@
 '%.{2}'       Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 's'           Name
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 's'           Name
 '['           Operator
 '1'           Literal.Number.Integer
@@ -7151,31 +7151,31 @@
 'hex'         Name
 '.'           Operator
 'chr'         Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'protected'   Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'sendHeaders' Name.Function
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'Cookie'      Name.Constant
 '.'           Operator
 'disallow'    Name
-' '           Text
+' '           Text.Whitespace
 '# no more cookies can be set or modified' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '('           Punctuation
 '@settings'   Name.Variable.Instance
@@ -7186,23 +7186,23 @@
 'silent'      Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '@settings'   Name.Variable.Instance
 '['           Operator
 '"'           Literal.String.Double
 'silent'      Literal.String.Double
 '"'           Literal.String.Double
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '@header'     Name.Variable.Instance
 '.'           Operator
@@ -7212,11 +7212,11 @@
 'x-powered-by' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@mod_ruby'   Name.Variable.Instance
-'\n                ' Text
+'\n                ' Text.Whitespace
 'header'      Name
 '('           Punctuation
 '"'           Literal.String.Double
@@ -7236,9 +7236,9 @@
 '"'           Literal.String.Double
 ')'           Punctuation
 ';'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'else'        Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 'header'      Name
 '('           Punctuation
 '"'           Literal.String.Double
@@ -7254,42 +7254,42 @@
 '"'           Literal.String.Double
 ')'           Punctuation
 ';'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_method' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'ph'          Literal.String.Double
 '"'           Literal.String.Double
-'\n            ' Text
+'\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '('           Punctuation
 '@status'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '@status'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '200'         Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '@header'     Name.Variable.Instance
 '.'           Operator
@@ -7299,9 +7299,9 @@
 'content-type' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '@header'     Name.Variable.Instance
 '.'           Operator
@@ -7312,28 +7312,28 @@
 '"'           Literal.String.Double
 ')'           Punctuation
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'header'      Name
 '('           Punctuation
 '"'           Literal.String.Double
 'content-type: text/html' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@status'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n                ' Text
+'\n                ' Text.Whitespace
 '$stdout'     Name.Variable.Global
 '.'           Operator
 'print'       Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Status: '    Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -7346,40 +7346,40 @@
 '\\r'         Literal.String.Escape
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 '@header'     Name.Variable.Instance
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'key'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '|'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '# "unfreeze" key :)' Comment.Single
-'\n                ' Text
+'\n                ' Text.Whitespace
 'key'         Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '['           Operator
 '0'           Literal.Number.Integer
@@ -7391,11 +7391,11 @@
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-'\n\n                ' Text
+'\n\n                ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '.'           Operator
 'gsub'        Name
@@ -7404,19 +7404,19 @@
 '-[a-z]'      Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'char'        Name
 '|'           Operator
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '"'           Literal.String.Double
 '-'           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'char'        Name
 '['           Operator
 '1'           Literal.Number.Integer
@@ -7425,13 +7425,13 @@
 ']'           Operator
 '.'           Operator
 'upcase'      Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n\n                ' Text
+'\n\n                ' Text.Whitespace
 '$stdout'     Name.Variable.Global
 '.'           Operator
 'print'       Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'key'         Name
@@ -7443,89 +7443,89 @@
 '\\r'         Literal.String.Escape
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'cookies'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Cookie'      Name.Constant
 '.'           Operator
 'getHttpHeader' Name
-' '           Text
+' '           Text.Whitespace
 '# Get all cookies as an HTTP Header' Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'cookies'     Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 '$stdout'     Name.Variable.Global
 '.'           Operator
 'print'       Name
-' '           Text
+' '           Text.Whitespace
 'cookies'     Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 '$stdout'     Name.Variable.Global
 '.'           Operator
 'print'       Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\r'         Literal.String.Escape
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\n        ' Text
+'\n\n        ' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_method' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'nph'         Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '@output_method' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'mod_ruby'    Literal.String.Double
 '"'           Literal.String.Double
-'\n            ' Text
+'\n            ' Text.Whitespace
 'r'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Apache'      Name.Constant
 '.'           Operator
 'request'     Name
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '('           Punctuation
 '@status'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '@status'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '200'         Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '@header'     Name.Variable.Instance
 '.'           Operator
@@ -7535,9 +7535,9 @@
 'content-type' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '@header'     Name.Variable.Instance
 '.'           Operator
@@ -7548,30 +7548,30 @@
 '"'           Literal.String.Double
 ')'           Punctuation
 ')'           Punctuation
-'\n                ' Text
+'\n                ' Text.Whitespace
 'header'      Name
 '('           Punctuation
 '"'           Literal.String.Double
 'text/html'   Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@status'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n                ' Text
+'\n                ' Text.Whitespace
 'r'           Name
 '.'           Operator
 'status_line' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 '@status'     Name.Variable.Instance
@@ -7581,44 +7581,44 @@
 '@reasonPhrase' Name.Variable.Instance
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n\n            ' Text
+'\n\n            ' Text.Whitespace
 'r'           Name
 '.'           Operator
 'send_http_header' Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@header'     Name.Variable.Instance
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'key'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '|'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '# "unfreeze" key :)' Comment.Single
-'\n\n                ' Text
+'\n\n                ' Text.Whitespace
 'key'         Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '['           Operator
 '0'           Literal.Number.Integer
@@ -7630,11 +7630,11 @@
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'key'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '.'           Operator
 'gsub'        Name
@@ -7643,19 +7643,19 @@
 '-[a-z]'      Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'char'        Name
 '|'           Operator
-'\n                    ' Text
+'\n                    ' Text.Whitespace
 '"'           Literal.String.Double
 '-'           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'char'        Name
 '['           Operator
 '1'           Literal.Number.Integer
@@ -7664,11 +7664,11 @@
 ']'           Operator
 '.'           Operator
 'upcase'      Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'end'         Keyword
-'\n                ' Text
+'\n                ' Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'key'         Name
@@ -7680,1432 +7680,1432 @@
 'class'       Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n                ' Text
+'\n                ' Text.Whitespace
 '#r.headers_out[key] = value' Comment.Single
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@output_started' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'getReasonPhrase' Name.Function
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'status'      Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# {{{'       Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Continue'    Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '101'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Switching Protocols' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '200'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'OK'          Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '201'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Created'     Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '202'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Accepted'    Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '203'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Non-Authoritative Information' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '204'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'No Content'  Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '205'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Reset Content' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '206'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Partial Content' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '300'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Multiple Choices' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '301'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Moved Permanently' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '302'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Found'       Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '303'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'See Other'   Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '304'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Not Modified' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '305'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Use Proxy'   Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '307'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Temporary Redirect' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '400'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Bad Request' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '401'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Unauthorized' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '402'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Payment Required' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '403'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Forbidden'   Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '404'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Not Found'   Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '405'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Method Not Allowed' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '406'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Not Acceptable' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '407'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Proxy Authentication Required' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '408'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Request Time-out' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '409'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Conflict'    Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '410'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Gone'        Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '411'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Length Required' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '412'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Precondition Failed' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '413'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Request Entity Too Large' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '414'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Request-URI Too Large' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '415'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Unsupported Media Type' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '416'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Requested range not satisfiable' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '417'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Expectation Failed' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '500'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Internal Server Error' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '501'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Not Implemented' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '502'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Bad Gateway' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '503'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Service Unavailable' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '504'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'Gateway Time-out' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'status'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '505'         Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '"'           Literal.String.Double
 'HTTP Version not supported' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Unknown Statuscode. See http://www.w3.org/Protocols/rfc2616/rfc2616-sec6.html' Literal.String.Double
 '#'           Literal.String.Double
 'sec6.1 for more information.' Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# }}}'       Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Cookie'      Name.Class
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'attr_reader' Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':name'       Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':value'      Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':maxage'     Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':path'       Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':domain'     Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':secure'     Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':comment'    Literal.String.Symbol
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Sets a cookie. Please see below for details of the attributes.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'initialize'  Name.Function
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'name'        Name.Builtin
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'domain'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'secure'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ')'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# HTTP headers (Cookies are a HTTP header) can only set, while no content' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# is send. So an exception will be raised, when @@allowed is set to false' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# and a new cookie has set.' Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 '@@allowed'   Name.Variable.Class
 ')'           Punctuation
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '@@allowed'   Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@@allowed'   Name.Variable.Class
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 "You can't set cookies after the HTTP headers are send." Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 '@@list'      Name.Variable.Class
 ')'           Punctuation
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '@@list'      Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@@list'      Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'self'        Name.Builtin
 ']'           Operator
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 '@@type'      Name.Variable.Class
 ')'           Punctuation
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '@@type'      Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'netscape'    Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'name'        Name.Builtin
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The name of a cookie must be a string' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '.'           Operator
 'class'       Name
 '.'           Operator
 'superclass'  Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Float'       Name.Builtin
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '.'           Operator
 'to_s'        Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The value of a cookie must be a string, integer, float or nil' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'maxage'      Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 'maxage'      Name
 '.'           Operator
 'class'       Name
 '.'           Operator
 'superclass'  Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Name.Builtin
-'  '          Text
+'  '          Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The maxage date of a cookie must be an Integer or Time object or nil.' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'path'        Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-'  '          Text
+'  '          Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The path of a cookie must be nil or a string' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'domain'      Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-'  '          Text
+'  '          Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'domain'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The value of a cookie must be nil or a string' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'secure'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'  '          Text
+'  '          Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'secure'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The secure field of a cookie must be true or false' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '@name'       Name.Variable.Instance
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@value'      Name.Variable.Instance
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@maxage'     Name.Variable.Instance
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@path'       Name.Variable.Instance
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@domain'     Name.Variable.Instance
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@secure'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'name'        Name.Builtin
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'maxage'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'path'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'domain'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'secure'      Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@comment'    Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Modifies the value of this cookie. The information you want to store. If the' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# value is nil, the cookie will be deleted by the client.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '#'           Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# This attribute can be a String, Integer or Float object or nil.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'value='      Name.Function
 '('           Punctuation
 'value'       Name
 ')'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '.'           Operator
 'class'       Name
 '.'           Operator
 'superclass'  Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Float'       Name.Builtin
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '.'           Operator
 'to_s'        Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The value of a cookie must be a string, integer, float or nil' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@value'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Modifies the maxage of this cookie. This attribute defines the lifetime of' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# the cookie, in seconds. A value of 0 means the cookie should be discarded' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# imediatly. If it set to nil, the cookie will be deleted when the browser' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# will be closed.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '#'           Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Attention: This is different from other implementations like PHP, where you' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# gives the seconds since 1/1/1970 0:00:00 GMT.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '#'           Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# This attribute must be an Integer or Time object or nil.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'maxage='     Name.Function
 '('           Punctuation
 'maxage'      Name
 ')'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'maxage'      Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'maxage'      Name
 '.'           Operator
 'class'       Name
 '.'           Operator
 'superclass'  Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Name.Builtin
-'  '          Text
+'  '          Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The maxage of a cookie must be an Interger or Time object or nil.' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@maxage'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'maxage'      Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Modifies the path value of this cookie. The client will send this cookie' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# only, if the requested document is this directory or a subdirectory of it.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '#'           Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# The value of the attribute must be a String object or nil.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'path='       Name.Function
 '('           Punctuation
 'path'        Name
 ')'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'path'        Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-'  '          Text
+'  '          Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The path of a cookie must be nil or a string' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@path'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'path'        Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Modifies the domain value of this cookie. The client will send this cookie' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 "# only if it's connected with this domain (or a subdomain, if the first" Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# character is a dot like in ".ruby-lang.org")' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '#'           Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# The value of this attribute must be a String or nil.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'domain='     Name.Function
 '('           Punctuation
 'domain'      Name
 ')'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'domain'      Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-'  '          Text
+'  '          Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'domain'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The domain of a cookie must be a String or nil.' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@domain'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'domain'      Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 "# Modifies the secure flag of this cookie. If it's true, the client will only" Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# send this cookie if it is secured connected with us.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '#'           Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# The value od this attribute has to be true or false.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'secure='     Name.Function
 '('           Punctuation
 'secure'      Name
 ')'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'secure'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'  '          Text
+'  '          Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'secure'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The secure field of a cookie must be true or false' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@secure'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'secure'      Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 "# Modifies the comment value of this cookie. The comment won't be send, if" Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# type is "netscape".' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'comment='    Name.Function
 '('           Punctuation
 'comment'     Name
 ')'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'comment'     Name
 '.'           Operator
 'class'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'String'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'comment'     Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 'TypeError'   Name.Constant
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The comment of a cookie must be a string or nil' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'caller'      Name.Builtin
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@comment'    Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'comment'     Name
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Changes the type of all cookies.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# Allowed values are RFC2109 and netscape (default).' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Cookie'      Name.Class
 '.'           Operator
 'type='       Name.Function
 '('           Punctuation
 'type'        Name
 ')'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@@allowed'   Name.Variable.Class
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 "The cookies are allready send, so you can't change the type anymore." Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'type'        Name
 '.'           Operator
 'downcase'    Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'rfc2109'     Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'type'        Name
 '.'           Operator
 'downcase'    Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'netscape'    Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The type of the cookies must be ' Literal.String.Double
 '\\"'         Literal.String.Escape
@@ -9117,125 +9117,125 @@
 '\\"'         Literal.String.Escape
 '.'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@@type'      Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'type'        Name
 ';'           Punctuation
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# After sending this message, no cookies can be set or modified. Use it, when' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# HTTP-Headers are send. Rweb does this for you.' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Cookie'      Name.Class
 '.'           Operator
 'disallow'    Name.Function
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '@@allowed'   Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'true'        Keyword.Pseudo
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '# Returns a HTTP header (type String) with all cookies. Rweb does this for' Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '# you.'      Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Cookie'      Name.Class
 '.'           Operator
 'getHttpHeader' Name.Function
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# {{{'       Comment.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 '@@list'      Name.Variable.Class
 ')'           Punctuation
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@@type'      Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'netscape'    Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@@list'      Name.Variable.Class
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'cookie'      Name
 '|'           Operator
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 '# TODO: Name and value should be escaped!' Comment.Single
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Set-Cookie: ' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -9250,39 +9250,39 @@
 'value'       Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'expire'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'maxage'      Name
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'expire'      Name
 '.'           Operator
 'gmtime'      Name
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Expire='   Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -9296,23 +9296,23 @@
 ')'           Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'domain'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Domain='   Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -9321,23 +9321,23 @@
 'domain'      Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Path='     Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -9346,122 +9346,122 @@
 'path'        Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'secure'      Name
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Secure'    Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\r'         Literal.String.Escape
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'str'         Name
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '# type == "RFC2109"' Comment.Single
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Set-Cookie: ' Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'comma'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'false'       Keyword.Pseudo
 ';'           Punctuation
-'\n\n\t\t\t\t' Text
+'\n\n\t\t\t\t' Text.Whitespace
 '@@list'      Name.Variable.Class
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'cookie'      Name
 '|'           Operator
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'comma'       Name
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ','           Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'comma'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n\n\t\t\t\t\t' Text
+'\n\n\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'cookie'      Name
@@ -9477,21 +9477,21 @@
 '}'           Literal.String.Interpol
 '\\"'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'maxage'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Max-Age='  Literal.String.Double
 '\\"'         Literal.String.Escape
@@ -9502,23 +9502,23 @@
 '}'           Literal.String.Interpol
 '\\"'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'domain'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Domain='   Literal.String.Double
 '\\"'         Literal.String.Escape
@@ -9529,23 +9529,23 @@
 '}'           Literal.String.Interpol
 '\\"'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'path'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Path='     Literal.String.Double
 '\\"'         Literal.String.Escape
@@ -9556,39 +9556,39 @@
 '}'           Literal.String.Interpol
 '\\"'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'secure'      Name
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Secure'    Literal.String.Double
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'cookie'      Name
 '.'           Operator
 'comment'     Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Comment='  Literal.String.Double
 '\\"'         Literal.String.Escape
@@ -9599,137 +9599,137 @@
 '}'           Literal.String.Interpol
 '\\"'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'str'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '; Version='  Literal.String.Double
 '\\"'         Literal.String.Escape
 '1'           Literal.String.Double
 '\\"'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'str'         Name
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'else'        Keyword
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'false'       Keyword.Pseudo
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '# }}}'       Comment.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'strscan'     Literal.String.Single
 "'"           Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'module'      Keyword
-' '           Text
+' '           Text.Whitespace
 'BBCode'      Name.Namespace
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'DEBUG'       Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Keyword.Pseudo
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'use'         Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'encoder'     Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'tags'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'tagstack'    Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'smileys'     Literal.String.Single
 "'"           Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '=begin\n\tThe Parser class takes care of the encoding.\n\tIt scans the given BBCode (as plain text), finds tags\n\tand smilies and also makes links of urls in text.\n\n\tNormal text is send directly to the encoder.\n\n\tIf a tag was found, an instance of a Tag subclass is created\n\tto handle the case.\n\n\tThe @tagstack manages tag nesting and ensures valid HTML.\n=end' Comment.Multiline
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Parser'      Name.Class
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Attribute'   Name.Class
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '# flatten and use only one empty_arg' Comment.Single
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Class
 '.'           Operator
 'create'      Name.Function
-' '           Text
+' '           Text.Whitespace
 'attr'        Keyword.Pseudo
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'attr'        Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'flatten'     Name
-' '           Text
+' '           Text.Whitespace
 'attr'        Keyword.Pseudo
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@@empty_attr' Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'attr'        Keyword.Pseudo
 '.'           Operator
 'empty?'      Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'new'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'attr'        Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'private_class_method' Name.Builtin
-' '           Text
+' '           Text.Whitespace
 ':new'        Literal.String.Symbol
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '# remove leading and trailing whitespace; concat lines' Comment.Single
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Class
 '.'           Operator
 'flatten'     Name.Function
-' '           Text
+' '           Text.Whitespace
 'attr'        Keyword.Pseudo
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'attr'        Keyword.Pseudo
 '.'           Operator
 'strip'       Name
@@ -9741,18 +9741,18 @@
 'n'           Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 ' '           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '# -> ^ and $ can only match at begin and end now' Comment.Single
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'ATTRIBUTE_SCAN' Name.Constant
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -9808,37 +9808,37 @@
 '\\'          Literal.String.Regex
 's*\n\t\t\t'  Literal.String.Regex
 '/x'          Literal.String.Regex
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Class
 '.'           Operator
 'parse'       Name.Function
-' '           Text
+' '           Text.Whitespace
 'source'      Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'source'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'source'      Name
 '.'           Operator
 'dup'         Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '# empty_tag: the tag looks like [... /]' Comment.Single
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '# slice!: this deletes the \\s*/] at the end' Comment.Single
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '# \\s+ because [url=http://rubybb.org/forum/] is NOT an empty tag.' Comment.Single
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '# In RubyBBCode, you can use [url=http://rubybb.org/forum/ /], and this has to be' Comment.Single
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '# interpreted correctly.' Comment.Single
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'empty_tag'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'source'      Name
 '.'           Operator
 'sub!'        Name
@@ -9847,14 +9847,14 @@
 '^:'          Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '='           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'or'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 'source'      Name
 '.'           Operator
 'slice!'      Name
@@ -9864,101 +9864,101 @@
 '$'           Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'debug'       Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'PARSE: '     Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'source'      Name
 '.'           Operator
 'inspect'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 ' => '        Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'empty_tag'   Name
 '.'           Operator
 'inspect'     Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 "#-> we have now an attr that's EITHER empty OR begins and ends with non-whitespace." Comment.Single
-'\n\n\t\t\t\t' Text
+'\n\n\t\t\t\t' Text.Whitespace
 'attr'        Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Hash'        Name.Constant
 '.'           Operator
 'new'         Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'attr'        Keyword.Pseudo
 '['           Operator
 ':flags'      Literal.String.Symbol
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'source'      Name
 '.'           Operator
 'scan'        Name
 '('           Punctuation
 'ATTRIBUTE_SCAN' Name.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'key'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '|'           Operator
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'value'       Name
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'attr'        Keyword.Pseudo
 '['           Operator
 ':flags'      Literal.String.Symbol
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'unescape'    Name
 '('           Punctuation
 'key'         Name
 ')'           Punctuation
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'else'        Keyword
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'next'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'value'       Name
 '.'           Operator
 'empty?'      Name
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'key'         Name
 '.'           Operator
 'empty?'      Name
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'attr'        Keyword.Pseudo
 '['           Operator
 'unescape'    Name
@@ -9966,56 +9966,56 @@
 'key'         Name
 ')'           Punctuation
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'unescape'    Name
 '('           Punctuation
 'value'       Name
 ')'           Punctuation
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '}'           Punctuation
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'debug'       Name
-' '           Text
+' '           Text.Whitespace
 'attr'        Keyword.Pseudo
 '.'           Operator
 'inspect'     Name
-'\n\n\t\t\t\t' Text
+'\n\n\t\t\t\t' Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'empty_tag'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'attr'        Keyword.Pseudo
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Class
 '.'           Operator
 'unescape_char' Name.Function
-' '           Text
+' '           Text.Whitespace
 'esc'         Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'esc'         Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Class
 '.'           Operator
 'unquote'     Name.Function
-' '           Text
+' '           Text.Whitespace
 'qt'          Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'qt'          Name
 '['           Operator
 '1'           Literal.Number.Integer
@@ -10038,29 +10038,29 @@
 '.'           Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'esc'         Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'unescape_char' Name
-' '           Text
+' '           Text.Whitespace
 'esc'         Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Class
 '.'           Operator
 'unescape'    Name.Function
-' '           Text
+' '           Text.Whitespace
 'str'         Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'str'         Name
 '.'           Operator
 'gsub'        Name
@@ -10077,40 +10077,40 @@
 ']*)* "?) '   Literal.String.Regex
 '/x'          Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$1'          Name.Variable.Global
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'unescape_char' Name
-' '           Text
+' '           Text.Whitespace
 '$1'          Name.Variable.Global
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'else'        Keyword
-'\n\t\t\t\t\t\t' Text
+'\n\t\t\t\t\t\t' Text.Whitespace
 'unquote'     Name
-' '           Text
+' '           Text.Whitespace
 '$2'          Name.Variable.Global
-'\n\t\t\t\t\t' Text
+'\n\t\t\t\t\t' Text.Whitespace
 'end'         Keyword
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '}'           Punctuation
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'include'     Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'Enumerable'  Name.Constant
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'each'        Name.Function
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 'block'       Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@args'       Name.Variable.Instance
 '.'           Operator
 'each'        Name
@@ -10118,60 +10118,60 @@
 '&'           Operator
 'block'       Name
 ')'           Punctuation
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'attr_reader' Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 ':source'     Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':args'       Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':value'      Literal.String.Symbol
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'initialize'  Name.Function
-' '           Text
+' '           Text.Whitespace
 'source'      Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@source'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'source'      Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'debug'       Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Attribute'   Literal.String.Single
 '#'           Literal.String.Single
 'new(%p)'     Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 'source'      Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@empty_tag'  Name.Variable.Instance
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@attr'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Attribute'   Name.Constant
 '.'           Operator
 'parse'       Name
-' '           Text
+' '           Text.Whitespace
 'source'      Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@value'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@attr'       Name.Variable.Instance
 '['           Operator
 "'"           Literal.String.Single
@@ -10179,122 +10179,122 @@
 ']'           Operator
 '.'           Operator
 'to_s'        Name
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'empty?'      Name.Function
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'self'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '@@empty_attr' Name.Variable.Class
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'empty_tag?'  Name.Function
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@empty_tag'  Name.Variable.Instance
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '[]'          Name.Function
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
 'keys'        Name
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'res'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '@attr'       Name.Variable.Instance
 '['           Operator
 '*'           Operator
 'keys'        Name
 ']'           Operator
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'flags'       Name.Function
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 'attr'        Keyword.Pseudo
 '['           Operator
 ':flags'      Literal.String.Symbol
 ']'           Operator
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'to_s'        Name.Function
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '@attr'       Name.Variable.Instance
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inspect'     Name.Function
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 "'"           Literal.String.Single
 'ATTR['       Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '@attr'       Name.Variable.Instance
 '.'           Operator
 'inspect'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '@empty_tag'  Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 ' | empty tag' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 ']'           Literal.String.Single
 "'"           Literal.String.Single
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Attribute'   Name.Class
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '@@empty_attr' Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'new'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'end'         Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rb/fucked_up.rb.output b/tests/examplefiles/rb/fucked_up.rb.output
index 713a5c2137..323cebf22c 100644
--- a/tests/examplefiles/rb/fucked_up.rb.output
+++ b/tests/examplefiles/rb/fucked_up.rb.output
@@ -1,35 +1,35 @@
 '# vim:ft=ruby' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'events'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Hash'        Name.Constant
 '.'           Operator
 'new'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'h'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'k'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'h'           Name
 '['           Operator
 'k'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'DATA'        Name.Constant
 '.'           Operator
@@ -50,17 +50,17 @@
 ')'           Punctuation
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'event'       Name
 '|'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'name'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'event'       Name
 '['           Operator
 '/'           Literal.String.Regex
@@ -74,11 +74,11 @@
 'http:.*'     Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'event'       Name
 '['           Operator
 '/'           Literal.String.Regex
@@ -107,78 +107,78 @@
 'S*)'         Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'kind'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'daytime'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'comment'     Name
 '|'           Operator
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'events'      Name
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'daytime'     Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'kind'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'name'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'comment'     Name
 ']'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'conflicts'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'events'      Name
 '.'           Operator
 'to_a'        Name
 '.'           Operator
 'sort_by'     Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 '('           Punctuation
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'daytime'     Name
 ')'           Punctuation
 ','           Punctuation
 '|'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '['           Operator
 '%w('         Literal.String.Other
 'Mo Di Mi Do Fr' Literal.String.Other
@@ -188,60 +188,60 @@
 '('           Punctuation
 'day'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'daytime'     Name
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 '('           Punctuation
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'daytime'     Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'names'       Name
 '|'           Operator
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'names'       Name
 '.'           Operator
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'conflicts'   Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '!!! '        Literal.String.Single
 "'"           Literal.String.Single
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'day'         Name
@@ -252,22 +252,22 @@
 '}'           Literal.String.Interpol
 ': '          Literal.String.Double
 '"'           Literal.String.Double
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'names'       Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'kind'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'name'        Name.Builtin
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '  '          Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -278,34 +278,34 @@
 'name'        Name.Builtin
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'puts'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '%d conflicts' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 'conflicts'   Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '%d SWS'      Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'events'      Name
 '.'           Operator
@@ -313,28 +313,28 @@
 '('           Punctuation
 '0'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'sum'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '('           Punctuation
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'daytime'     Name
 ')'           Punctuation
 ','           Punctuation
 ')'           Punctuation
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'sum'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'daytime'     Name
 '['           Operator
@@ -345,9 +345,9 @@
 ']'           Operator
 '.'           Operator
 'to_i'        Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'daytime'     Name
 '['           Operator
 '/'           Literal.String.Regex
@@ -359,35 +359,35 @@
 '.'           Operator
 'to_i'        Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '% foo '      Literal.String.Other
-'    '        Text
+'    '        Text.Whitespace
 '# strange. huh?' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Escape here: ' Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Dont escape here: ' Literal.String.Single
 '\\n'         Literal.String.Escape
 "'"           Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '__END__'     Comment.Preproc
 '\nInformatik und Informationsgesellschaft I: Digitale Medien (32 214)\nComputer lassen ihre eigentliche Bestimmung durch Multimedia und Vernetzung erkennen: Es sind digitale Medien, die alle bisherigen Massen- und Kommunikationsmedien simulieren, kopieren oder ersetzen können. Die kurze Geschichte elektronischer Medien vom Telegramm bis zum Fernsehen wird so zur Vorgeschichte des Computers als Medium. Der Prozess der Mediatisierung der Rechnernetze soll in Technik, Theorie und Praxis untersucht werden. Das PR soll die Techniken der ortsverteilten und zeitversetzten Lehre an Hand praktischer Übungen vorführen und untersuchen.\nVL \tDi\t15-17\twöch.\tRUD 25, 3.101\tJ. Koubek\nVL\tDo\t15-17\twöch.\tRUD 25, 3.101\nUE/PR\tDo\t17-19\twöch.\tRUD 25, 3.101\tJ.-M. Loebel\n\n\nMethoden und Modelle des Systementwurfs (32 223)\nGute Methoden zum Entwurf und zur Verifikation von Systemen sind ein Schlüssel für gute Software. Dieses Seminar betrachtet moderne Entwurfsmethoden.\n VL\tDi\t09-11\twöch.\tRUD 26, 0\x92313\tW. Reisig\n VL\tDo\t09-11\twöch.\tRUD 26, 0\x92313\t\n UE\tDi\t11-13\twöch.\tRUD 26, 0\x92313\t\n PR\tDi\t13-15\twöch.\tRUD 26, 0\x92313\tD. Weinberg\n\n\nKomplexitätstheorie (32 229)\nIn dieser Vorlesung untersuchen wir eine Reihe von wichtigen algorithmischen Problemstellungen aus verschiedenen Bereichen der Informatik. Unser besonderes Interesse gilt dabei der Abschätzung der Rechenressourcen, die zu ihrer Lösung aufzubringen sind.  Die Vorlesung bildet eine wichtige Grundlage für weiterführende Veranstaltungen in den Bereichen Algorithmen, Kryptologie, Algorithmisches Lernen und Algorithmisches Beweisen.\n VL \tDi\t09-11\twöch.\tRUD 26, 1\x92303\tJ. Köbler\n VL\tDo\t09-11\twöch.\tRUD 26, 1\x92305\t\n UE\tDo\t11-13\twöch.\tRUD 26, 1\x92305\t\n\n\nZuverlässige Systeme (32 234)\nMit zunehmender Verbreitung der Computertechnologie in immer mehr Bereichen des menschlichen Lebens wird die Zuverlässigkeit solcher Systeme zu einer immer zentraleren Frage.\nDer Halbkurs "Zuverlässige Systeme" konzentriert sich auf folgende Schwerpunkte: Zuverlässigkeit, Fehlertoleranz, Responsivität, Messungen, Anwendungen, Systemmodelle und Techniken, Ausfallverhalten, Fehlermodelle, Schedulingtechniken, Software/Hardware - responsives Systemdesign, Analyse und Synthese, Bewertung, Fallstudien in Forschung und Industrie.\nDer Halbkurs kann mit dem Halbkurs "Eigenschaften mobiler und eingebetteter Systeme" zu einem Projektkurs kombiniert werden. Ein gemeinsames Projekt begleitet beide Halbkurse.\nVL \tDi\t09-11\twöch.\tRUD 26, 1\x92308\tM. Malek\nVL\tDo\t09-11\twöch.\tRUD 26, 1\x92308\nPR\tn.V.\n\n\nStochastik für InformatikerInnen (32 239)\nGrundlagen der Wahrscheinlichkeitsrechnung, Diskrete und stetige Wahrscheinlichkeitsmodelle in der Informatik, Grenzwertsätze, Simulationsverfahren, Zufallszahlen, Statistische Schätz- und Testverfahren, Markoffsche Ketten, Simulated Annealing, Probabilistische Analyse von Algorithmen.\nVL\tMo\t09-11\twöch.\tRUD 25, 3.101\tW. Kössler\nVL\tMi\t09-11\twöch.\tRUD 25, 3.101\nUE\tMo\t11-13\twöch.\tRUD 25, 3.101\n UE\tMi\t11-13\twöch.\tRUD 25. 3.101\n\n\nGeschichte der Informatik \x96 Ausgewählte Kapitel (32 243)\nVL\tMi\t13-15\twöch.\tRUD 25, 3.113\tW. Coy\n\n\nAktuelle Themen der Theoretischen Informatik (32 260)\nIn diesem Seminar sollen wichtige aktuelle Veröffentlichungen aus der theoretischen Informatik gemeinsam erarbeitet werden. Genaueres wird erst kurz vor dem Seminar entschieden. Bei Interesse wenden Sie sich bitte möglichst frühzeitig an den Veranstalter.\n SE\tFr\t09-11\twöch.\tRUD 26, 1\x92307\tM. Grohe\xa0\n' Comment.Preproc
diff --git a/tests/examplefiles/rb/hash_syntax.rb.output b/tests/examplefiles/rb/hash_syntax.rb.output
index 34b7004afd..06dc098d68 100644
--- a/tests/examplefiles/rb/hash_syntax.rb.output
+++ b/tests/examplefiles/rb/hash_syntax.rb.output
@@ -1,65 +1,65 @@
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':old_syntax' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'ok'          Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'stings as key' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'should be ok' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'new_syntax'  Literal.String.Symbol
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'broken until now' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'withoutunderscore' Literal.String.Symbol
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'should be ok' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '_underscoreinfront' Literal.String.Symbol
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'might be ok, if I understand the pygments code correct' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rb/multiline_regexes.rb.output b/tests/examplefiles/rb/multiline_regexes.rb.output
index 7fc63cbacb..f360bb7eed 100644
--- a/tests/examplefiles/rb/multiline_regexes.rb.output
+++ b/tests/examplefiles/rb/multiline_regexes.rb.output
@@ -2,30 +2,30 @@
 '\nthis is a\nmultiline\nregex\n' Literal.String.Regex
 
 '/'           Literal.String.Regex
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'this'        Name
-' '           Text
+' '           Text.Whitespace
 '/'           Literal.String.Regex
 'is a\nmultiline regex too' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 ' '           Text
 '/'           Literal.String.Regex
 'is also\none' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'also'        Name
-' '           Text
+' '           Text.Whitespace
 '/'           Literal.String.Regex
 '4\nis one'   Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'this'        Name
 '('           Punctuation
@@ -34,87 +34,87 @@
 
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# this not'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
 '4'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'asfsadf'     Name
 '/'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# this is also not one' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0x4d'        Literal.Number.Hex
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
 '25'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
 '/'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '42'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '/'           Literal.String.Regex
 'this\nis also a multiline\nregex' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# And here some special string cases' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '% blah '     Literal.String.Other
-'           ' Text
+'           ' Text.Whitespace
 '# comment here to ensure whitespace' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
 '('           Punctuation
 '% blah '     Literal.String.Other
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 '% blah '     Literal.String.Other
-'          '  Text
+'          '  Text.Whitespace
 '# stupid but has to work' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '% blah '     Literal.String.Other
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '% blub '     Literal.String.Other
-'  '          Text
+'  '          Text.Whitespace
 '# wicked'    Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%q wicked '  Literal.String.Other
-'        '    Text
+'        '    Text.Whitespace
 '# works too' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rb/pleac.in.rb.output b/tests/examplefiles/rb/pleac.in.rb.output
index 0af7fd93d1..84746419a4 100644
--- a/tests/examplefiles/rb/pleac.in.rb.output
+++ b/tests/examplefiles/rb/pleac.in.rb.output
@@ -1,48 +1,48 @@
 '# -*- ruby -*-' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Local variables:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#  indent-tabs-mode: nil' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#  ruby-indent-level: 4' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# End:'      Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# @@PLEAC@@_NAME' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# @@SKIP@@ Ruby' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# @@PLEAC@@_WEB' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# @@SKIP@@ http://www.ruby-lang.org' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.0' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '\\n'         Literal.String.Escape
 "'"           Literal.String.Single
-'                     ' Text
+'                     ' Text.Whitespace
 '# two characters, \\ and an n' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Jon '        Literal.String.Single
 "\\'"         Literal.String.Escape
@@ -50,25 +50,25 @@
 "\\'"         Literal.String.Escape
 ' Orwant'     Literal.String.Single
 "'"           Literal.String.Single
-'  '          Text
+'  '          Text.Whitespace
 '# literal single quotes' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'                     ' Text
+'                     ' Text.Whitespace
 '# a "newline" character' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Jon '        Literal.String.Double
 '\\"'         Literal.String.Escape
@@ -76,72 +76,72 @@
 '\\"'         Literal.String.Escape
 ' Orwant'     Literal.String.Double
 '"'           Literal.String.Double
-'  '          Text
+'  '          Text.Whitespace
 '# literal double quotes' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "%q/Jon 'Maddog' Orwant/" Literal.String.Other
-'  '          Text
+'  '          Text.Whitespace
 '# literal single quotes' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%q['         Literal.String.Other
 "Jon 'Maddog' Orwant" Literal.String.Other
 ']'           Literal.String.Other
-'  '          Text
+'  '          Text.Whitespace
 '# literal single quotes' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%q{'         Literal.String.Other
 "Jon 'Maddog' Orwant" Literal.String.Other
 '}'           Literal.String.Other
-'  '          Text
+'  '          Text.Whitespace
 '# literal single quotes' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%q('         Literal.String.Other
 "Jon 'Maddog' Orwant" Literal.String.Other
 ')'           Literal.String.Other
-'  '          Text
+'  '          Text.Whitespace
 '# literal single quotes' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%q<'         Literal.String.Other
 "Jon 'Maddog' Orwant" Literal.String.Other
 '>'           Literal.String.Other
-'  '          Text
+'  '          Text.Whitespace
 '# literal single quotes' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
 '"'           Literal.String.Heredoc
 'EOF'         Literal.String.Delimiter
 '"'           Literal.String.Heredoc
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This is a multiline here document\n' Literal.String.Heredoc
 
@@ -149,27 +149,27 @@
 
 'EOF\n'       Literal.String.Delimiter
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# @@PLEAC@@_1.1' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 'offset'      Name
 ','           Punctuation
 'count'       Name
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 'offset'      Name
@@ -177,7 +177,7 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
 '['           Operator
@@ -185,11 +185,11 @@
 ','           Punctuation
 'count'       Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'newstring'   Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 '['           Operator
@@ -198,26 +198,26 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'newtail'     Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# in Ruby we can also specify intervals by their two offsets' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'value'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 'offset'      Name
 '..'          Operator
 'offs2'       Name
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 '['           Operator
@@ -225,25 +225,25 @@
 '..'          Operator
 'offs2'       Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'newstring'   Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'leading'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 's1'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 's2'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'trailing'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'data'        Name
 '.'           Operator
 'unpack'      Name
@@ -252,12 +252,12 @@
 'A5 x3 A8 A8 A*' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'fivers'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'unpack'      Name
@@ -265,9 +265,9 @@
 '"'           Literal.String.Double
 'A5'          Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'string'      Name
 '.'           Operator
@@ -276,12 +276,12 @@
 '5'           Literal.Number.Integer
 ')'           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'chars'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'unpack'      Name
@@ -289,67 +289,67 @@
 '"'           Literal.String.Double
 'A1'          Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'length'      Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'This is what you have' Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#        +012345678901234567890  Indexing forwards  (left to right)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#         109876543210987654321- Indexing backwards (right to left)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#          note that 0 means 10 or 20, etc. above' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'first'       Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
-'       '     Text
+'       '     Text.Whitespace
 '# "T"'       Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'start'       Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 '5'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ']'           Operator
-'       '     Text
+'       '     Text.Whitespace
 '# "is"'      Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'rest'        Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 '13'          Literal.Number.Integer
@@ -357,30 +357,30 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'     '       Text
+'     '       Text.Whitespace
 '# "you have"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'last'        Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 '-'           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
-'      '      Text
+'      '      Text.Whitespace
 '# "e"'       Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end_'        Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 '-'           Operator
@@ -389,42 +389,42 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'     '       Text
+'     '       Text.Whitespace
 '# "have"'    Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'piece'       Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 '-'           Operator
 '8'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ']'           Operator
-'      '      Text
+'      '      Text.Whitespace
 '# "you"'     Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
 '['           Operator
 '5'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 "wasn't"      Literal.String.Double
 '"'           Literal.String.Double
-'     '       Text
+'     '       Text.Whitespace
 '# change "is" to "wasn\'t"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 '['           Operator
@@ -434,31 +434,31 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'ondrous'     Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '# "This wasn\'t wondrous"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 '['           Operator
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'           ' Text
+'           ' Text.Whitespace
 '# delete first character' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 '['           Operator
@@ -468,17 +468,17 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'       '     Text
+'       '     Text.Whitespace
 '# delete last 10 characters' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '['           Operator
 '-'           Operator
@@ -487,28 +487,28 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
 'pattern'     Literal.String.Regex
 '/'           Literal.String.Regex
-'\n    '      Text
+'\n    '      Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Pattern matches in last 10 characters' Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
 '['           Operator
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number.Integer
 ']'           Operator
 '.'           Operator
@@ -518,74 +518,74 @@
 'is'          Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'at'          Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'make a hat'  Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '-'           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '-'           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'To be or not to be' Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'unpack'      Name
@@ -594,15 +594,15 @@
 'x6 A6'       Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'b'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'unpack'      Name
@@ -611,10 +611,10 @@
 'x6 A2 X5 A2' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'b'           Name
@@ -625,286 +625,286 @@
 '}'           Literal.String.Interpol
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'cut2fmt'     Name.Function
 '('           Punctuation
 '*'           Operator
 'args'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'template'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'lastpos'     Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'place'       Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'args'        Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'template'    Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'A'           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'place'       Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'lastpos'     Name
 ')'           Punctuation
 '.'           Operator
 'to_s'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'lastpos'     Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'place'       Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'template'    Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'A*'          Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 'template'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'fmt'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'cut2fmt'     Name
 '('           Punctuation
 '8'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '14'          Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '20'          Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '26'          Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '30'          Literal.Number.Integer
 ')'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.2' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# careful! "b is true" doesn\'t mean "b != 0" (0 is true in Ruby)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# thus no problem of "defined" later since only nil is false' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# the following sets to `c' if `b' is nil or false" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# if you need Perl's behaviour (setting to `c' if `b' is 0) the most" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# effective way is to use Numeric#nonzero? (thanks to Dave Thomas!)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '.'           Operator
 'nonzero?'    Name
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# you will still want to use defined? in order to test' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# for scope existence of a given object' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 'b'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'c'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'dir'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ARGV'        Name.Constant
 '.'           Operator
 'shift'       Name
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '/tmp'        Literal.String.Double
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.3' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'v1'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'v2'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'v2'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'v1'          Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'alpha'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'beta'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'production'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%w('         Literal.String.Other
 'January March August' Literal.String.Other
 ')'           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 'alpha'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'beta'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'production'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'beta'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'production'  Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'alpha'       Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.4' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'num'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'char'        Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'char'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'num'         Name
 '.'           Operator
 'chr'         Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Ruby also supports having a char from character constant' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'num'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '?r'          Literal.String.Char
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'char'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sprintf'     Name.Builtin
 '('           Punctuation
 '"'           Literal.String.Double
 '%c'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'num'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
 '('           Punctuation
@@ -913,18 +913,18 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'num'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'num'         Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ascii'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'unpack'      Name
@@ -933,12 +933,12 @@
 'C*'          Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ascii'       Name
 '.'           Operator
 'pack'        Name
@@ -947,21 +947,21 @@
 'C*'          Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'hal'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'HAL'         Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ascii'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'hal'         Name
 '.'           Operator
 'unpack'      Name
@@ -970,37 +970,37 @@
 'C*'          Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# We can't use Array#each since we can't mutate a Fixnum" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ascii'       Name
 '.'           Operator
 'collect!'    Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'i'           Name
 '|'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'                         ' Text
+'                         ' Text.Whitespace
 '# add one to each ASCII value' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'                \n' Text
+'                \n' Text.Whitespace
 
 'ibm'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ascii'       Name
 '.'           Operator
 'pack'        Name
@@ -1009,20 +1009,20 @@
 'C*'          Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'ibm'         Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.5' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'array'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'split'       Name
@@ -1030,12 +1030,12 @@
 "'"           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'array'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'unpack'      Name
@@ -1044,7 +1044,7 @@
 'C*'          Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
 '.'           Operator
@@ -1054,35 +1054,35 @@
 '.'           Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'b'           Name
 '|'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# do something with b' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'an apple a day' Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'unique chars are: ' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'split'       Name
@@ -1095,25 +1095,25 @@
 '.'           Operator
 'sort'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'sum'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ascval'      Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'unpack'      Name
@@ -1122,54 +1122,54 @@
 'C*'          Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# or use Array#each for a pure OO style :)' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sum'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'ascval'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'sum is '     Literal.String.Double
 '#{'          Literal.String.Interpol
 'sum'         Name
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '0xffffffff'  Literal.Number.Hex
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '# since Ruby will go Bignum if necessary' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# @@INCLUDE@@ include/ruby/slowcat.rb' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.6' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'revbytes'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'reverse'     Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'revwords'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'split'       Name
@@ -1187,12 +1187,12 @@
 ' '           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'revwords'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'split'       Name
@@ -1207,15 +1207,15 @@
 'reverse'     Name
 '.'           Operator
 'join'        Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# using the fact that IO is Enumerable, you can directly "select" it' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'long_palindromes' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'File'        Name.Constant
 '.'           Operator
 'open'        Name
@@ -1225,46 +1225,46 @@
 '"'           Literal.String.Double
 ')'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'select'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'w'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'w'           Name
 '.'           Operator
 'chomp!'      Name
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'w'           Name
 '.'           Operator
 'reverse'     Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'w'           Name
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'w'           Name
 '.'           Operator
 'length'      Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.7' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'string'      Name
 '.'           Operator
 'sub!'        Name
@@ -1274,43 +1274,43 @@
 '+'           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 ' '           Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$&'          Name.Variable.Global
 '.'           Operator
 'length'      Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '$`'          Name.Variable.Global
 '.'           Operator
 'length'      Name
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.8' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "'"           Literal.String.Single
 'You owe '    Literal.String.Single
@@ -1333,34 +1333,34 @@
 '}'           Literal.String.Interpol
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
 '('           Punctuation
 '$1'          Name.Variable.Global
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'rows'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'cols'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '24'          Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '80'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'text'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%q('         Literal.String.Other
 'I am '       Literal.String.Other
 '#'           Literal.String.Other
@@ -1368,7 +1368,7 @@
 '#'           Literal.String.Other
 '{cols} long' Literal.String.Other
 ')'           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 'text'        Name
 '.'           Operator
@@ -1385,9 +1385,9 @@
 '}'           Literal.String.Interpol
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'eval'        Name.Builtin
 '('           Punctuation
 '"'           Literal.String.Double
@@ -1396,14 +1396,14 @@
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'text'        Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "'"           Literal.String.Single
 'I am 17 years old' Literal.String.Single
@@ -1416,43 +1416,43 @@
 'd+'          Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '$&'          Name.Variable.Global
 '.'           Operator
 'to_i'        Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.9' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'e'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'bo peep'     Literal.String.Double
 '"'           Literal.String.Double
 '.'           Operator
 'upcase'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'e'           Name
 '.'           Operator
 'downcase!'   Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'e'           Name
 '.'           Operator
 'capitalize!' Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '"'           Literal.String.Double
 'thIS is a loNG liNE' Literal.String.Double
@@ -1465,18 +1465,18 @@
 'w+'          Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$&'          Name.Variable.Global
 '.'           Operator
 'capitalize'  Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.10' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String.Double
 'I have '     Literal.String.Double
@@ -1487,32 +1487,32 @@
 '}'           Literal.String.Interpol
 ' guanacos.'  Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'I have '     Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '+'           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' guanacos.'  Literal.String.Double
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.11' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'var'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
 "'"           Literal.String.Heredoc
 'EOF'         Literal.String.Delimiter
@@ -1526,11 +1526,11 @@
 's+'          Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    your text\n' Literal.String.Heredoc
 
@@ -1538,74 +1538,74 @@
 
 'EOF\n'       Literal.String.Delimiter
 
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# @@PLEAC@@_1.12' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Folding and splicing is the work of an editor,' Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 '+'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '"'           Literal.String.Double
 'not a mere collection of silicon' Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 '+'           Operator
-' \n    '     Text
+' \n    '     Text.Whitespace
 '"'           Literal.String.Double
 'and'         Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 '+'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '"'           Literal.String.Double
 'mobile electrons!' Literal.String.Double
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'wrap'        Name.Function
 '('           Punctuation
 'str'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'max_size'    Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'all'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'line'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'l'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'str'         Name
 '.'           Operator
 'split'       Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'line'        Name
 '+'           Operator
@@ -1613,55 +1613,55 @@
 ')'           Punctuation
 '.'           Operator
 'length'      Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'max_size'    Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'all'         Name
 '.'           Operator
 'push'        Name
 '('           Punctuation
 'line'        Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'line'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'line'        Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'line'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'l'           Name
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 ' '           Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'l'           Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'all'         Name
 '.'           Operator
 'push'        Name
@@ -1675,54 +1675,54 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'wrap'        Name
 '('           Punctuation
 'string'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '20'          Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> Folding and ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> splicing is the ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> work of an editor, ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> not a mere ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> collection of ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> silicon and mobile ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> electrons!' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.13' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%q('         Literal.String.Other
 'Mom said, "Don\'t do that."' Literal.String.Other
 ')'           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 '.'           Operator
@@ -1732,17 +1732,17 @@
 '[\'"]'       Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '\\\\'        Literal.String.Escape
 "'"           Literal.String.Single
 '+'           Operator
 '$&'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 '.'           Operator
@@ -1752,7 +1752,7 @@
 '[\'"]'       Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '\\'          Literal.String.Single
 '&'           Literal.String.Single
@@ -1760,7 +1760,7 @@
 '&'           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 '.'           Operator
@@ -1770,17 +1770,17 @@
 '[^A-Z]'      Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '\\\\'        Literal.String.Escape
 "'"           Literal.String.Single
 '+'           Operator
 '$&'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String.Double
 'is a test!'  Literal.String.Double
@@ -1793,42 +1793,42 @@
 'W'           Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '\\\\'        Literal.String.Escape
 "'"           Literal.String.Single
 '+'           Operator
 '$&'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '# no function like quotemeta?' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.14' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
 '.'           Operator
 'strip!'      Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.15' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'parse_csv'   Name.Function
 '('           Punctuation
 'text'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'new'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'text'        Name
 '.'           Operator
 'scan'        Name
@@ -1847,39 +1847,39 @@
 ']*)*)",?|([^,]+),?|,' Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'new'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'text'        Name
 '['           Operator
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '?,'          Literal.String.Char
-'\n    '      Text
+'\n    '      Text.Whitespace
 'new'         Keyword.Pseudo
 '.'           Operator
 'flatten'     Name
 '.'           Operator
 'compact'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'  \n\n'      Text
+'  \n\n'      Text.Whitespace
 
 'line'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%q<'         Literal.String.Other
 'XYZZY,"","O\'Reilly, Inc","Wall, Larry","a ' Literal.String.Other
 '\\'          Literal.String.Other
@@ -1887,32 +1887,32 @@
 '\\'          Literal.String.Other
 '" bit,",5,"Error, Core Dumped"' Literal.String.Other
 '>'           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fields'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'parse_csv'   Name
 '('           Punctuation
 'line'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fields'      Name
 '.'           Operator
 'each_with_index' Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'v'           Name
 ','           Punctuation
 'i'           Name
 '|'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'i'           Name
@@ -1924,31 +1924,31 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.16' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Use the soundex.rb Library from Michael Neumann.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# http://www.s-direktnet.de/homepages/neumann/rb_prgs/Soundex.rb' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Soundex'     Literal.String.Single
 "'"           Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'code'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name.Constant
 '::'          Operator
 'Soundex'     Name.Constant
@@ -1957,12 +1957,12 @@
 '('           Punctuation
 'string'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'codes'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name.Constant
 '::'          Operator
 'Soundex'     Name.Constant
@@ -1971,28 +1971,28 @@
 '('           Punctuation
 'array'       Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# substitution function for getpwent():' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# returns an array of user entries,' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# each entry contains the username and the full name' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'login_names' Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 'result'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'File'        Name.Constant
 '.'           Operator
 'open'        Name
@@ -2001,27 +2001,27 @@
 '/etc/passwd' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'file'        Name
 '|'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'file'        Name
 '.'           Operator
 'each_line'   Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'line'        Name
 '|'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'next'        Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'line'        Name
 '.'           Operator
 'match'       Name
@@ -2031,11 +2031,11 @@
 '#'           Literal.String.Regex
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'cols'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'line'        Name
 '.'           Operator
 'split'       Name
@@ -2044,7 +2044,7 @@
 ':'           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'result'      Name
 '.'           Operator
 'push'        Name
@@ -2055,56 +2055,56 @@
 '0'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'cols'        Name
 '['           Operator
 '4'           Literal.Number.Integer
 ']'           Operator
 ']'           Operator
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'result'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Lookup user: ' Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'user'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'STDIN'       Name.Constant
 '.'           Operator
 'gets'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'user'        Name
 '.'           Operator
 'chomp!'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'user'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'name_code'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name.Constant
 '::'          Operator
 'Soundex'     Name.Constant
@@ -2113,12 +2113,12 @@
 '('           Punctuation
 'user'        Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'splitter'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Regexp'      Name.Constant
 '.'           Operator
 'new'         Name
@@ -2133,28 +2133,28 @@
 'w+)'         Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'username'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'fullname'    Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'login_names' Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'firstname'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'lastname'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'splitter'    Name
 '.'           Operator
 'match'       Name
@@ -2166,13 +2166,13 @@
 ','           Punctuation
 '2'           Literal.Number.Integer
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'name_code'   Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name.Constant
 '::'          Operator
 'Soundex'     Name.Constant
@@ -2181,13 +2181,13 @@
 '('           Punctuation
 'username'    Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'name_code'   Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name.Constant
 '::'          Operator
 'Soundex'     Name.Constant
@@ -2196,13 +2196,13 @@
 '('           Punctuation
 'firstname'   Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'name_code'   Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'Text'        Name.Constant
 '::'          Operator
 'Soundex'     Name.Constant
@@ -2211,11 +2211,11 @@
 '('           Punctuation
 'lastname'    Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'username'    Name
@@ -2229,30 +2229,30 @@
 'lastname'    Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.17' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# @@INCLUDE@@ include/ruby/fixstyle.rb' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_1.18' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# @@INCLUDE@@ include/ruby/psgrep.rb' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.1' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Matz tells that you can use Integer() for strict checked conversion.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Integer'     Name.Builtin
 '('           Punctuation
@@ -2260,10 +2260,10 @@
 'abc'         Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> `Integer\': invalid value for Integer: "abc" (ArgumentError)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Integer'     Name.Builtin
 '('           Punctuation
@@ -2271,13 +2271,13 @@
 '567'         Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> 567'     Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# You may use Float() for floating point stuff' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Integer'     Name.Builtin
 '('           Punctuation
@@ -2285,10 +2285,10 @@
 '56.7'        Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> `Integer\': invalid value for Integer: "56.7" (ArgumentError)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Float'       Name.Builtin
 '('           Punctuation
@@ -2296,18 +2296,18 @@
 '56.7'        Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#=> 56.7'    Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# You may also use a regexp for that' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -2315,30 +2315,30 @@
 '\\'          Literal.String.Regex
 'd+$'         Literal.String.Regex
 '/'           Literal.String.Regex
-'\n    '      Text
+'\n    '      Text.Whitespace
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'is an integer' Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'is not'      Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -2354,48 +2354,48 @@
 '\\'          Literal.String.Regex
 'd+)$'        Literal.String.Regex
 '/'           Literal.String.Regex
-'\n    '      Text
+'\n    '      Text.Whitespace
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'is a decimal number' Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'else'        Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'is not'      Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.2' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# equal(num1, num2, accuracy) : returns true if num1 and num2 are' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   equal to accuracy number of decimal places' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'equal'       Name.Function
 '('           Punctuation
 'i'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'j'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sprintf'     Name.Builtin
 '('           Punctuation
 '"'           Literal.String.Double
@@ -2406,12 +2406,12 @@
 'g'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'sprintf'     Name.Builtin
 '('           Punctuation
 '"'           Literal.String.Double
@@ -2422,35 +2422,35 @@
 'g'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'j'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'wage'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '536'         Literal.Number.Integer
-'                        ' Text
+'                        ' Text.Whitespace
 '# $5.36/hour' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'week'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '40'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'wage'        Name
-'                  ' Text
+'                  ' Text.Whitespace
 '# $214.40'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
 '('           Punctuation
@@ -2461,51 +2461,51 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'week'        Name
 '/'           Operator
 '100'         Literal.Number.Integer
 '.'           Operator
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.3' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'num'         Name
 '.'           Operator
 'round'       Name
-'                         ' Text
+'                         ' Text.Whitespace
 '# rounds to integer' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '.'           Operator
 '255'         Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'sprintf'     Name.Builtin
 '('           Punctuation
 '"'           Literal.String.Double
 '%.2f'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-'  '          Text
+'  '          Text.Whitespace
 '"'           Literal.String.Double
 'Unrounded: ' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -2518,10 +2518,10 @@
 '}'           Literal.String.Interpol
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Unrounded: ' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -2532,12 +2532,12 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'number'      Literal.String.Double
 '\\t'         Literal.String.Escape
@@ -2548,47 +2548,47 @@
 'ceil'        Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 '.'           Operator
 '3'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 '.'           Operator
 '5'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 '.'           Operator
 '7'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '3'           Literal.Number.Integer
 '.'           Operator
 '3'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'printf'      Name.Builtin
 '('           Punctuation
 '"'           Literal.String.Double
@@ -2602,41 +2602,41 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 "# at least I don't fake my output :)" Comment.Single
-'\n           ' Text
+'\n           ' Text.Whitespace
 'n'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '.'           Operator
 'to_i'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '.'           Operator
 'floor'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '.'           Operator
 'ceil'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.4' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'dec2bin'     Name.Function
 '('           Punctuation
 'n'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '['           Operator
 'n'           Name
 ']'           Operator
@@ -2666,22 +2666,22 @@
 'd)'          Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'bin2dec'     Name.Function
 '('           Punctuation
 'n'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '['           Operator
 '('           Punctuation
 '"'           Literal.String.Double
@@ -2719,31 +2719,31 @@
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.5' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '..'          Operator
-' '           Text
+' '           Text.Whitespace
 'y'           Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# i is set to every integer from x to y, inclusive' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'x'           Name
 '.'           Operator
@@ -2753,25 +2753,25 @@
 ','           Punctuation
 '7'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'i'           Name
 '|'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# i is set to every integer from x to y, stepsize = 7' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Infancy is: ' Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '('           Punctuation
 '0'           Literal.Number.Integer
@@ -2780,366 +2780,366 @@
 ')'           Punctuation
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'i'           Name
 '|'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.6' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# We can add conversion methods to the Integer class,' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# this makes a roman number just a representation for normal numbers.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Integer'     Name.Class
-'\n    \n    ' Text
+'\n    \n    ' Text.Whitespace
 '@@romanlist' Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '['           Operator
 '"'           Literal.String.Double
 'M'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1000'        Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'CM'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '900'         Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'D'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '500'         Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'CD'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '400'         Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'C'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '100'         Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'XC'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '90'          Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'L'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'   '         Text
+'   '         Text.Whitespace
 '50'          Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'XL'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '40'          Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'X'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'   '         Text
+'   '         Text.Whitespace
 '10'          Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'IX'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'   '         Text
+'   '         Text.Whitespace
 '9'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'V'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '5'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'IV'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'   '         Text
+'   '         Text.Whitespace
 '4'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-'\n                   ' Text
+'\n                   ' Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'I'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
 ']'           Operator
-'\n    \n    ' Text
+'\n    \n    ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'to_roman'    Name.Function
-'\n        '  Text
+'\n        '  Text.Whitespace
 'remains'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
-'\n        '  Text
+'\n        '  Text.Whitespace
 'roman'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'sym'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'num'         Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@@romanlist' Name.Variable.Class
-'\n            ' Text
+'\n            ' Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'remains'     Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'num'         Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'remains'     Name
-' '           Text
+' '           Text.Whitespace
 '-='          Operator
-' '           Text
+' '           Text.Whitespace
 'num'         Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'roman'       Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'sym'         Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'roman'       Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    \n    ' Text
+'\n    \n    ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Integer'     Name.Class
 '.'           Operator
 'from_roman'  Name.Function
 '('           Punctuation
 'roman'       Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'ustr'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'roman'       Name
 '.'           Operator
 'upcase'      Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'sum'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n        '  Text
+'\n        '  Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'entry'       Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@@romanlist' Name.Variable.Class
-'\n            ' Text
+'\n            ' Text.Whitespace
 'sym'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'num'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'entry'       Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'entry'       Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'sym'         Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'ustr'        Name
 '['           Operator
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sym'         Name
 '.'           Operator
 'length'      Name
 ']'           Operator
-'\n                ' Text
+'\n                ' Text.Whitespace
 'sum'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'num'         Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'ustr'        Name
 '.'           Operator
 'slice!'      Name
 '('           Punctuation
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sym'         Name
 '.'           Operator
 'length'      Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'sum'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    \n'    Text
+'\n    \n'    Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 'roman_fifteen' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '15'          Literal.Number.Integer
 '.'           Operator
 'to_roman'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Roman for fifteen is ' Literal.String.Double
 '#{'          Literal.String.Interpol
 'roman_fifteen' Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Name.Builtin
 '.'           Operator
 'from_roman'  Name
 '('           Punctuation
 'roman_fifteen' Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Converted back, ' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -3150,52 +3150,52 @@
 'i'           Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# check'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '1'           Literal.Number.Integer
 '..'          Operator
 '3900'        Literal.Number.Integer
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'r'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 '.'           Operator
 'to_roman'    Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'j'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Integer'     Name.Builtin
 '.'           Operator
 'from_roman'  Name
 '('           Punctuation
 'r'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 'j'           Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'error: '     Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -3210,20 +3210,20 @@
 'j'           Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.7' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'random'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'rand'        Name.Builtin
 '('           Punctuation
 'y'           Name
@@ -3234,12 +3234,12 @@
 ')'           Punctuation
 '+'           Operator
 'x'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'chars'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '"'           Literal.String.Double
 'A'           Literal.String.Double
@@ -3267,32 +3267,32 @@
 ']'           Operator
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'r'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'r'           Name
 '.'           Operator
 'to_a'        Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
 'join'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '%q('         Literal.String.Other
 '!@$%^&*'     Literal.String.Other
 ')'           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 'password'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '1'           Literal.Number.Integer
 '..'          Operator
@@ -3300,9 +3300,9 @@
 ')'           Punctuation
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'chars'       Name
 '['           Operator
 'rand'        Name.Builtin
@@ -3312,7 +3312,7 @@
 'size'        Name
 ')'           Punctuation
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
 'pack'        Name
@@ -3321,39 +3321,39 @@
 'C*'          Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.8' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'srand'       Name.Builtin
-'        '    Text
+'        '    Text.Whitespace
 '# uses a combination of the time, the process id, and a sequence number' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'srand'       Name.Builtin
 '('           Punctuation
 'val'         Name
 ')'           Punctuation
-'   '         Text
+'   '         Text.Whitespace
 '# for repeatable behaviour' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.9' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# from the randomr lib: ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# http://raa.ruby-lang.org/project/randomr/' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-'           Operator
 '-'           Operator
 '-'           Operator
 '-'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'http'        Literal.String.Symbol
 ':'           Punctuation
 '/'           Literal.String.Regex
@@ -3370,96 +3370,96 @@
 '/'           Operator
 'randomr'     Name
 '/'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'random/mersenne_twister' Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'mers'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Random'      Name.Constant
 '::'          Operator
 'MersenneTwister' Name.Constant
 '.'           Operator
 'new'         Name
-' '           Text
+' '           Text.Whitespace
 '123456789'   Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'mers'        Name
 '.'           Operator
 'rand'        Name
 '('           Punctuation
 '0'           Literal.Number.Integer
 ')'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '# 0.550321932544541' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'mers'        Name
 '.'           Operator
 'rand'        Name
 '('           Punctuation
 '10'          Literal.Number.Integer
 ')'           Punctuation
-'   '         Text
+'   '         Text.Whitespace
 '# 2'         Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# using online sources of random data via the realrand package:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# http://raa.ruby-lang.org/project/realrand/' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# **Note**'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# The following online services are used in this package:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   http://www.random.org - source: atmospheric noise ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   http://www.fourmilab.ch/hotbits - source: radioactive decay timings' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   http://random.hd.org - source: entropy from local and network noise' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Please visit the sites and respect the rules of each service.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'random/online' Literal.String.Single
 "'"           Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'generator1'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Random'      Name.Constant
 '::'          Operator
 'RandomOrg'   Name.Constant
 '.'           Operator
 'new'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'generator1'  Name
 '.'           Operator
 'randbyte'    Name
@@ -3473,20 +3473,20 @@
 ','           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'generator1'  Name
 '.'           Operator
 'randnum'     Name
 '('           Punctuation
 '10'          Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '6'           Literal.Number.Integer
 ')'           Punctuation
 '.'           Operator
@@ -3496,23 +3496,23 @@
 ','           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '# Roll dice 10 times.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'generator2'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Random'      Name.Constant
 '::'          Operator
 'FourmiLab'   Name.Constant
 '.'           Operator
 'new'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'generator2'  Name
 '.'           Operator
 'randbyte'    Name
@@ -3526,24 +3526,24 @@
 ','           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# randnum is not supported.' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'generator3'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Random'      Name.Constant
 '::'          Operator
 'EntropyPool' Name.Constant
 '.'           Operator
 'new'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'generator3'  Name
 '.'           Operator
 'randbyte'    Name
@@ -3557,83 +3557,83 @@
 ','           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# randnum is not supported.' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.10' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'gaussian_rand' Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin'       Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'u1'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'rand'        Name.Builtin
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n        '  Text
+'\n        '  Text.Whitespace
 'u2'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'rand'        Name.Builtin
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n        '  Text
+'\n        '  Text.Whitespace
 'w'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'u1'          Name
 '*'           Operator
 'u1'          Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'u2'          Name
 '*'           Operator
 'u2'          Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'w'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'w'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Constant
 '.'           Operator
 'sqrt'        Name
@@ -3652,55 +3652,55 @@
 '/'           Operator
 'w'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 'u2'          Name
 '*'           Operator
 'w'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'u1'          Name
 '*'           Operator
 'w'           Name
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'mean'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '25'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sdev'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'salary'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'gaussian_rand' Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'sdev'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'mean'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
 '('           Punctuation
@@ -3711,21 +3711,21 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'salary'      Name
 ')'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.11' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'deg2rad'     Name.Function
 '('           Punctuation
 'd'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '('           Punctuation
 'd'           Name
 '/'           Operator
@@ -3737,18 +3737,18 @@
 'Math'        Name.Constant
 '::'          Operator
 'PI'          Name.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'rad2deg'     Name.Function
 '('           Punctuation
 'r'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '('           Punctuation
 'r'           Name
 '/'           Operator
@@ -3758,229 +3758,229 @@
 ')'           Punctuation
 '*'           Operator
 '180'         Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.12' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sin_val'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Constant
 '.'           Operator
 'sin'         Name
 '('           Punctuation
 'angle'       Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'cos_val'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Constant
 '.'           Operator
 'cos'         Name
 '('           Punctuation
 'angle'       Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tan_val'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Constant
 '.'           Operator
 'tan'         Name
 '('           Punctuation
 'angle'       Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# AFAIK Ruby's Math module doesn't provide acos/asin" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# While we're at it, let's also define missing hyperbolic functions" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'module'      Keyword
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Namespace
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Class
 '.'           Operator
 'asin'        Name.Function
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'atan2'       Name
 '('           Punctuation
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'sqrt'        Name
 '('           Punctuation
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 '**'          Operator
 '2'           Literal.Number.Integer
 ')'           Punctuation
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Class
 '.'           Operator
 'acos'        Name.Function
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'atan2'       Name
 '('           Punctuation
 'sqrt'        Name
 '('           Punctuation
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 '**'          Operator
 '2'           Literal.Number.Integer
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Class
 '.'           Operator
 'atan'        Name.Function
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'atan2'       Name
 '('           Punctuation
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Class
 '.'           Operator
 'sinh'        Name.Function
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '('           Punctuation
 'exp'         Name
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'exp'         Name
 '('           Punctuation
 '-'           Operator
 'x'           Name
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Class
 '.'           Operator
 'cosh'        Name.Function
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '('           Punctuation
 'exp'         Name
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'exp'         Name
 '('           Punctuation
 '-'           Operator
 'x'           Name
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Class
 '.'           Operator
 'tanh'        Name.Function
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'sinh'        Name
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 'cosh'        Name
 '('           Punctuation
 'x'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# The support for Complex numbers is not built-in' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'y'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Constant
 '.'           Operator
 'acos'        Name
@@ -3989,57 +3989,57 @@
 '.'           Operator
 '7'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 "#=> in `sqrt': square root for negative number (ArgumentError)" Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# There is an implementation of Complex numbers in 'complex.rb' in current" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# Ruby distro, but it doesn't support atan2 with complex args, so it doesn't" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# solve this problem.' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.13' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'log_e'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Constant
 '.'           Operator
 'log'         Name
 '('           Punctuation
 'val'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'log_10'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Constant
 '.'           Operator
 'log10'       Name
 '('           Punctuation
 'val'         Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'log_base'    Name.Function
 '('           Punctuation
 'base'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'val'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Math'        Name.Constant
 '.'           Operator
 'log'         Name
@@ -4053,185 +4053,185 @@
 '('           Punctuation
 'base'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'answer'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'log_base'    Name
 '('           Punctuation
 '10'          Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '10_000'      Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'log10(10,000) = ' Literal.String.Double
 '#{'          Literal.String.Interpol
 'answer'      Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.14' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'matrix.rb'   Literal.String.Single
 "'"           Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Matrix'      Name.Constant
 '['           Operator
 '['           Operator
 '3'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '5'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '9'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number.Integer
 ']'           Operator
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Matrix'      Name.Constant
 '['           Operator
 '['           Operator
 '4'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '7'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '9'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '8'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'a'           Name
 '.'           Operator
 'row_size'    Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
 '.'           Operator
 'column_size' Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'c'           Name
 '.'           Operator
 'det'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
 '.'           Operator
 'transpose'   Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.15' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'complex.rb'  Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'rational.rb' Literal.String.Single
 "'"           Literal.String.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Complex'     Name.Constant
 '('           Punctuation
 '3'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number.Integer
 ')'           Punctuation
-'              ' Text
+'              ' Text.Whitespace
 '# 3 + 5i'    Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Complex'     Name.Constant
 '('           Punctuation
 '2'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '2'           Literal.Number.Integer
 ')'           Punctuation
-'             ' Text
+'             ' Text.Whitespace
 '# 2 - 2i'    Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'c = '        Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -4240,36 +4240,36 @@
 'b'           Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'c'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'd'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 '*'           Operator
 'Complex'     Name.Constant
 '::'          Operator
 'I'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'printf'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'sqrt('       Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -4279,133 +4279,133 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Math'        Name.Constant
 '.'           Operator
 'sqrt'        Name
 '('           Punctuation
 'd'           Name
 ')'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.16' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'number'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'hexadecimal' Name
 '.'           Operator
 'hex'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'number'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'octal'       Name
 '.'           Operator
 'oct'         Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Gimme a number in decimal, octal, or hex: ' Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'num'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'gets'        Name.Builtin
 '.'           Operator
 'chomp'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'exit'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 'num'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'num'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'num'         Name
 '.'           Operator
 'oct'         Name
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'num'         Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
 '^0'          Literal.String.Regex
 '/'           Literal.String.Regex
-'  '          Text
+'  '          Text.Whitespace
 '# does both oct and hex  ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '%d %x %o'    Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'num'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'num'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'num'         Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Enter file permission in octal: ' Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'permissions' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'gets'        Name.Builtin
 '.'           Operator
 'chomp'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Exiting ...' Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'defined?'    Name
 '('           Punctuation
 'permissions' Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The decimal value is ' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -4414,22 +4414,22 @@
 'oct'         Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.17' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'commify'     Name.Function
 '('           Punctuation
 'n'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
 '.'           Operator
 'to_s'        Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -4439,32 +4439,32 @@
 '\\'          Literal.String.Regex
 '..*)?'       Literal.String.Regex
 '/'           Literal.String.Regex
-'\n    '      Text
+'\n    '      Text.Whitespace
 'int'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'dec'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$1'          Name.Variable.Global
 '.'           Operator
 'reverse'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$2'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$2'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'int'         Name
 '.'           Operator
 'gsub!'       Name
@@ -4479,7 +4479,7 @@
 'd)'          Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '\\1'         Literal.String.Escape
 '\\2'         Literal.String.Escape
@@ -4487,450 +4487,450 @@
 '\\3'         Literal.String.Escape
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'int'         Name
 '.'           Operator
 'reverse'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'dec'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.18' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'It took %d hour%s' Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'time'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'time'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '?'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 's'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# dunno if an equivalent to Lingua::EN::Inflect exists...' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_2.19' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#-----------------------------' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#!/usr/bin/ruby' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# bigfact - calculating prime factors' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'factorize'   Name.Function
 '('           Punctuation
 'orig'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'factors'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'factors'     Name
 '.'           Operator
 'default'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'     '       Text
+'     '       Text.Whitespace
 '# return 0 instead nil if key not found in hash' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'orig'        Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sqi'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
-'                 ' Text
+'                 ' Text.Whitespace
 '# square of i' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'sqi'         Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '.'           Operator
 'modulo'      Name
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '/='          Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'factors'     Name
 '['           Operator
 'i'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n            ' Text
+'\n            ' Text.Whitespace
 '# puts "Found factor #{i}"' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# we take advantage of the fact that (i +1)**2 = i**2 + 2*i +1' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'sqi'         Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n        '  Text
+'\n        '  Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    \n    ' Text
+'\n    \n    ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 'orig'        Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'factors'     Name
 '['           Operator
 'n'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'factors'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'printfactorhash' Name.Function
 '('           Punctuation
 'orig'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'factorcount' Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'format'      Name.Builtin
 '('           Punctuation
 '"'           Literal.String.Double
 '%-10d '      Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'orig'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'factorcount' Name
 '.'           Operator
 'length'      Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n        '  Text
+'\n        '  Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'PRIME'       Literal.String.Double
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '# sorts after number, because the hash keys are numbers' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'factorcount' Name
 '.'           Operator
 'sort'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'factor'      Name
 ','           Punctuation
 'exponent'    Name
 '|'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'factor'      Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'exponent'    Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n                ' Text
+'\n                ' Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '**'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'exponent'    Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' '           Literal.String.Double
 '"'           Literal.String.Double
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'puts'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'arg'         Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ARGV'        Name.Constant
-'\n    '      Text
+'\n    '      Text.Whitespace
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'arg'         Name
 '.'           Operator
 'to_i'        Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'mfactors'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'factorize'   Name
 '('           Punctuation
 'n'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'printfactorhash' Name
 '('           Punctuation
 'n'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'mfactors'    Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#-----------------------------' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.0' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Today is day ' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
 '.'           Operator
 'yday'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' of the current year.' Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Today is day ' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
 '.'           Operator
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' of the current month.' Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.1' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'month'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'year'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
 '.'           Operator
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
 '.'           Operator
 'month'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
 '.'           Operator
 'year'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# or'        Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'month'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'year'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
@@ -4941,18 +4941,18 @@
 '..'          Operator
 '5'           Literal.Number.Integer
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'tl'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
 '.'           Operator
 'localtime'   Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
 '('           Punctuation
@@ -4961,22 +4961,22 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'tl'          Name
 '.'           Operator
 'year'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'tl'          Name
 '.'           Operator
 'month'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'tl'          Name
 '.'           Operator
 'day'         Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'Time'        Name.Constant
 '.'           Operator
@@ -4990,10 +4990,10 @@
 '%Y-%m-%d'    Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.2' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Time'        Name.Constant
 '.'           Operator
@@ -5001,24 +5001,24 @@
 '('           Punctuation
 'year'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'month'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'hour'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'minute'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'second'      Name
 ')'           Punctuation
 '.'           Operator
 'tv_sec'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Time'        Name.Constant
 '.'           Operator
@@ -5026,59 +5026,59 @@
 '('           Punctuation
 'year'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'month'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'hour'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'minute'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'second'      Name
 ')'           Punctuation
 '.'           Operator
 'tv_sec'      Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.3' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sec'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'min'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'hour'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'month'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'year'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'wday'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'yday'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'isdst'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'zone'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'at'          Name
@@ -5087,65 +5087,65 @@
 ')'           Punctuation
 '.'           Operator
 'to_a'        Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.4' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'when_'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'now'         Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'difference'  Name
-'         '   Text
+'         '   Text.Whitespace
 '# now -> Time ; difference -> Numeric (delta in seconds)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'then_'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'now'         Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'difference'  Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.5' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'bree'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '361535725'   Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'nat'         Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 '96201950'    Literal.Number.Integer
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'bree'        Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'nat'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'There were ' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -5153,122 +5153,122 @@
 '}'           Literal.String.Interpol
 ' seconds between Nat and Bree' Literal.String.Double
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'seconds'     Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '60'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'seconds'     Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '60'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'minutes'     Name
-'    '        Text
+'    '        Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '60'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'minutes'     Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '60'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'hours'       Name
-'      '      Text
+'      '      Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '24'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'hours'       Name
 ')'           Punctuation
-'   '         Text
+'   '         Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '24'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'days'        Name
-'       '     Text
+'       '     Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '7'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'weeks'       Name
-'      '      Text
+'      '      Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'days'        Name
 ')'           Punctuation
-'    '        Text
+'    '        Text.Whitespace
 '/'           Operator
-'  '          Text
+'  '          Text.Whitespace
 '7'           Literal.Number.Integer
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '('           Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -5292,43 +5292,43 @@
 '}'           Literal.String.Interpol
 ')'           Literal.String.Double
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.6' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'monthday'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'weekday'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'yearday'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'date'        Name
 '.'           Operator
 'mday'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'date'        Name
 '.'           Operator
 'wday'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'date'        Name
 '.'           Operator
 'yday'        Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# AFAIK the week number is not just a division since week boundaries are on sundays' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'weeknum'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'd'           Name
 '.'           Operator
 'strftime'    Name
@@ -5339,57 +5339,57 @@
 ')'           Punctuation
 '.'           Operator
 'to_i'        Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'year'        Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1981'        Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'month'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'jun'         Literal.String.Double
 '"'           Literal.String.Double
-'                     ' Text
+'                     ' Text.Whitespace
 "# or `6' if you want to emulate a broken language" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'day'         Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '16'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 't'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'mktime'      Name
 '('           Punctuation
 'year'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'month'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'month'       Name
@@ -5405,7 +5405,7 @@
 ' was a '     Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 't'           Name
 '.'           Operator
 'strftime'    Name
@@ -5415,39 +5415,39 @@
 '"'           Literal.String.Double
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.7' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'yyyy'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'mm'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'dd'          Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$1'          Name.Variable.Global
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$2'          Name.Variable.Global
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$3'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '1998-06-25'  Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -5459,45 +5459,45 @@
 '\\'          Literal.String.Regex
 'd+)'         Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'epoch_seconds' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'mktime'      Name
 '('           Punctuation
 'yyyy'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'mm'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'dd'          Name
 ')'           Punctuation
 '.'           Operator
 'tv_sec'      Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# dunno an equivalent to Date::Manip#ParseDate' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.8' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'at'          Name
 '('           Punctuation
 'epoch_secs'  Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Time'        Name.Constant
 '.'           Operator
@@ -5507,103 +5507,103 @@
 ')'           Punctuation
 '.'           Operator
 'gmtime'      Name
-'        '    Text
+'        '    Text.Whitespace
 '# gives: Fri Feb 13 23:31:30 UTC 2009' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'time'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'mktime'      Name
 '('           Punctuation
 '1973'        Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'jan'         Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '18'          Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '45'          Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '50'          Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'In localtime it gives: ' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'time'        Name
 '.'           Operator
 'localtime'   Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.9' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Ruby provides micro-seconds in Time object' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
 '.'           Operator
 'usec'        Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Ruby gives the seconds in floating format when substracting two Time objects' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'before'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'line'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'gets'        Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elapsed'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'before'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'You took '   Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -5611,114 +5611,114 @@
 '}'           Literal.String.Interpol
 ' seconds.'   Literal.String.Double
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# On my Celeron-400 with Linux-2.2.19-14mdk, average for three execs are:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#   This Ruby version:       average 0.00321 sec' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "#   Cookbook's Perl version: average 0.00981 sec" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '500'         Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'number_of_times' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '100'         Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'total_time'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'number_of_times' Name
 '.'           Operator
 'times'       Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# populate array' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'array'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'size'        Name
 '.'           Operator
 'times'       Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'array'       Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'rand'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# sort it'   Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'begin_'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'array'       Name
 '.'           Operator
 'sort!'       Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'time'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'now'         Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'begin_'      Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'total_time'  Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'time'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'printf'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'On average, sorting %d random numbers takes %.5f seconds' Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'size'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'total_time'  Name
 '/'           Operator
@@ -5727,10 +5727,10 @@
 'number_of_times' Name
 ')'           Punctuation
 ')'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.10' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sleep'       Name.Builtin
 '('           Punctuation
@@ -5738,47 +5738,47 @@
 '.'           Operator
 '005'         Literal.Number.Oct
 ')'           Punctuation
-'                      ' Text
+'                      ' Text.Whitespace
 '# Ruby is definitely not as broken as Perl :)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# (may be interrupted by sending the process a SIGALRM)' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_3.11' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#!/usr/bin/ruby -w' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# hopdelta - feed mail header, produce lines' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#            showing delay at each hop.' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'require'     Name.Builtin
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'time'        Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'MailHopDelta' Name.Class
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'initialize'  Name.Function
 '('           Punctuation
 'mail'        Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@head'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'mail'        Name
 '.'           Operator
 'gsub'        Name
@@ -5794,17 +5794,17 @@
 ' '           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@topline'    Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%w-Sender Recipient Time Delta-' Literal.String.Other
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@start_from' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'mail'        Name
 '.'           Operator
 'match'       Name
@@ -5820,11 +5820,11 @@
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@date'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'parse'       Name
@@ -5843,33 +5843,33 @@
 '1'           Literal.Number.Integer
 ']'           Operator
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'out'         Name.Function
 '('           Punctuation
 'line'        Name
 ')'           Punctuation
-'\n         ' Text
+'\n         ' Text.Whitespace
 '"'           Literal.String.Double
 '%-20.20s %-20.20s %-20.20s  %s' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 'line'        Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'hop_date'    Name.Function
 '('           Punctuation
 'day'         Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'day'         Name
 '.'           Operator
 'strftime'    Name
@@ -5878,22 +5878,22 @@
 '%I:%M:%S %Y/%m/%d' Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'puts_hops'   Name.Function
-'\n        '  Text
+'\n        '  Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'out'         Name
 '('           Punctuation
 '@topline'    Name.Variable.Instance
 ')'           Punctuation
-' \n        ' Text
+' \n        ' Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'out'         Name
 '('           Punctuation
 '['           Operator
@@ -5901,10 +5901,10 @@
 'Start'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@start_from' Name.Variable.Instance
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'hop_date'    Name
 '('           Punctuation
 '@date'       Name.Variable.Instance
@@ -5914,7 +5914,7 @@
 "'"           Literal.String.Single
 ']'           Operator
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 '@head'       Name.Variable.Instance
 '.'           Operator
 'split'       Name
@@ -5935,13 +5935,13 @@
 ')'           Punctuation
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'hop'         Name
 '|'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'hop'         Name
 '.'           Operator
 'gsub!'       Name
@@ -5956,11 +5956,11 @@
 '\\1'         Literal.String.Escape
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'whence'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'hop'         Name
 '.'           Operator
 'match'       Name
@@ -5974,34 +5974,34 @@
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'whence'      Name
-'\n                ' Text
+'\n                ' Text.Whitespace
 'warn'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Bad received line: ' Literal.String.Double
 '#{'          Literal.String.Interpol
 'hop'         Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n                ' Text
+'\n                ' Text.Whitespace
 'next'        Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n            ' Text
+'\n            ' Text.Whitespace
 'from'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$+'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'hop'         Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -6015,17 +6015,17 @@
 '\\'          Literal.String.Regex
 ')'           Literal.String.Regex
 '/'           Literal.String.Regex
-'\n            ' Text
+'\n            ' Text.Whitespace
 'by'          Name
-'   '         Text
+'   '         Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '$1'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'hop'         Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -6039,15 +6039,15 @@
 '\\'          Literal.String.Regex
 'S+)'         Literal.String.Regex
 '/'           Literal.String.Regex
-'\n            ' Text
+'\n            ' Text.Whitespace
 'next'        Keyword
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'now'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Time'        Name.Constant
 '.'           Operator
 'parse'       Name
@@ -6056,84 +6056,84 @@
 ')'           Punctuation
 '.'           Operator
 'localtime'   Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'delta'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'now'         Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '@date'       Name.Variable.Instance
-'\n            ' Text
+'\n            ' Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'out'         Name
 '('           Punctuation
 '['           Operator
 'from'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'by'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'hop_date'    Name
 '('           Punctuation
 'now'         Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'hop_time'    Name
 '('           Punctuation
 'delta'       Name
 ')'           Punctuation
 ']'           Operator
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 '@date'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'now'         Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n\n    '    Text
+'\n\n    '    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'hop_time'    Name.Function
 '('           Punctuation
 'secs'        Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'sign'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'secs'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '?'           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n        '  Text
+'\n        '  Text.Whitespace
 'days'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'secs'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'secs'        Name
 '.'           Operator
 'abs'         Name
@@ -6141,22 +6141,22 @@
 'divmod'      Name
 '('           Punctuation
 '60'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '60'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '24'          Literal.Number.Integer
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'hours'       Name
 ','           Punctuation
 'secs'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'secs'        Name
 '.'           Operator
 'abs'         Name
@@ -6164,19 +6164,19 @@
 'divmod'      Name
 '('           Punctuation
 '60'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '60'          Literal.Number.Integer
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'mins'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'secs'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'secs'        Name
 '.'           Operator
 'abs'         Name
@@ -6185,123 +6185,123 @@
 '('           Punctuation
 '60'          Literal.Number.Integer
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'rtn'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 '"'           Literal.String.Double
 '%3ds'        Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'secs'        Name
-'  '          Text
+'  '          Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'sign'        Name
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'rtn'         Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '%3dm'        Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'mins'        Name
-'  '          Text
+'  '          Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'sign'        Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'mins'        Name
-'  '          Text
+'  '          Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n        '  Text
+'\n        '  Text.Whitespace
 'rtn'         Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '%3dh'        Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'hours'       Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'sign'        Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'hours'       Name
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-'\n        '  Text
+'\n        '  Text.Whitespace
 'rtn'         Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '%3dd'        Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'days'        Name
-'  '          Text
+'  '          Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 'sign'        Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'days'        Name
-'  '          Text
+'  '          Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' \n        ' Text
+' \n        ' Text.Whitespace
 'rtn'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '$/'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'mail'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'MailHopDelta' Name.Constant
 '.'           Operator
 'new'         Name
@@ -6312,147 +6312,147 @@
 ')'           Punctuation
 '.'           Operator
 'puts_hops'   Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.0' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'single_level' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'this'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'that'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'the'         Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'other'       Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# Ruby directly supports nested arrays' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'double_level' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'this'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'that'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'the'         Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'other'       Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'still_single_level' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'this'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'that'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'the'         Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'other'       Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 '.'           Operator
 'flatten'     Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.1' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'quick'       Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'brown'       Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'fox'         Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%w('         Literal.String.Other
 'Why are you teasing me?' Literal.String.Other
 ')'           Literal.String.Other
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'lines'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
 '"'           Literal.String.Heredoc
 'END_OF_HERE_DOC' Literal.String.Delimiter
@@ -6466,12 +6466,12 @@
 's*(.+)'      Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '\\1'         Literal.String.Escape
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    The boy stood on the burning deck,\n' Literal.String.Heredoc
 
@@ -6479,12 +6479,12 @@
 
 'END_OF_HERE_DOC\n' Literal.String.Delimiter
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'bigarray'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'IO'          Name.Constant
 '.'           Operator
 'readlines'   Name
@@ -6495,33 +6495,33 @@
 ')'           Punctuation
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'l'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'l'           Name
 '.'           Operator
 'chomp'       Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'name'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Gandalf'     Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'banner'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%Q('         Literal.String.Other
 'Speak, '     Literal.String.Other
 '#{'          Literal.String.Interpol
@@ -6529,19 +6529,19 @@
 '}'           Literal.String.Interpol
 ', and welcome!' Literal.String.Other
 ')'           Literal.String.Other
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'host_info'   Name
-'  '          Text
+'  '          Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 'host '       Literal.String.Backtick
 '#{'          Literal.String.Interpol
 'his_host'    Name
 '}'           Literal.String.Interpol
 '`'           Literal.String.Backtick
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '%x('         Literal.String.Other
 'ps '         Literal.String.Other
@@ -6549,12 +6549,12 @@
 '$$'          Name.Variable.Global
 '}'           Literal.String.Interpol
 ')'           Literal.String.Other
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'banner'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Costs only $4.95' Literal.String.Single
 "'"           Literal.String.Single
@@ -6565,68 +6565,68 @@
 ' '           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'rax'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%w! ( ) < > { } [ ] !' Literal.String.Other
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.2' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'commify_series' Name.Function
 '('           Punctuation
 'arr'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '.'           Operator
 'size'        Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'when'        Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'when'        Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'when'        Keyword
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '.'           Operator
 'join'        Name
@@ -6635,9 +6635,9 @@
 ' and '       Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '['           Operator
 '0'           Literal.Number.Integer
@@ -6652,74 +6652,74 @@
 ', '          Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 ', and '      Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '['           Operator
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'array'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'red'         Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'yellow'      Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'green'       Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'I have '     Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'array'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' marbles'    Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# -> I have redyellowgreen marbles' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# But unlike Perl:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'I have '     Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -6728,16 +6728,16 @@
 ' marbles'    Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# -> I have redyellowgreen marbles' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# So, needs:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'I have '     Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -6753,103 +6753,103 @@
 ' marbles'    Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# -> I have red yellow green marbles' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '#!/usr/bin/ruby' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# communify_series - show proper comma insertion in list output' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'commify_series' Name.Function
 '('           Punctuation
 'arr'         Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sepchar'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '.'           Operator
 'find'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'p'           Name.Builtin
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
 ','           Literal.String.Regex
 '/'           Literal.String.Regex
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '?'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '; '          Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 ', '          Literal.String.Single
 "'"           Literal.String.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '.'           Operator
 'size'        Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'when'        Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 "'"           Literal.String.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'when'        Keyword
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'when'        Keyword
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '.'           Operator
 'join'        Name
@@ -6858,9 +6858,9 @@
 ' and '       Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '['           Operator
 '0'           Literal.Number.Integer
@@ -6873,148 +6873,148 @@
 '('           Punctuation
 'sepchar'     Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'sepchar'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'and '        Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'arr'         Name
 '['           Operator
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'lists'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'just one thing' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '%w('         Literal.String.Other
 'Mutt Jeff'   Literal.String.Other
 ')'           Literal.String.Other
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '%w('         Literal.String.Other
 'Peter Paul Mary' Literal.String.Other
 ')'           Literal.String.Other
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'To our parents' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Mother Theresa' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'God'         Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'pastrami'    Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'ham and cheese' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'peanut butter and jelly' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'tuna'        Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'recycle tired, old phrases' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'ponder big, happy thoughts' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 ','           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'recycle tired, old phrases' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 "'"           Literal.String.Single
 'ponder big, happy thoughts' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-'\n      '    Text
+'\n      '    Text.Whitespace
 "'"           Literal.String.Single
 'sleep and dream peacefully' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ']'           Operator
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'list'        Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'lists'       Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The list is: ' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -7025,19 +7025,19 @@
 '}'           Literal.String.Interpol
 '.'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.3' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 "#   (note: AFAIK Ruby doesn't allow gory change of Array length)" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# grow the array by assigning nil to past the end of array' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ary'         Name
 '['           Operator
@@ -7045,14 +7045,14 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# shrink the array by slicing it down' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ary'         Name
 '.'           Operator
@@ -7063,10 +7063,10 @@
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# init the array with given size' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Array'       Name.Builtin
 '.'           Operator
@@ -7074,49 +7074,49 @@
 '('           Punctuation
 'number_of_elems' Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# assign to an element past the original end enlarges the array' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ary'         Name
 '['           Operator
 'index_new_last_elem' Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'value'       Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'what_about_that_array' Name.Function
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'The array now has ' Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'size'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' elements.'  Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# Index of last element is not really interesting in Ruby' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Element '    Literal.String.Double
 '#'           Literal.String.Double
@@ -7130,85 +7130,85 @@
 "'."          Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'people'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%w('         Literal.String.Other
 'Crosby Stills Nash Young' Literal.String.Other
 ')'           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 'what_about_that_array' Name
 '('           Punctuation
 'people'      Name
 ')'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.4' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# OO style'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'bad_users'   Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'user'        Name
 '|'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'complain'    Name
 '('           Punctuation
 'user'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# or, functional style' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'user'        Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'bad_users'   Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'complain'    Name
 '('           Punctuation
 'user'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'var'         Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'ENV'         Name.Constant
 '.'           Operator
 'keys'        Name
 '.'           Operator
 'sort'        Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'var'         Name
@@ -7221,55 +7221,55 @@
 ']'           Operator
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'user'        Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'all_users'   Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'disk_space'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'get_usage'   Name
 '('           Punctuation
 'user'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'disk_space'  Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'MAX_QUOTA'   Name.Constant
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'complain'    Name
 '('           Punctuation
 'user'        Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'l'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'IO'          Name.Constant
 '.'           Operator
 'popen'       Name
@@ -7280,79 +7280,79 @@
 ')'           Punctuation
 '.'           Operator
 'readlines'   Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'l'           Name
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'l'           Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
 '^gc'         Literal.String.Regex
 '/'           Literal.String.Regex
-' \n'         Text
+' \n'         Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# we can mimic the obfuscated Perl way' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'fh'          Name
 '.'           Operator
 'gets'        Name
-'               ' Text
+'               ' Text.Whitespace
 '# $_ is set to the line just read' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'chomp'       Name.Builtin
-'                   ' Text
+'                   ' Text.Whitespace
 '# $_ has a trailing \\n removed, if it had one' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'split'       Name.Builtin
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'w'           Name
 '|'           Operator
-'        '    Text
+'        '    Text.Whitespace
 '# $_ is split on whitespace' Comment.Single
-'\n                            ' Text
+'\n                            ' Text.Whitespace
 '# but $_ is not set to each chunk as in Perl' Comment.Single
-'\n        '  Text
+'\n        '  Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'w'           Name
 '.'           Operator
 'reverse'     Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# ...or use a cleaner way' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'l'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'fh'          Name
 '.'           Operator
 'readlines'   Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'l'           Name
 '.'           Operator
 'chomp'       Name
@@ -7360,115 +7360,115 @@
 'split'       Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'w'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'w'           Name
 '.'           Operator
 'reverse'     Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# same drawback as in problem 1.4, we can't mutate a Numeric..." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'array'       Name
 '.'           Operator
 'collect!'    Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'v'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'v'           Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Operator
 '5'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ary'         Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ary'         Name
 '.'           Operator
 'collect!'    Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'v'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'v'           Name
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '7'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'a'           Name
@@ -7492,110 +7492,110 @@
 ')'           Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# we can mutate Strings, cool; we need a trick for the scalar' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'ary'         Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 'scalar'      Name
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'array'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'hash'        Name.Builtin
 '.'           Operator
 'values'      Name
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ary'         Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'v'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'v'           Name
 '.'           Operator
 'strip!'      Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'     '       Text
+'     '       Text.Whitespace
 '# String#strip rules :)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.5' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# not relevant in Ruby since we have always references' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'item'        Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'array'       Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# do somethingh with item' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.6' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'unique'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'list'        Name
 '.'           Operator
 'uniq'        Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# generate a list of users logged in, removing duplicates' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'users'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 'who'         Literal.String.Backtick
 '`'           Literal.String.Backtick
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'l'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'l'           Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -7604,15 +7604,15 @@
 'w+)'         Literal.String.Regex
 '/'           Literal.String.Regex
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '$1'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
 'sort'        Name
 '.'           Operator
 'uniq'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
 '('           Punctuation
@@ -7626,61 +7626,61 @@
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
 ')'           Punctuation
-'  '          Text
+'  '          Text.Whitespace
 '# see 4.2 for commify_series' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.7' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# [ 1, 1, 2, 2, 3, 3, 3, 4, 5 ] - [ 1, 2, 4 ]  ->  [3, 5]' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.8' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'union'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'intersection' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'difference'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.9' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'array1'      Name
 '.'           Operator
@@ -7688,100 +7688,100 @@
 '('           Punctuation
 'array2'      Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# if you will assign to another object, better use:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'new_ary'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'array1'      Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'array2'      Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'members'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Time'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Flies'       Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'initiates'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-'  '          Text
+'  '          Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'An'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Arrow'       Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'members'     Name
-' '           Text
+' '           Text.Whitespace
 '+='          Operator
-' '           Text
+' '           Text.Whitespace
 'initiates'   Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'members'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Time'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Flies'       Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'initiates'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'An'          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Arrow'       Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'members'     Name
 '['           Operator
@@ -7789,34 +7789,34 @@
 ','           Punctuation
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Like'        Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'initiates'   Name
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 '.'           Operator
 'flatten'     Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'members'     Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Fruit'       Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'members'     Name
 '['           Operator
@@ -7824,454 +7824,454 @@
 ','           Punctuation
 '2'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'A'           Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Banana'      Literal.String.Double
 '"'           Literal.String.Double
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.10' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'reversed'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ary'         Name
 '.'           Operator
 'reverse'     Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ary'         Name
 '.'           Operator
 'reverse_each' Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 '# do something with e' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'descending'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ary'         Name
 '.'           Operator
 'sort'        Name
 '.'           Operator
 'reverse'     Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'descending'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ary'         Name
 '.'           Operator
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.11' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# remove n elements from front of ary (shift n)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'front'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ary'         Name
 '.'           Operator
 'slice!'      Name
 '('           Punctuation
 '0'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# remove n elements from the end of ary (pop n)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end_'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ary'         Name
 '.'           Operator
 'slice!'      Name
 '('           Punctuation
 '-'           Operator
 'n'           Name
-' '           Text
+' '           Text.Whitespace
 '..'          Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# let's extend the Array class, to make that useful" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Array'       Name.Class
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'shift2'      Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'slice!'      Name
 '('           Punctuation
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '..'          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'     '       Text
+'     '       Text.Whitespace
 '# more symetric with pop2...' Comment.Single
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n    '      Text
+'\n    '      Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'pop2'        Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'slice!'      Name
 '('           Punctuation
 '-'           Operator
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '..'          Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'friends'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%w('         Literal.String.Other
 'Peter Paul Mary Jim Tim' Literal.String.Other
 ')'           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 'this'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'that'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'friends'     Name
 '.'           Operator
 'shift2'      Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'beverages'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%w('         Literal.String.Other
 'Dew Jolt Cola Sprite Fresca' Literal.String.Other
 ')'           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pair'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'beverages'   Name
 '.'           Operator
 'pop2'        Name
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.12' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# use Enumerable#detect (or the synonym Enumerable#find)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'highest_eng' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'employees'   Name
 '.'           Operator
 'detect'      Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'emp'         Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'emp'         Name
 '.'           Operator
 'category'    Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'engineer'    Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.13' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# use Enumerable#select (or the synonym Enumerable#find_all)' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'bigs'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nums'        Name
 '.'           Operator
 'select'      Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'i'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '1_000_000'   Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pigs'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'users'       Name
 '.'           Operator
 'keys'        Name
 '.'           Operator
 'select'      Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'k'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'users'       Name
 '['           Operator
 'k'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 'e7'          Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'matching'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 'who'         Literal.String.Backtick
 '`'           Literal.String.Backtick
 '.'           Operator
 'select'      Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'u'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'u'           Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
 '^gnat '      Literal.String.Regex
 '/'           Literal.String.Regex
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'engineers'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'employees'   Name
 '.'           Operator
 'select'      Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '.'           Operator
 'position'    Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Engineer'    Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'secondary_assistance' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'applicants'  Name
 '.'           Operator
 'select'      Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 '|'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'a'           Name
 '.'           Operator
 'income'      Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '26_000'      Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'income'      Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '30_000'      Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.14' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# normally you would have an array of Numeric (Float or' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Fixnum or Bignum), so you would use:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sorted'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'unsorted'    Name
 '.'           Operator
 'sort'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# if you have strings representing Integers or Floats' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# you may specify another sort method:' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sorted'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'unsorted'    Name
 '.'           Operator
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'to_f'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '.'           Operator
 'to_f'        Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# let's use the list of my own PID's" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`'           Literal.String.Backtick
 'ps ux'       Literal.String.Backtick
@@ -8290,17 +8290,17 @@
 '1'           Literal.Number.Integer
 ']'           Operator
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'select'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'i'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -8314,98 +8314,98 @@
 ']'           Operator
 '}'           Literal.String.Interpol
 '/'           Literal.String.Regex
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'i'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
 '.'           Operator
 'split'       Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'to_i'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '.'           Operator
 'to_i'        Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'i'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Select a process ID to kill:' Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pid'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'gets'        Name.Builtin
 '.'           Operator
 'chomp'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Exiting ... ' Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'pid'         Name
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'pid'         Name
-' '           Text
+' '           Text.Whitespace
 '=~'          Operator
 ' '           Text
 '/'           Literal.String.Regex
@@ -8413,7 +8413,7 @@
 '\\'          Literal.String.Regex
 'd+$'         Literal.String.Regex
 '/'           Literal.String.Regex
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Process'     Name.Constant
 '.'           Operator
@@ -8423,17 +8423,17 @@
 'TERM'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pid'         Name
 '.'           Operator
 'to_i'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sleep'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Process'     Name.Constant
 '.'           Operator
@@ -8443,346 +8443,346 @@
 'KILL'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'pid'         Name
 '.'           Operator
 'to_i'        Name
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'descending'  Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'unsorted'    Name
 '.'           Operator
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '.'           Operator
 'to_f'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'to_f'        Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.15' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ordered'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'unordered'   Name
 '.'           Operator
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'compare'     Name
 '('           Punctuation
 'a'           Name
 ','           Punctuation
 'b'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'precomputed' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'unordered'   Name
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'compute'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ordered_precomputed' Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'precomputed' Name
 '.'           Operator
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ordered'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'ordered_precomputed' Name
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ordered'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'unordered'   Name
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'compute'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'employee'    Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'employees'   Name
 '.'           Operator
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '.'           Operator
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'employee'    Name
 '.'           Operator
 'name'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 ' earns '     Literal.String.Double
 '\\'          Literal.String.Double
 '$ '          Literal.String.Double
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'employee'    Name
 '.'           Operator
 'salary'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '\\n'         Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# Beware! `0' is true in Ruby." Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# For chaining comparisons, you may use Numeric#nonzero?, which' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# returns num if num is not zero, nil otherwise' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sorted'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'employees'   Name
 '.'           Operator
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Name
 '.'           Operator
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '.'           Operator
 'name'        Name
 ')'           Punctuation
 '.'           Operator
 'nonzero?'    Name
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '.'           Operator
 'age'         Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'age'         Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'users'       Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 "# getpwent is not wrapped in Ruby... let's fallback" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'IO'          Name.Constant
 '.'           Operator
@@ -8794,17 +8794,17 @@
 ')'           Punctuation
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'u'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'users'       Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'u'           Name
 '.'           Operator
 'split'       Name
@@ -8813,214 +8813,214 @@
 ':'           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'users'       Name
 '.'           Operator
 'sort!'       Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'user'        Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'users'       Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'user'        Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'sorted'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'names'       Name
 '.'           Operator
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '['           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sorted'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'strings'     Name
 '.'           Operator
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '.'           Operator
 'length'      Name
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '.'           Operator
 'length'      Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 "# let's show only the compact version" Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ordered'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'strings'     Name
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'e'           Name
 '.'           Operator
 'length'      Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'ordered'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'strings'     Name
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '/'           Literal.String.Regex
 '\\'          Literal.String.Regex
@@ -9037,74 +9037,74 @@
 '.'           Operator
 'to_i'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'print'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 'cat /etc/passwd' Literal.String.Backtick
 '`'           Literal.String.Backtick
 '.'           Operator
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'e'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '.'           Operator
 'split'       Name
@@ -9125,30 +9125,30 @@
 ']'           Operator
 '.'           Operator
 'flatten'     Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sort'        Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'a'           Name
 ','           Punctuation
 'b'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '['           Operator
 '1'           Literal.Number.Integer
@@ -9156,19 +9156,19 @@
 ')'           Punctuation
 '.'           Operator
 'nonzero?'    Name
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Name
 '['           Operator
 '2'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '['           Operator
 '2'           Literal.Number.Integer
@@ -9176,44 +9176,44 @@
 ')'           Punctuation
 '.'           Operator
 'nonzero?'    Name
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 '3'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '['           Operator
 '3'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 '.'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'collect'     Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'e'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'e'           Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.16' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'circular'    Name
 '.'           Operator
@@ -9223,9 +9223,9 @@
 '.'           Operator
 'pop'         Name
 ')'           Punctuation
-'        '    Text
+'        '    Text.Whitespace
 '# the last shall be first' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'circular'    Name
 '.'           Operator
@@ -9235,99 +9235,99 @@
 '.'           Operator
 'shift'       Name
 ')'           Punctuation
-'         '   Text
+'         '   Text.Whitespace
 '# and vice versa' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'grab_and_rotate' Name.Function
 '('           Punctuation
 'l'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'l'           Name
 '.'           Operator
 'push'        Name
 '('           Punctuation
 'ret'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'l'           Name
 '.'           Operator
 'shift'       Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ret'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'processes'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number.Integer
 ']'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'process'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'grab_and_rotate' Name
 '('           Punctuation
 'processes'   Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Handling process ' Literal.String.Double
 '#{'          Literal.String.Interpol
 'process'     Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'sleep'       Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# @@PLEAC@@_4.17' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'fisher_yates_shuffle' Name.Function
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '('           Punctuation
 'a'           Name
 '.'           Operator
@@ -9340,118 +9340,118 @@
 '('           Punctuation
 '1'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'i'           Name
 '|'           Operator
-'\n        '  Text
+'\n        '  Text.Whitespace
 'j'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'rand'        Name.Builtin
 '('           Punctuation
 'i'           Name
 '+'           Operator
 '1'           Literal.Number.Integer
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'a'           Name
 '['           Operator
 'i'           Name
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 'j'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 'j'           Name
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 'i'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 'j'           Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'naive_shuffle' Name.Function
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '...'         Operator
 'a'           Name
 '.'           Operator
 'size'        Name
-'\n        '  Text
+'\n        '  Text.Whitespace
 'j'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'rand'        Name.Builtin
 '('           Punctuation
 'a'           Name
 '.'           Operator
 'size'        Name
 ')'           Punctuation
-'\n        '  Text
+'\n        '  Text.Whitespace
 'a'           Name
 '['           Operator
 'i'           Name
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 'j'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 'j'           Name
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '['           Operator
 'i'           Name
 ']'           Operator
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rb/ruby_func_def.rb.output b/tests/examplefiles/rb/ruby_func_def.rb.output
index a942e63532..46b09b98bd 100644
--- a/tests/examplefiles/rb/ruby_func_def.rb.output
+++ b/tests/examplefiles/rb/ruby_func_def.rb.output
@@ -1,5 +1,5 @@
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'get_foo'     Name
 '('           Operator
@@ -10,9 +10,9 @@
 ')'           Punctuation
 '::'          Operator
 'Foo'         Name.Class
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'foo'         Name
 '('           Operator
@@ -20,9 +20,9 @@
 'bar'         Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'bar'         Name
 '('           Operator
 '"'           Literal.String.Double
@@ -32,22 +32,22 @@
 ')'           Punctuation
 '.'           Operator
 'something'   Name.Function
-' '           Text
+' '           Text.Whitespace
 'argh'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'aaahaa'      Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 '42'          Literal.Number.Integer
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'get_the_fuck' Name
 '('           Punctuation
 '"'           Literal.String.Double
@@ -58,15 +58,15 @@
 'Of'          Name.Constant
 '::'          Operator
 'My'          Name.Constant
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'parser_definition' Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 'ruby!'       Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rb/test.rb.output b/tests/examplefiles/rb/test.rb.output
index 25970d02c8..29dba22ca3 100644
--- a/tests/examplefiles/rb/test.rb.output
+++ b/tests/examplefiles/rb/test.rb.output
@@ -24,17 +24,17 @@
 ':'           Punctuation
 '1'           Literal.Number.Integer
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 '<'           Operator
 '10000'       Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#a bis f dienen dazu die Nachbarschaft festzulegen. Man stelle sich die #Zahl von 1 bis 64 im Binärcode vor 1 bedeutet an 0 aus' Comment.Single
-'\n  '        Text
+'\n  '        Text.Whitespace
 'b'           Name
 '='           Operator
 '('           Punctuation
@@ -49,15 +49,15 @@
 '16'          Literal.Number.Integer
 '<'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '?'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n\n  '      Text
+'\n\n  '      Text.Whitespace
 '('           Punctuation
 'x'           Name
 '-'           Operator
@@ -66,7 +66,7 @@
 '='           Operator
 '0'           Literal.Number.Integer
 '?'           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '['           Operator
 'x'           Name
@@ -75,9 +75,9 @@
 ']'           Operator
 '.'           Operator
 'to_i'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 '*'           Operator
@@ -99,9 +99,9 @@
 ']'           Operator
 '.'           Operator
 'to_i'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 '*'           Operator
@@ -124,7 +124,7 @@
 '='           Operator
 '0'           Literal.Number.Integer
 '?'           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '['           Operator
 'x'           Name
@@ -133,9 +133,9 @@
 ']'           Operator
 '.'           Operator
 'to_i'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 '*'           Operator
@@ -149,7 +149,7 @@
 '='           Operator
 '0'           Literal.Number.Integer
 '?'           Operator
-' '           Text
+' '           Text.Whitespace
 'n'           Name
 '['           Operator
 'x'           Name
@@ -158,15 +158,15 @@
 ']'           Operator
 '.'           Operator
 'to_i'        Name
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 ')'           Punctuation
 '*'           Operator
 'a'           Name
 '+'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'n'           Name
 '['           Operator
 'x'           Name
@@ -199,40 +199,40 @@
 'to_i'        Name
 '*'           Operator
 'b'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '#und die Ausgabe folgt' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'g'           Name
 '='           Operator
 '%w{'         Literal.String.Other
 '}'           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 'x'           Name
 '='           Operator
 '0'           Literal.Number.Integer
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '#leere regex' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'test'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '/'           Literal.String.Regex
 '/'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '123'         Literal.Number.Integer
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'while'       Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 '<'           Operator
 '100'         Literal.Number.Integer
-'\n '         Text
+'\n '         Text.Whitespace
 'puts'        Name.Builtin
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -242,113 +242,113 @@
 ']'           Operator
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n '         Text
+'\n '         Text.Whitespace
 'x'           Name
 '+='          Operator
 '1'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'puts'        Name.Builtin
 '"'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sleep'       Name.Builtin
 '('           Punctuation
 '10'          Literal.Number.Integer
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '1'           Literal.Number.Integer
 'E1E1'        Name.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '30'          Literal.Number.Integer
 '.'           Operator
 'send'        Name
 '('           Punctuation
 ':/'          Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# prints 6'  Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# fun with class attributes' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Foo'         Name.Class
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Class
 '.'           Operator
 'blub'        Name.Function
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'not'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 '.'           Operator
 'nil?'        Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'new'         Name
-'\n    '      Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'another_way_to_get_class' Name.Function
-'\n    '      Text
+'\n    '      Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'class'       Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# ruby 1.9 "call operator"' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'Proc'        Name.Constant
 '.'           Operator
 'new'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '42'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
 '.'           Operator
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '"'           Literal.String.Double
 'instance variables can be ' Literal.String.Double
@@ -360,7 +360,7 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`'           Literal.String.Backtick
 'instance variables can be ' Literal.String.Backtick
@@ -372,7 +372,7 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Backtick
 '`'           Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
 "'"           Literal.String.Single
 'instance variables can be ' Literal.String.Single
@@ -384,7 +384,7 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '/'           Literal.String.Regex
 'instance variables can be ' Literal.String.Regex
@@ -396,7 +396,7 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Regex
 '/mousenix'   Literal.String.Regex
-'\n'          Text
+'\n'          Text.Whitespace
 
 ':"'          Literal.String.Symbol
 'instance variables can be ' Literal.String.Symbol
@@ -408,10 +408,10 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Symbol
 '"'           Literal.String.Symbol
-'\n'          Text
+'\n'          Text.Whitespace
 
 ":'instance variables can be #@included, #@@class_variables\\n and #$globals as well.'" Literal.String.Symbol
-'\n'          Text
+'\n'          Text.Whitespace
 
 "%'"          Literal.String.Other
 'instance variables can be ' Literal.String.Other
@@ -423,10 +423,10 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Other
 "'"           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 "%q'instance variables can be #@included, #@@class_variables\\n and #$globals as well.'" Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 "%Q'"         Literal.String.Other
 'instance variables can be ' Literal.String.Other
@@ -438,10 +438,10 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Other
 "'"           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 "%w'instance variables can be #@included, #@@class_variables\\n and #$globals as well.'" Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 "%W'"         Literal.String.Other
 'instance variables can be ' Literal.String.Other
@@ -453,10 +453,10 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Other
 "'"           Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 "%s'instance variables can be #@included, #@@class_variables\\n and #$globals as well.'" Literal.String.Other
-'\n'          Text
+'\n'          Text.Whitespace
 
 "%r'"         Literal.String.Regex
 'instance variables can be ' Literal.String.Regex
@@ -468,7 +468,7 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Regex
 "'"           Literal.String.Regex
-'\n'          Text
+'\n'          Text.Whitespace
 
 "%x'"         Literal.String.Other
 'instance variables can be ' Literal.String.Other
@@ -480,30 +480,30 @@
 '#$globals'   Literal.String.Interpol
 ' as well.'   Literal.String.Other
 "'"           Literal.String.Other
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '#%W[ but #@0illegal_values look strange.]' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '%s#ruby allows strange#' Literal.String.Other
 '{'           Punctuation
 'constructs'  Name
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%s#ruby allows strange#' Literal.String.Other
 '$constructs' Name.Variable.Global
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%s#ruby allows strange#' Literal.String.Other
 '@@constructs' Name.Variable.Class
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '##################################################################' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# HEREDOCS'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
 '('           Punctuation
@@ -512,13 +512,13 @@
 'A'           Literal.String.Delimiter
 ''            Literal.String.Heredoc
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<<-'         Operator
 ''            Literal.String.Heredoc
 'B'           Literal.String.Delimiter
 ''            Literal.String.Heredoc
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'this is the text of a\n' Literal.String.Heredoc
 
@@ -528,17 +528,17 @@
 
 'B\n'         Literal.String.Delimiter
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
 '"'           Literal.String.Heredoc
 'EOF'         Literal.String.Delimiter
 '"'           Literal.String.Heredoc
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This is a multiline #$here document\n' Literal.String.Heredoc
 
@@ -546,17 +546,17 @@
 
 'EOF\n'       Literal.String.Delimiter
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
 "'"           Literal.String.Heredoc
 'EOF'         Literal.String.Delimiter
 "'"           Literal.String.Heredoc
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This is a multiline #$here document\n' Literal.String.Heredoc
 
@@ -564,7 +564,7 @@
 
 'EOF\n'       Literal.String.Delimiter
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'b'           Name
 '='           Operator
@@ -573,7 +573,7 @@
 '['           Operator
 'x'           Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
 '32'          Literal.Number.Integer
 ')'           Punctuation
@@ -581,21 +581,21 @@
 '16'          Literal.Number.Integer
 '<'           Operator
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '?'           Operator
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '<<'          Operator
 '"'           Literal.String.Heredoc
 ''            Literal.String.Delimiter
 '"'           Literal.String.Heredoc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#{test}\n'   Literal.String.Heredoc
 
@@ -607,36 +607,36 @@
 
 '\n'          Literal.String.Delimiter
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'super'       Keyword
-' '           Text
+' '           Text.Whitespace
 '<<-'         Operator
 ''            Literal.String.Heredoc
 'EOE'         Literal.String.Delimiter
 ''            Literal.String.Heredoc
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    foo\n'   Literal.String.Heredoc
 
 'EOE\n'       Literal.String.Delimiter
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<<'          Operator
 ''            Literal.String.Heredoc
 'X'           Literal.String.Delimiter
 ''            Literal.String.Heredoc
-'\n'          Text
+'\n'          Text.Whitespace
 
 'X\n'         Literal.String.Delimiter
 
 'X'           Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '%s('         Literal.String.Other
 'uninter'     Literal.String.Other
@@ -645,9 +645,9 @@
 '\\'          Literal.String.Other
 'ted'         Literal.String.Other
 ')'           Literal.String.Other
-'            ' Text
+'            ' Text.Whitespace
 '# comment here' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%q('         Literal.String.Other
 'uninter'     Literal.String.Other
@@ -656,9 +656,9 @@
 '\\'          Literal.String.Other
 'ted'         Literal.String.Other
 ')'           Literal.String.Other
-'            ' Text
+'            ' Text.Whitespace
 '# comment here' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%Q('         Literal.String.Other
 'inter'       Literal.String.Other
@@ -667,9 +667,9 @@
 '\\t'         Literal.String.Escape
 'ed'          Literal.String.Other
 ')'           Literal.String.Other
-'              ' Text
+'              ' Text.Whitespace
 '# comment here' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 ':"'          Literal.String.Symbol
 'inter'       Literal.String.Symbol
@@ -678,14 +678,14 @@
 '\\t'         Literal.String.Escape
 'ed'          Literal.String.Symbol
 '"'           Literal.String.Symbol
-'               ' Text
+'               ' Text.Whitespace
 '# comment here' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 ":'uninter\\'pre\\ted'" Literal.String.Symbol
-'             ' Text
+'             ' Text.Whitespace
 '# comment here' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '%q['         Literal.String.Other
 'haha! '      Literal.String.Other
@@ -698,22 +698,22 @@
 ']'           Literal.String.Other
 ' '           Literal.String.Other
 ']'           Literal.String.Other
-' '           Text
+' '           Text.Whitespace
 '# commeht here' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '##################################################################' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
-'                                                  ' Text
+'                                                  ' Text.Whitespace
 'NP'          Name.Class
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-'  '          Text
+'  '          Text.Whitespace
 'initialize'  Name.Function
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 '='           Operator
 '@p'          Name.Variable.Instance
@@ -721,7 +721,7 @@
 '['           Operator
 ']'           Operator
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '='           Operator
 '@b'          Name.Variable.Instance
@@ -729,12 +729,12 @@
 '['           Operator
 ']'           Operator
 ';'           Punctuation
-'                      ' Text
+'                      ' Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '+@'          Name.Function
 ';'           Punctuation
 '@b'          Name.Variable.Instance
@@ -742,7 +742,7 @@
 '1'           Literal.Number.Integer
 ';'           Punctuation
 'b2c'         Name
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 ';'           Punctuation
 'def'         Keyword
@@ -753,16 +753,16 @@
 '0'           Literal.Number.Integer
 ';'           Punctuation
 'b2c'         Name
-'                   ' Text
+'                   ' Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
-'  '          Text
+'  '          Text.Whitespace
 'b2c'         Name.Function
 ';'           Punctuation
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@b'          Name.Variable.Instance
 '.'           Operator
 'size'        Name
@@ -792,7 +792,7 @@
 ';'           Punctuation
 'send'        Name.Builtin
 '('           Punctuation
-'\n     '     Text
+'\n     '     Text.Whitespace
 "'"           Literal.String.Single
 'lave'        Literal.String.Single
 "'"           Literal.String.Single
@@ -806,14 +806,14 @@
 ')'           Punctuation
 ')'           Punctuation
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'c'           Name
 '=='          Operator
 '0'           Literal.Number.Integer
 ';'           Punctuation
 '@p'          Name.Variable.Instance
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'c'           Name
 '.'           Operator
 'chr'         Name
@@ -822,52 +822,52 @@
 '='           Operator
 '['           Operator
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-'\n     '     Text
+'\n     '     Text.Whitespace
 'self'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-' '           Text
+' '           Text.Whitespace
 '_'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'NP'          Name.Constant
 '.'           Operator
 'new'         Name
-'                   ' Text
+'                   ' Text.Whitespace
 'end'         Keyword
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# Regexes'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '/'           Literal.String.Regex
 '\nthis is a\nmutliline\nregex\n' Literal.String.Regex
 
 '/'           Literal.String.Regex
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'this'        Name
-' '           Text
+' '           Text.Whitespace
 '/'           Literal.String.Regex
 'is a\nmultiline regex too' Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'also'        Name
-' '           Text
+' '           Text.Whitespace
 '/'           Literal.String.Regex
 '4\nis one'   Literal.String.Regex
 '/'           Literal.String.Regex
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'this'        Name
 '('           Punctuation
@@ -876,44 +876,44 @@
 
 '/'           Literal.String.Regex
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# this not'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
 '4'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'asfsadf'     Name
 '/'           Operator
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '#from: http://coderay.rubychan.de/rays/show/383' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Object'      Name.Class
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-'  '          Text
+'  '          Text.Whitespace
 ':xeq'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 ':`'          Literal.String.Symbol
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '`'           Name.Function
 '('           Punctuation
 'cmd'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'p2'          Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'self'        Name.Builtin
 '.'           Operator
 'method'      Name
@@ -927,15 +927,15 @@
 '('           Punctuation
 'p2'          Name
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
@@ -950,7 +950,7 @@
 'concat'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '4'           Literal.Number.Integer
 ','           Punctuation
@@ -959,12 +959,12 @@
 '6'           Literal.Number.Integer
 ']'           Operator
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# => [1, 2, 3, 4, 5, 6]' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '1'           Literal.Number.Integer
 ','           Punctuation
@@ -977,7 +977,7 @@
 '('           Punctuation
 ':concat'     Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 '4'           Literal.Number.Integer
 ','           Punctuation
@@ -986,12 +986,12 @@
 '6'           Literal.Number.Integer
 ']'           Operator
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# => [1, 2, 3, 4, 5, 6]' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Hurra! '     Literal.String.Double
 '"'           Literal.String.Double
@@ -1000,15 +1000,15 @@
 '('           Punctuation
 ':*'          Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# => "Hurra! Hurra! Hurra! "' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Hurra! '     Literal.String.Double
 '"'           Literal.String.Double
@@ -1019,58 +1019,58 @@
 '*'           Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '# => "Hurra! Hurra! Hurra! "' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Leider geht nicht die Wunschform' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# [1,2,3] `concat` [4,5,6]' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword
-' '           Text
+' '           Text.Whitespace
 'Object'      Name.Class
-'\n  '        Text
+'\n  '        Text.Whitespace
 '@@infixops'  Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n  '        Text
+'\n  '        Text.Whitespace
 'alias'       Keyword
-' '           Text
+' '           Text.Whitespace
 ':xeq'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 ':`'          Literal.String.Symbol
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'addinfix'    Name.Function
 '('           Punctuation
 'operator'    Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@@infixops'  Name.Variable.Class
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'operator'    Name
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 '`'           Name.Function
 '('           Punctuation
 'expression'  Name
 ')'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 '@@infixops'  Name.Variable.Class
 '.'           Operator
 'each'        Name
@@ -1079,9 +1079,9 @@
 'op'          Name
 '|'           Operator
 'break'       Keyword
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'expression'  Name
 '.'           Operator
 'match'       Name
@@ -1095,24 +1095,24 @@
 '/'           Literal.String.Regex
 ')'           Punctuation
 '}'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'raise'       Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'unknown infix operator in expression: ' Literal.String.Double
 '#{'          Literal.String.Interpol
 'expression'  Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '$2'          Name.Variable.Global
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n    '      Text
+'\n    '      Text.Whitespace
 'eval'        Name.Builtin
 '('           Punctuation
 '$1'          Name.Variable.Global
@@ -1132,12 +1132,12 @@
 '$3'          Name.Variable.Global
 ')'           Punctuation
 ')'           Punctuation
-'\n  '        Text
+'\n  '        Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'addinfix'    Name
 '('           Punctuation
@@ -1145,19 +1145,19 @@
 'concat'      Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'p'           Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '`'           Literal.String.Backtick
 '[1,2,3] concat [4,5,6]' Literal.String.Backtick
 '`'           Literal.String.Backtick
-' '           Text
+' '           Text.Whitespace
 '# => [1, 2, 3, 4, 5, 6]' Comment.Single
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '# HEREDOC FUN!!!!!!!1111' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
 '('           Punctuation
@@ -1166,19 +1166,19 @@
 'A'           Literal.String.Delimiter
 ''            Literal.String.Heredoc
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<<-'         Operator
 ''            Literal.String.Heredoc
 'B'           Literal.String.Delimiter
 ''            Literal.String.Heredoc
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
 ''            Literal.String.Heredoc
 'C'           Literal.String.Delimiter
 ''            Literal.String.Heredoc
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'this is the text of a\n' Literal.String.Heredoc
 
diff --git a/tests/examplefiles/rbcon/irb_heredoc.output b/tests/examplefiles/rbcon/irb_heredoc.output
index 4e18bc9b27..9db39007bb 100644
--- a/tests/examplefiles/rbcon/irb_heredoc.output
+++ b/tests/examplefiles/rbcon/irb_heredoc.output
@@ -1,9 +1,9 @@
 'irb(main):001:0> ' Generic.Prompt
 'puts'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
 'XYZ'         Literal.String.Delimiter
-'\n'          Text
+'\n'          Text.Whitespace
 
 'irb(main):002:0" ' Generic.Prompt
 'a\n'         Literal.String.Heredoc
@@ -21,4 +21,4 @@
 '=> nil\n'    Generic.Output
 
 'irb(main):005:0> ' Generic.Prompt
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rconsole/r-console-transcript.Rout.output b/tests/examplefiles/rconsole/r-console-transcript.Rout.output
index 5e085ef6fd..ee7bb85115 100644
--- a/tests/examplefiles/rconsole/r-console-transcript.Rout.output
+++ b/tests/examplefiles/rconsole/r-console-transcript.Rout.output
@@ -40,41 +40,41 @@
 
 '> '          Generic.Prompt
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'function'    Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Error: syntax error\n' Generic.Output
 
 '> '          Generic.Prompt
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'function'    Name.Function
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '> '          Generic.Prompt
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'function'    Name.Function
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+ '          Generic.Prompt
 'cat'         Name.Function
@@ -82,7 +82,7 @@
 '"'           Literal.String
 'hello"'      Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+ '          Generic.Prompt
 'cat'         Name.Function
@@ -90,15 +90,15 @@
 '"'           Literal.String
 'world"'      Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+ '          Generic.Prompt
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '> '          Generic.Prompt
 'x'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function() {\n' Generic.Output
 
@@ -112,19 +112,19 @@
 'x'           Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'helloworld\n' Generic.Output
 
 '> '          Generic.Prompt
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '[1] 4\n'     Generic.Output
 
 '> '          Generic.Prompt
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rd/example.Rd.output b/tests/examplefiles/rd/example.Rd.output
index 4668a93416..b665735e7f 100644
--- a/tests/examplefiles/rd/example.Rd.output
+++ b/tests/examplefiles/rd/example.Rd.output
@@ -2,48 +2,48 @@
 '{'           Name.Builtin
 'foo'         Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\alias'     Keyword
 '{'           Name.Builtin
 'foo'         Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 "% I'm a comment" Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\title'     Keyword
 '{'           Name.Builtin
 'The foo function' Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\description' Keyword
 '{'           Name.Builtin
 "It doesn't do much" Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\usage'     Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo(x, y)'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\arguments' Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\item'      Keyword
@@ -53,7 +53,7 @@
 '{'           Name.Builtin
 'A number'    Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\item'      Keyword
@@ -63,14 +63,14 @@
 '{'           Name.Builtin
 'Another number' Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\details'   Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  I just adds ' Text
 '\\code'      Keyword
@@ -83,10 +83,10 @@
 'y'           Text
 '}'           Name.Builtin
 ', '          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\value'     Keyword
 '{'           Name.Builtin
@@ -106,11 +106,11 @@
 '}'           Name.Builtin
 '.'           Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\references' Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\href'      Keyword
@@ -120,24 +120,24 @@
 '{'           Name.Builtin
 'Sum'         Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\author'    Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  Anonymous' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\note'      Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  Lorem ipsum ' Text
 '\\dots'      Keyword.Constant
@@ -159,7 +159,7 @@
 'bold'        Text
 '}'           Name.Builtin
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\sQuote'    Keyword
@@ -177,7 +177,7 @@
 'code'        Text
 '}'           Name.Builtin
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\preformatted' Keyword
@@ -195,7 +195,7 @@
 'literal seq' Text
 '}'           Name.Builtin
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\pkg'       Keyword
@@ -213,7 +213,7 @@
 'email@hostname' Text
 '}'           Name.Builtin
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\url'       Keyword
@@ -231,7 +231,7 @@
 'HOME'        Text
 '}'           Name.Builtin
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\option'    Keyword
@@ -249,9 +249,9 @@
 'GNU'         Text
 '}'           Name.Builtin
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  Escaped symbols: ' Text
 '\\\\'        Literal.String.Escape
@@ -264,10 +264,10 @@
 ' not comment. ' Text
 '\\\\'        Literal.String.Escape
 'NotAMacro.'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 '\\tabular'   Keyword
@@ -275,7 +275,7 @@
 'rlll'        Text
 '}'           Name.Builtin
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '         [,1] ' Text
 '\\tab'       Keyword.Constant
@@ -285,7 +285,7 @@
 '\\tab'       Keyword.Constant
 ' A (ppb)'    Text
 '\\cr'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '         [,2] ' Text
 '\\tab'       Keyword.Constant
@@ -295,7 +295,7 @@
 '\\tab'       Keyword.Constant
 ' B '         Text
 '\\cr'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '         [,3] ' Text
 '\\tab'       Keyword.Constant
@@ -305,52 +305,52 @@
 '\\tab'       Keyword.Constant
 ' C '         Text
 '\\cr'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '       '     Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 '\\enumerate' Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '         '   Text
 '\\item'      Keyword
 ' delta'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '         '   Text
 '\\item'      Keyword
 ' echo'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '       '     Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 '\\itemize'   Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '         '   Text
 '\\item'      Keyword
 ' foxtrot'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '         '   Text
 '\\item'      Keyword
 ' golf'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '       '     Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\deqn'      Keyword
@@ -388,7 +388,7 @@
 '}'           Name.Builtin
 '{'           Name.Builtin
 '%'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '             p(' Text
 '\\mu'        Keyword
@@ -402,7 +402,7 @@
 '\\sigma'     Keyword
 ')) '         Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '       for ' Text
 '\\eqn'       Keyword
@@ -411,10 +411,10 @@
 '\\ldots'     Keyword.Constant
 '}'           Name.Builtin
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\if'        Keyword
@@ -440,49 +440,49 @@
 '{'           Name.Builtin
 'beta'        Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n#ifdef unix' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Now windows' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#endif'      Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#ifndef windows' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Using windows' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#endif'      Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\section'   Keyword
 '{'           Name.Builtin
 'Misc'        Text
 '}'           Name.Builtin
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  Stuff.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\seealso'   Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '\\code'      Keyword
@@ -492,41 +492,41 @@
 'sum'         Text
 '}'           Name.Builtin
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\examples'  Keyword
 '{'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'x <- 1'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'y <- 2'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'z <- foo(x, y)' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\dontrun'   Keyword
 '{'           Name.Builtin
 'plot(z)'     Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\dontshow'  Keyword
 '{'           Name.Builtin
 'log(x)'      Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\keyword'   Keyword
 '{'           Name.Builtin
 'arith'       Text
 '}'           Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rhtml/example.rhtml.output b/tests/examplefiles/rhtml/example.rhtml.output
index 0d1b7c432d..191a7db612 100644
--- a/tests/examplefiles/rhtml/example.rhtml.output
+++ b/tests/examplefiles/rhtml/example.rhtml.output
@@ -1,13 +1,13 @@
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Moderatoren-Interface' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n'        Text
 
@@ -19,23 +19,23 @@
 'dt'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Proben'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/admin/proben' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -55,23 +55,23 @@
 'dt'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Auftritte'   Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/admin/proben' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -88,40 +88,40 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%-'         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@valid_user' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 '@valid_user' Name.Variable.Instance
 '.'           Operator
 'admin?'      Name
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
 'dt'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Benutzer'    Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/admin/user' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -138,9 +138,9 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%-'         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -151,83 +151,83 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Anmeldung'   Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n'        Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'user_form'   Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':object'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@user'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Administrator erstellen' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n'        Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'user_form'   Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':object'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@user'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'form_tag'    Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -252,18 +252,18 @@
 'td'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'text_field'  Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'user'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'name'        Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -292,18 +292,18 @@
 'td'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'password_field' Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'user'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'password'    Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -331,13 +331,13 @@
 'td'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'submit_tag'  Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Anmelden'    Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -352,62 +352,62 @@
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end_form_tag' Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Neuer Benutzer' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'error_messages_for' Name
-' '           Text
+' '           Text.Whitespace
 ':user'       Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'form'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':object'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@user'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'form_tag'    Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -432,18 +432,18 @@
 'td'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'text_field'  Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'user'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'name'        Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -472,18 +472,18 @@
 'td'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'password_field' Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'user'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'password'    Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -511,13 +511,13 @@
 'td'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'submit_tag'  Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Anlegen'     Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -532,22 +532,22 @@
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end_form_tag' Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Auftritte'   Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n'        Text
 
@@ -564,41 +564,41 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'head'        Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'day'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':collection' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@days'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -609,30 +609,30 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'auftritte'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
 'day'         Name
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'auftritt'    Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'auftritte'   Name
-' \n'         Text
+' \n'         Text.Whitespace
 
 '-%>'         Comment.Preproc
 '\n\n'        Text
@@ -650,38 +650,38 @@
 '>'           Punctuation
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'colorize'    Name
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 '.'           Operator
 'to_s'        Name
 '('           Punctuation
 ':dots'       Literal.String.Symbol
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'day'         Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t\t'      Text
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'day'         Name
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 '.'           Operator
 'wday'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '6'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 'br'          Name.Tag
@@ -697,9 +697,9 @@
 'em'          Name.Tag
 '>'           Punctuation
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -716,13 +716,13 @@
 '>'           Punctuation
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'colorize'    Name
-' '           Text
+' '           Text.Whitespace
 'auftritt'    Name
 '.'           Operator
 'time'        Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -739,49 +739,49 @@
 '>'           Punctuation
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'colorize'    Name
-' '           Text
+' '           Text.Whitespace
 'auftritt'    Name
 '.'           Operator
 'program'     Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'E'           Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'admin/auftritte' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':edit'       Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':id'         Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'auftritt'    Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -798,33 +798,33 @@
 '>'           Punctuation
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'colorize'    Name
 '('           Punctuation
 'auftritt'    Name
 '.'           Operator
 'place'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Ort: '       Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '<br />'      Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'auftritt'    Name
 '.'           Operator
 'place'       Name
 '.'           Operator
 'blank?'      Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -840,15 +840,15 @@
 '\n\n'        Text
 
 '<%'          Comment.Preproc
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'day'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-' \n'         Text
+' \n'         Text.Whitespace
 
 '-%>'         Comment.Preproc
 '\n'          Text
@@ -933,11 +933,11 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Besetzung - ' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -946,7 +946,7 @@
 'name'        Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n'        Text
 
@@ -956,34 +956,34 @@
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'pluralize'   Name
 '('           Punctuation
 '@members'    Name.Variable.Instance
 '.'           Operator
 'size'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Schüler spielt' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Schüler spielen' Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 ' '           Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 '@instrument' Name.Variable.Instance
 '.'           Operator
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 ':\n'         Text
 
@@ -1002,26 +1002,26 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'member'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':collection' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@members'    Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -1032,21 +1032,21 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Besetzung: %d Mitglieder' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 'Member'      Name.Constant
 '.'           Operator
 'count'       Name
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n\n'        Text
 
@@ -1060,149 +1060,149 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'params'      Name
 '['           Operator
 ':action'     Literal.String.Symbol
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'all'         Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'seitenweise' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':index'      Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to_if'  Name
-' '           Text
+' '           Text.Whitespace
 '@member_pages' Name.Variable.Instance
 '.'           Operator
 'current'     Name
 '.'           Operator
 'previous'    Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '<<'          Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':page'       Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@member_pages' Name.Variable.Instance
 '.'           Operator
 'current'     Name
 '.'           Operator
 'previous'    Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n| '        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'alle'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':all'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 ' |\n'        Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to_if'  Name
-' '           Text
+' '           Text.Whitespace
 '@member_pages' Name.Variable.Instance
 '.'           Operator
 'current'     Name
 '.'           Operator
 'next'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '>>'          Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':page'       Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@member_pages' Name.Variable.Instance
 '.'           Operator
 'current'     Name
 '.'           Operator
 'next'        Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n| '        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Nach Instrumenten' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':select_instrument' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -1222,26 +1222,26 @@
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'member'      Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':collection' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@members'    Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -1252,15 +1252,15 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Besetzung - Instrument wählen' Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n'        Text
 
@@ -1270,15 +1270,15 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'instr'       Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@instruments' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -1287,9 +1287,9 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 'h'           Name
 '('           Punctuation
 'instr'       Name
@@ -1297,24 +1297,24 @@
 'name'        Name
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':instrument' Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':id'         Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'instr'       Name
 '.'           Operator
 'name'        Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -1326,15 +1326,15 @@
 '>'           Punctuation
 '('           Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 'instr'       Name
 '.'           Operator
 'members'     Name
 '.'           Operator
 'size'        Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 ')'           Text
 '<'           Punctuation
@@ -1350,9 +1350,9 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -1363,11 +1363,11 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Besetzung: ' Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -1376,7 +1376,7 @@
 'name'        Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n\n'        Text
 
@@ -1399,11 +1399,11 @@
 'dd'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to_instruments_of' Name
-' '           Text
+' '           Text.Whitespace
 '@member'     Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -1425,9 +1425,9 @@
 'dd'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 '@member'     Name.Variable.Instance
 '.'           Operator
 'birthday'    Name
@@ -1436,7 +1436,7 @@
 '('           Punctuation
 ':dots'       Literal.String.Symbol
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -1458,13 +1458,13 @@
 'dd'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 '@member'     Name.Variable.Instance
 '.'           Operator
 'street'      Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 'br'          Name.Tag
@@ -1472,13 +1472,13 @@
 '/'           Punctuation
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 '@member'     Name.Variable.Instance
 '.'           Operator
 'plz'         Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -1500,13 +1500,13 @@
 'dd'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 '@member'     Name.Variable.Instance
 '.'           Operator
 'phone'       Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -1528,28 +1528,28 @@
 'dd'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'mail_to'     Name
-' '           Text
+' '           Text.Whitespace
 '@member'     Name.Variable.Instance
 '.'           Operator
 'email'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '@member'     Name.Variable.Instance
 '.'           Operator
 'email'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':encode'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'javascript'  Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -1575,37 +1575,37 @@
 'td'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 'member'      Name
 '.'           Operator
 'name'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':show'       Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':id'         Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'member'      Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 ':\n\t\t'     Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to_instruments_of' Name
-' '           Text
+' '           Text.Whitespace
 'member'      Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -1621,15 +1621,15 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Arbeitsgruppen' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -1945,15 +1945,15 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Chronik'     Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -2006,15 +2006,15 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Dirigent - Jobst Liebrecht' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -2023,43 +2023,43 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'image_tag'   Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'jobstliebrecht.jpg' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':alt'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Jobst Liebrecht' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':title'      Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Jobst Liebrecht' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':class'      Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'pic_right'   Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\tJobst Liebrecht studierte Dirigieren an der Musikhochschule in München und bei Peter Eötvös. Sein spezielles Interesse \n\tfür neue Musik führte schnell zur Zusammenarbeit mit renommierten Ensembles auf dem Gebiet wie dem Ensemble Modern, \n\tFrankfurt, dem Klangforum-Ensemble, Wien, dem Ensemble Köln sowie dem Ensemble United Berlin. Aufnahmen entstanden beim \n\tWDR, beim DeutschlandRadio Berlin, beim BR und beim SFB. Er dirigierte u.a. das Rundfunk Sinfonieorchester Berlin, die \n\tDuisburger Philharmoniker und das Münchner Kammerorchester sowie in den Opernhäusern in Halle und Giessen. Tourneen im \n\tAusland führten ihn nach Argentinien, Georgien, Südkorea und in die USA.\n' Text
 
@@ -2103,34 +2103,34 @@
 '\t\n'        Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'message'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'backtrace'   Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'session'     Name
 '['           Operator
 ':boom'       Literal.String.Symbol
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Fehler in Zeile %d' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '['           Operator
 'backtrace'   Name
 '['           Operator
@@ -2147,7 +2147,7 @@
 '1'           Literal.Number.Integer
 ']'           Operator
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -2168,11 +2168,11 @@
 '"error"'     Literal.String
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 'message'     Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -2187,36 +2187,36 @@
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'debug'       Name
-' '           Text
+' '           Text.Whitespace
 'backtrace'   Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'cache'       Name
-' '           Text
+' '           Text.Whitespace
 ':action_suffix' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'action'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'params'      Name
 '['           Operator
 ':action'     Literal.String.Symbol
 ']'           Operator
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -2225,13 +2225,13 @@
 '>'           Punctuation
 '\nDer Inhalt für die Aktion ' Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 'action'      Name
 '.'           Operator
 'inspect'     Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 ' fehlt noch.\n' Text
 
@@ -2242,22 +2242,22 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Schulferien Berlin' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -2754,15 +2754,15 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Termine'     Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n\n'        Text
 
@@ -2774,23 +2774,23 @@
 'li'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Auftritte'   Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/auftritte'  Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -2801,31 +2801,31 @@
 'li'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Schulferien' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/content'    Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':schulferien' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -2860,63 +2860,63 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'tag'         Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'meta'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ":'http-equiv'" Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'content-language' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':content'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'de'          Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'tag'         Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'meta'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ":'http-equiv'" Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'content-type' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':content'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'text/html; charset=UTF-8' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -3065,21 +3065,21 @@
 'JSO'         Text
 '<%-'         Comment.Preproc
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
 '-%>'         Comment.Preproc
 ' - '         Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<%-'         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -3087,13 +3087,13 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'stylesheet_link_tag' Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/rcss/main'  Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%#'         Comment.Preproc
@@ -3101,13 +3101,13 @@
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'javascript_include_tag' Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'nospam'      Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%#'         Comment.Preproc
@@ -3151,23 +3151,23 @@
 '>'           Punctuation
 '\n\t\t\t'    Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'image_tag'   Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'JSO-Logo.gif' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':alt'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'JSO-Logo'    Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t\t'      Text
 '<'           Punctuation
@@ -3270,11 +3270,11 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'valid_user'  Name
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -3290,9 +3290,9 @@
 '"menu2"'     Literal.String
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Logout '     Literal.String.Double
 '#{'          Literal.String.Interpol
@@ -3302,24 +3302,24 @@
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/admin/admin' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':logout'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -3334,69 +3334,69 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'cache'       Name
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'menu'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'main_menu'   Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render_component' Name
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'menu'        Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'index'       Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n\t\t'      Text
 '<'           Punctuation
@@ -3414,15 +3414,15 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@flash'      Name.Variable.Instance
 '.'           Operator
 'keys'        Name
 '.'           Operator
 'empty?'      Name
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -3435,18 +3435,18 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%-'         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'kind'        Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'msg'         Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@flash'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n\t\t'      Text
 '<'           Punctuation
@@ -3456,20 +3456,20 @@
 '='           Operator
 '"'           Literal.String
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 'kind'        Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '"'           Literal.String
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 'msg'         Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -3477,9 +3477,9 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%-'         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
@@ -3490,37 +3490,37 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'content_tag' Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'h3'          Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'h'           Name
 '('           Punctuation
 '@title'      Name.Variable.Instance
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@content_for_layout' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t\t'      Text
 '<'           Punctuation
@@ -3580,7 +3580,7 @@
 '>'           Punctuation
 ' '           Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'Rails'       Name.Constant
 '::'          Operator
 'Info'        Name.Constant
@@ -3588,104 +3588,104 @@
 'properties'  Name
 '.'           Operator
 'value_for'   Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Rails version' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 ' ['          Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 'RAILS_ENV'   Name.Constant
 '['           Operator
 '/'           Literal.String.Regex
 '^.'          Literal.String.Regex
 '/'           Literal.String.Regex
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 ']\n\t\t\t\t' Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'image_tag'   Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'css.png'     Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':alt'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'valid CSS'   Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':title'      Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'valid Cascading Style Sheet' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':style'      Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'display: inline; vertical-align: middle' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t\t\t\t'  Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'image_tag'   Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'xhtml11.png' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':alt'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'valid XHTML 1.1' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':title'      Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'valid eXtensible Hypertext Markup Language 1.1' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':style'      Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'display: inline; vertical-align: middle' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t\t\t'    Text
 '<'           Punctuation
@@ -3723,15 +3723,15 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Übersicht'   Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n\n'        Text
 
@@ -3762,41 +3762,41 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'proben/head' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'proben/day'  Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':object'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@next_probe' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -3810,23 +3810,23 @@
 'h4'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'weitere Proben...' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'proben'      Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -3861,41 +3861,41 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'auftritte/head' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'auftritte/day' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':object'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@next_auftritt' Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -3909,23 +3909,23 @@
 'h4'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'mehr Auftritte...' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'auftritte'   Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -3938,269 +3938,269 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'category'    Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Übersicht'   Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'home_url'    Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Wer sind wir?' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':wer'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Dirigent'    Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Besetzung'   Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'url_for'     Name
 '('           Punctuation
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/besetzung'  Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Repertoire'  Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'category'    Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Termine'     Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Auftritte'   Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'url_for'     Name
 '('           Punctuation
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/auftritte'  Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':plan'       Literal.String.Symbol
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Schulferien' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'category'    Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Probenplan'  Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'url_for'     Name
 '('           Punctuation
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '/proben'     Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':plan'       Literal.String.Symbol
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'category'    Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Organisation' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Orchesterrat' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Arbeitsgruppen' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'category'    Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Chronik'     Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Konzerte'    Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Audio'       Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Presse'      Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'category'    Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Links'       Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '#'           Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Bilderseite' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'http://musikschule.iden04.de' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'subcat'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Musikschule' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'http://www.musikschule-marzahn-hellersdorf.de' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n\t'      Text
 '<'           Punctuation
@@ -4217,13 +4217,13 @@
 '>'           Punctuation
 '\n\n\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'category'    Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Kontakt'     Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -4234,15 +4234,15 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 '@title'      Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Probenplan'  Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\n'        Text
 
@@ -4259,41 +4259,41 @@
 '>'           Punctuation
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'head'        Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 ':partial'    Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'day'         Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':collection' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '@days'       Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -4319,41 +4319,41 @@
 '\t\n\n'      Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render_partial' Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'raum'        Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'proben'      Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
 'day'         Name
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'probe'       Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'proben'      Name
-' \n'         Text
+' \n'         Text.Whitespace
 
 '-%>'         Comment.Preproc
 '\n\n'        Text
@@ -4371,38 +4371,38 @@
 '>'           Punctuation
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'colorize'    Name
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 '.'           Operator
 'to_s'        Name
 '('           Punctuation
 ':dots'       Literal.String.Symbol
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'day'         Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t\t'      Text
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'day'         Name
-' '           Text
+' '           Text.Whitespace
 'and'         Operator.Word
-' '           Text
+' '           Text.Whitespace
 'day'         Name
 '.'           Operator
 'wday'        Name
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '6'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 'br'          Name.Tag
@@ -4418,9 +4418,9 @@
 'em'          Name.Tag
 '>'           Punctuation
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -4437,13 +4437,13 @@
 '>'           Punctuation
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'colorize'    Name
-' '           Text
+' '           Text.Whitespace
 'probe'       Name
 '.'           Operator
 'time'        Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -4460,79 +4460,79 @@
 '>'           Punctuation
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'colorize'    Name
 '('           Punctuation
 'probe'       Name
 '.'           Operator
 'place'       Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'Ort: '       Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 '<br />'      Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'probe'       Name
 '.'           Operator
 'place'       Name
 '.'           Operator
 'blank?'      Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'colorize'    Name
-' '           Text
+' '           Text.Whitespace
 'probe'       Name
 '.'           Operator
 'program'     Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'E'           Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':controller' Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'admin/proben' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':action'     Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 ':edit'       Literal.String.Symbol
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':id'         Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 'probe'       Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -4549,13 +4549,13 @@
 '>'           Punctuation
 '\n\t\t'      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'h'           Name
-' '           Text
+' '           Text.Whitespace
 'probe'       Name
 '.'           Operator
 'instrumentation' Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n\t'        Text
 '<'           Punctuation
@@ -4571,15 +4571,15 @@
 '\n\n'        Text
 
 '<%'          Comment.Preproc
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'day'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 'end'         Keyword
-' \n'         Text
+' \n'         Text.Whitespace
 
 '-%>'         Comment.Preproc
 '\n'          Text
diff --git a/tests/examplefiles/rhtml/test.rhtml.output b/tests/examplefiles/rhtml/test.rhtml.output
index 0448c60be3..fe701ce39d 100644
--- a/tests/examplefiles/rhtml/test.rhtml.output
+++ b/tests/examplefiles/rhtml/test.rhtml.output
@@ -3,17 +3,17 @@
 '>'           Punctuation
 '\n '         Text
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'rows'        Name
 '.'           Operator
 'each'        Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'row'         Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n  '        Text
 '<'           Punctuation
@@ -23,11 +23,11 @@
 '='           Operator
 '"'           Literal.String
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'row'         Name
 '.'           Operator
 'cls'         Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '"'           Literal.String
 '>'           Punctuation
@@ -42,20 +42,20 @@
 '='           Operator
 '"'           Literal.String
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'item'        Name
 '.'           Operator
 'href'        Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '"'           Literal.String
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'item'        Name
 '.'           Operator
 'title'       Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -70,11 +70,11 @@
 'td'          Name.Tag
 '>'           Punctuation
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'item'        Name
 '.'           Operator
 'description' Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '<'           Punctuation
 '/'           Punctuation
@@ -87,9 +87,9 @@
 '>'           Punctuation
 '\n '         Text
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
@@ -200,27 +200,27 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '@homepage'   Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'render_node' Name
-' '           Text
+' '           Text.Whitespace
 '@homepage'   Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n  '        Text
 '<'           Punctuation
@@ -251,9 +251,9 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n  '        Text
 '<'           Punctuation
@@ -304,9 +304,9 @@
 '='           Operator
 '"'           Literal.String
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'clear_cache_url' Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '"'           Literal.String
 ' '           Text
@@ -321,54 +321,54 @@
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 '@homepage'   Name.Variable.Instance
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n    '      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'link_to'     Name
-' '           Text
+' '           Text.Whitespace
 'image_tag'   Name
 '('           Punctuation
 "'"           Literal.String.Single
 'new-homepage' Literal.String.Single
 "'"           Literal.String.Single
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':alt'        Literal.String.Symbol
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'New Homepage' Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'homepage_new_url' Name
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n'          Text
 
 '<%'          Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
-' '           Text
+' '           Text.Whitespace
 '-%>'         Comment.Preproc
 '\n    '      Text
 '<%='         Comment.Preproc
-' '           Text
+' '           Text.Whitespace
 'image_submit_tag' Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'clear-page-cache' Literal.String.Single
 "'"           Literal.String.Single
-' '           Text
+' '           Text.Whitespace
 '%>'          Comment.Preproc
 '\n  '        Text
 '<'           Punctuation
diff --git a/tests/examplefiles/rnc/rnc_example.rnc.output b/tests/examplefiles/rnc/rnc_example.rnc.output
index 59441b941f..bb1f4fe5b9 100644
--- a/tests/examplefiles/rnc/rnc_example.rnc.output
+++ b/tests/examplefiles/rnc/rnc_example.rnc.output
@@ -1,22 +1,22 @@
 '# This is a sample RNC file from the tutorial for the 2003 Working Draft' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# http://relaxng.org/compact-tutorial-20030326.html' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'element'     Keyword.Declaration
 ' html '      Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 'element'     Keyword.Declaration
 ' head '      Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -29,20 +29,20 @@
 'text'        Keyword.Type
 ' '           Text
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 '}'           Punctuation
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 'element'     Keyword.Declaration
 ' body '      Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -51,7 +51,7 @@
 'element'     Keyword.Declaration
 ' table '     Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -67,7 +67,7 @@
 ' '           Text
 '}'           Punctuation
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -78,7 +78,7 @@
 'element'     Keyword.Declaration
 ' tr '        Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -96,7 +96,7 @@
 ' '           Text
 '}'           Punctuation
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -109,7 +109,7 @@
 'element'     Keyword.Declaration
 ' td '        Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -129,7 +129,7 @@
 ' '           Text
 '}'           Punctuation
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -144,7 +144,7 @@
 'mixed'       Keyword.Declaration
 ' '           Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -161,7 +161,7 @@
 'element'     Keyword.Declaration
 ' span '      Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -185,7 +185,7 @@
 ' '           Text
 '}'           Punctuation
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -202,7 +202,7 @@
 ' '           Text
 ' '           Text
 'text'        Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -219,7 +219,7 @@
 '}'           Punctuation
 '?'           Operator
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -236,7 +236,7 @@
 'element'     Keyword.Declaration
 ' span '      Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -260,7 +260,7 @@
 ' '           Text
 '}'           Punctuation
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -277,7 +277,7 @@
 ' '           Text
 ' '           Text
 'text'        Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -293,7 +293,7 @@
 ' '           Text
 '}'           Punctuation
 '?'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -306,7 +306,7 @@
 ' '           Text
 ' '           Text
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -318,7 +318,7 @@
 ' '           Text
 '}'           Punctuation
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -331,7 +331,7 @@
 'element'     Keyword.Declaration
 ' td '        Name.Variable
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -351,7 +351,7 @@
 ' '           Text
 '}'           Punctuation
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -364,7 +364,7 @@
 ' '           Text
 ' '           Text
 'text'        Keyword.Type
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -375,7 +375,7 @@
 ' '           Text
 ' '           Text
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -385,19 +385,19 @@
 ' '           Text
 '}'           Punctuation
 '+'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 ' '           Text
 ' '           Text
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rst/functional.rst.output b/tests/examplefiles/rst/functional.rst.output
index 7d3b776ff3..161957d1ff 100644
--- a/tests/examplefiles/rst/functional.rst.output
+++ b/tests/examplefiles/rst/functional.rst.output
@@ -4,38 +4,38 @@
 '================================' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '**Version 0.30**' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '(This is a first draft.  Please send comments/error' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'reports/suggestions to amk@amk.ca.  This URL is probably not going to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'be the final location of the document, so be careful about linking to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'it -- you may want to add a disclaimer.)' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "In this document, we'll take a tour of Python's features suitable for" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'implementing programs in a functional style.  After an introduction to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "the concepts of functional programming, we'll look at language" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'features such as iterators and generators and relevant library modules' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'such as '    Text
 '``'          Literal.String
@@ -46,19 +46,19 @@
 'functools'   Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
 'contents'    Operator.Word
 '::'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Introduction' Generic.Heading
 '\n'          Text
@@ -66,25 +66,25 @@
 '----------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This section explains the basic concept of functional programming; if' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "you're just interested in learning about Python language features," Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'skip to the next section.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Programming languages support decomposing problems in several different ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ways'        Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -93,16 +93,16 @@
 '**procedural**' Generic.Strong
 ':'           Text
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  programs are lists of instructions that tell the computer what to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "  do with the program's input." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  C, Pascal, and even Unix shells are procedural languages.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -110,25 +110,25 @@
 ' In '        Text
 '**declarative**' Generic.Strong
 ' languages, you write a specification that describes ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  the problem to be solved, and the language implementation figures out ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  how to perform the computation efficiently.  SQL is the declarative ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "  language you're most likely to be familiar with; a SQL query describes" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  the data set you want to retrieve, and the SQL engine decides whether to ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  scan tables or use indexes, which subclauses should be performed first,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  etc.'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -136,22 +136,22 @@
 ' '           Text
 '**Object-oriented**' Generic.Strong
 ' programs manipulate  collections of objects.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  Objects have internal state and support methods that query or modify' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  this internal state in some way. Smalltalk and Java are' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  object-oriented languages.  C++ and Python are languages that' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "  support object-oriented programming, but don't force the use " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  of object-oriented features.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -159,84 +159,84 @@
 ' '           Text
 '**Functional**' Generic.Strong
 ' programming decomposes a problem into a set of functions.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "  Ideally, functions only take inputs and produce outputs, and don't have any " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  internal state that affects the output produced for a given input.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  Well-known functional languages include the ML family (Standard ML,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  OCaml, and other variants) and Haskell.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The designers of some computer languages have chosen one approach to ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "programming that's emphasized.  This often makes it difficult to" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'write programs that use a different approach.  Other languages are' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'multi-paradigm languages that support several different approaches.  Lisp,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'C++, and Python are multi-paradigm; you can write programs or' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'libraries that are largely procedural, object-oriented, or functional' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'in all of these languages.  In a large program, different sections' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'might be written using different approaches; the GUI might be object-oriented' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while the processing logic is procedural or functional, for example.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'In a functional program, input flows through a set of functions. Each' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function operates on its input and produces some output.  Functional' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'style frowns upon functions with side effects that modify internal' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "state or make other changes that aren't visible in the function's" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'return value.  Functions that have no side effects at all are ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'called '     Text
 '**purely functional**' Generic.Strong
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Avoiding side effects means not using data structures' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "that get updated as a program runs; every function's output " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'must only depend on its input.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Some languages are very strict about purity and don't even have" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assignment statements such as ' Text
 '``'          Literal.String
@@ -247,13 +247,13 @@
 'c = a + b'   Literal.String
 '``'          Literal.String
 ", but it's"  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'difficult to avoid all side effects.  Printing to the screen or' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'writing to a disk file are side effects, for example.  For example, in' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Python a '   Text
 '``'          Literal.String
@@ -264,94 +264,94 @@
 'time.sleep(1)' Literal.String
 '``'          Literal.String
 ' both return no' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "useful value; they're only called for their side effects of sending" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'some text to the screen or pausing execution for a second.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Python programs written in functional style usually won't go to the" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "extreme of avoiding all I/O or all assignments; instead, they'll" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'provide a functional-appearing interface but will use non-functional' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'features internally.  For example, the implementation of a function' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "will still use assignments to local variables, but won't modify global" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'variables or have other side effects.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Functional programming can be considered the opposite of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'object-oriented programming.  Objects are little capsules containing' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'some internal state along with a collection of method calls that let' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'you modify this state, and programs consist of making the right set of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'state changes.  Functional programming wants to avoid state changes as' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'much as possible and works with data flowing between functions.  In' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Python you might combine the two approaches by writing functions that' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'take and return instances representing objects in your application' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '(e-mail messages, transactions, etc.).' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Functional design may seem like an odd constraint to work under.  Why' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'should you avoid objects and side effects?  There are theoretical and' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'practical advantages to the functional style' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 '*'           Literal.Number
 ' Formal provability.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 ' Modularity.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 ' Composability.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 ' Ease of debugging and testing.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Formal provability' Generic.Heading
 '\n'          Text
@@ -359,108 +359,108 @@
 "''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "A theoretical benefit is that it's easier to construct a mathematical proof" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'that a functional program is correct.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'For a long time researchers have been interested in finding ways to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'mathematically prove programs correct.  This is different from testing' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a program on numerous inputs and concluding that its output is usually' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "correct, or reading a program's source code and concluding that the" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'code looks right; the goal is instead a rigorous proof that a program' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'produces the right result for all possible inputs.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The technique used to prove programs correct is to write down ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '**invariants**' Generic.Strong
 ", properties of the input data and of the program's " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'variables that are always true.  For each line of code, you then show ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'that if invariants X and Y are true ' Text
 '**before**'  Generic.Strong
 ' the line is executed, ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "the slightly different invariants X' and Y' are true " Text
 '**after**'   Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the line is executed.  This continues until you reach the end of the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'program, at which point the invariants should match the desired ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "conditions on the program's output." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Functional programming's avoidance of assignments arose because " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assignments are difficult to handle with this technique; ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assignments can break invariants that were true before the assignment' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'without producing any new invariants that can be propagated onward.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Unfortunately, proving programs correct is largely impractical and not' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'relevant to Python software. Even trivial programs require proofs that' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'are several pages long; the proof of correctness for a moderately' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'complicated program would be enormous, and few or none of the programs' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'you use daily (the Python interpreter, your XML parser, your web' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'browser) could be proven correct.  Even if you wrote down or generated' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a proof, there would then be the question of verifying the proof;' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "maybe there's an error in it, and you wrongly believe you've proved" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the program correct.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Modularity'  Generic.Heading
 '\n'          Text
@@ -468,29 +468,29 @@
 "''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'A more practical benefit of functional programming is that it forces' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'you to break apart your problem into small pieces.  Programs are more' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "modular as a result.  It's easier to specify and write a small" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function that does one thing than a large function that performs a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'complicated transformation.  Small functions are also easier to read' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and to check for errors.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Ease of debugging and testing ' Generic.Heading
 '\n'          Text
@@ -498,47 +498,47 @@
 "''''''''''''''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Testing and debugging a functional-style program is easier.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Debugging is simplified because functions are generally small and' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "clearly specified.  When a program doesn't work, each function is an" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'interface point where you can check that the data are correct.  You' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'can look at the intermediate inputs and outputs to quickly isolate the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "function that's responsible for a bug." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Testing is easier because each function is a potential subject for a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "unit test.  Functions don't depend on system state that needs to be" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'replicated before running a test; instead you only have to synthesize' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the right input and then check that the output matches expectations.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Composability' Generic.Heading
 '\n'          Text
@@ -546,48 +546,48 @@
 "''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "As you work on a functional-style program, you'll write a number of" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'functions with varying inputs and outputs.  Some of these functions' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'will be unavoidably specialized to a particular application, but' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'others will be useful in a wide variety of programs.  For example, a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function that takes a directory path and returns all the XML files in' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the directory, or a function that takes a filename and returns its' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'contents, can be applied to many different situations.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Over time you'll form a personal library of utilities.  Often you'll" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assemble new programs by arranging existing functions in a new' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'configuration and writing a few functions specialized for the current' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'task.'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Iterators'   Generic.Heading
 '\n'          Text
@@ -595,33 +595,33 @@
 '-----------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "I'll start by looking at a Python language feature that's an important" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foundation for writing functional-style programs' Text
 ':'           Text
 ' iterators.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'An iterator is an object representing a stream of data; this object' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'returns the data one element at a time.  A Python iterator must' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'support a method called ' Text
 '``'          Literal.String
 'next()'      Literal.String
 '``'          Literal.String
 ' that takes no arguments and always' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'returns the next element of the stream.  If there are no more elements' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'in the stream, ' Text
 '``'          Literal.String
@@ -632,45 +632,45 @@
 'StopIteration' Literal.String
 '``'          Literal.String
 ' exception.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Iterators don't have to be finite, though; it's perfectly reasonable" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'to write an iterator that produces an infinite stream of data.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The built-in ' Text
 '``'          Literal.String
 'iter()'      Literal.String
 '``'          Literal.String
 ' function takes an arbitrary object and tries' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "to return an iterator that will return the object's contents or" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elements, raising ' Text
 '``'          Literal.String
 'TypeError'   Literal.String
 '``'          Literal.String
 " if the object doesn't support" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "iteration.  Several of Python's built-in data types support iteration," Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the most common being lists and dictionaries.  An object is called ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'an '         Text
 '**iterable**' Generic.Strong
 ' object if you can get an iterator for it.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You can experiment with the iteration interface manually' Text
 '::'          Literal.String.Escape
@@ -683,7 +683,7 @@
 '    >>> it = iter(L)\n    >>> print it\n    <iterator object at 0x8116870>\n    >>> it.next()\n    1\n    >>> it.next()\n    2\n    >>> it.next()\n    3\n    >>> it.next()\n    Traceback (most recent call last):\n      File "<stdin>", line 1, in ?\n    StopIteration\n    >>>      \n\n' Literal.String
 
 'Python expects iterable objects in several different contexts, the ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'most important being the ' Text
 '``'          Literal.String
@@ -694,14 +694,14 @@
 'for X in Y'  Literal.String
 '``'          Literal.String
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Y must be an iterator or some object for which ' Text
 '``'          Literal.String
 'iter()'      Literal.String
 '``'          Literal.String
 ' can create ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'an iterator.  These two statements are equivalent' Text
 '::'          Literal.String.Escape
@@ -714,7 +714,7 @@
 '            print i\n\n        for i in obj:\n            print i\n\n' Literal.String
 
 'Iterators can be materialized as lists or tuples by using the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'list()'      Literal.String
@@ -736,7 +736,7 @@
 'Sequence unpacking also supports iterators' Text
 ':'           Text
 ' if you know an iterator ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'will return N elements, you can unpack them into an N-tuple' Text
 '::'          Literal.String.Escape
@@ -757,10 +757,10 @@
 'min()'       Literal.String
 '``'          Literal.String
 ' can take a single' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'iterator argument and will return the largest or smallest element.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The '        Text
 '``'          Literal.String
@@ -777,10 +777,10 @@
 'X in\niterator' Literal.String
 '``'          Literal.String
 ' is true if X is found in the stream returned by the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "iterator.  You'll run into obvious problems if the iterator is" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'infinite; '  Text
 '``'          Literal.String
@@ -795,50 +795,50 @@
 '"not in"'    Literal.String
 '``'          Literal.String
 ' will never return, and' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if the element X never appears in the stream, the ' Text
 '``'          Literal.String
 '"in"'        Literal.String
 '``'          Literal.String
 ' operator'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "won't return either." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Note that you can only go forward in an iterator; there's no way to" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'get the previous element, reset the iterator, or make a copy of it.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Iterator objects can optionally provide these additional capabilities,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'but the iterator protocol only specifies the ' Text
 '``'          Literal.String
 'next()'      Literal.String
 '``'          Literal.String
 ' method.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Functions may therefore consume all of the iterator's output, and if" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "you need to do something different with the same stream, you'll have" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'to create a new iterator.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Data Types That Support Iterators' Generic.Heading
 '\n'          Text
@@ -846,25 +846,25 @@
 "'''''''''''''''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "We've already seen how lists and tuples support iterators.  In fact," Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'any Python sequence type, such as strings, will automatically support' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'creation of an iterator.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Calling '    Text
 '``'          Literal.String
 'iter()'      Literal.String
 '``'          Literal.String
 ' on a dictionary returns an iterator that will loop' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "over the dictionary's keys" Text
 '::'          Literal.String.Escape
@@ -877,25 +877,25 @@
 "    ...      'Jul': 7, 'Aug': 8, 'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12}\n    >>> for key in m:\n    ...     print key, m[key]\n    Mar 3\n    Feb 2\n    Aug 8\n    Sep 9\n    May 5\n    Jun 6\n    Jul 7\n    Jan 1\n    Apr 4\n    Nov 11\n    Dec 12\n    Oct 10\n\n" Literal.String
 
 "Note that the order is essentially random, because it's based on the" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'hash ordering of the objects in the dictionary.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Applying '   Text
 '``'          Literal.String
 'iter()'      Literal.String
 '``'          Literal.String
 ' to a dictionary always loops over the keys, but' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'dictionaries have methods that return other iterators.  If you want to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'iterate over keys, values, or key/value pairs, you can explicitly call' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the '        Text
 '``'          Literal.String
@@ -910,19 +910,19 @@
 'iteritems()' Literal.String
 '``'          Literal.String
 ' methods to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'get an appropriate iterator.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The '        Text
 '``'          Literal.String
 'dict()'      Literal.String
 '``'          Literal.String
 ' constructor can accept an iterator that returns a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'finite stream of ' Text
 '``'          Literal.String
@@ -942,10 +942,10 @@
 '``'          Literal.String
 'readline()'  Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'method until there are no more lines in the file.  This means you can' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'read each line of a file like this' Text
 '::'          Literal.String.Escape
@@ -958,7 +958,7 @@
 '        # do something for each line\n        ...\n\n' Literal.String
 
 'Sets can take their contents from an iterable and let you iterate over' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "the set's elements" Text
 '::'          Literal.String.Escape
@@ -976,40 +976,40 @@
 '----------------------------------------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Two common operations on an iterator's output are 1) performing some" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'operation for every element, 2) selecting a subset of elements that' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'meet some condition.  For example, given a list of strings, you might' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'want to strip off trailing whitespace from each line or extract all' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the strings containing a given substring.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'List comprehensions and generator expressions (short form' Text
 ':'           Text
 ' "listcomps"' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and "genexps") are a concise notation for such operations, borrowed' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'from the functional programming language Haskell' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '(http'       Text
 ':'           Text
 '//www.haskell.org).  You can strip all the whitespace from a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'stream of strings with the following code' Text
 '::'          Literal.String.Escape
@@ -1036,41 +1036,41 @@
 '                         if line != ""]\n\n' Literal.String
 
 'With a list comprehension, you get back a Python list;' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'stripped_list' Literal.String
 '``'          Literal.String
 ' is a list containing the resulting lines, not an' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'iterator.  Generator expressions return an iterator that computes the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'values as necessary, not needing to materialize all the values at' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "once.  This means that list comprehensions aren't useful if you're" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'working with iterators that return an infinite stream or a very large' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'amount of data.  Generator expressions are preferable in these' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'situations.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Generator expressions are surrounded by parentheses ("()") and list' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'comprehensions are surrounded by square brackets ("' Text
 '['           Text
 ']").  Generator' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'expressions have the form' Text
 '::'          Literal.String.Escape
@@ -1083,15 +1083,15 @@
 '                 if condition1\n                 for expr2 in sequence2\n                 if condition2\n                 for expr3 in sequence3 ...\n                 if condition3\n                 for exprN in sequenceN\n                 if conditionN )\n\n' Literal.String
 
 'Again, for a list comprehension only the outside brackets are' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'different (square brackets instead of parentheses).' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The elements of the generated output will be the successive values of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'expression'  Literal.String
@@ -1101,30 +1101,30 @@
 'if'          Literal.String
 '``'          Literal.String
 ' clauses are all optional; if present,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'expression'  Literal.String
 '``'          Literal.String
 ' is only evaluated and added to the result when' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'condition'   Literal.String
 '``'          Literal.String
 ' is true.'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Generator expressions always have to be written inside parentheses,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'but the parentheses signalling a function call also count.  If you' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'want to create an iterator that will be immediately passed to a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function you can write' Text
 '::'          Literal.String.Escape
@@ -1141,15 +1141,15 @@
 'for...in'    Literal.String
 '``'          Literal.String
 ' clauses contain the sequences to be iterated over.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The sequences do not have to be the same length, because they are' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'iterated over from left to right, ' Text
 '**not**'     Generic.Strong
 ' in parallel.  For each' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'element in ' Text
 '``'          Literal.String
@@ -1160,14 +1160,14 @@
 'sequence2'   Literal.String
 '``'          Literal.String
 ' is looped over from the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'beginning.  ' Text
 '``'          Literal.String
 'sequence3'   Literal.String
 '``'          Literal.String
 '  is then looped over for each ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'resulting pair of elements from ' Text
 '``'          Literal.String
@@ -1178,12 +1178,12 @@
 'sequence2'   Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'To put it another way, a list comprehension or generator expression is' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'equivalent to the following Python code' Text
 '::'          Literal.String.Escape
@@ -1200,16 +1200,16 @@
 'for...in'    Literal.String
 '``'          Literal.String
 ' clauses but no' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'if'          Literal.String
 '``'          Literal.String
 ' clauses, the length of the resulting output will be equal to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the product of the lengths of all the sequences.  If you have two' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'lists of length 3, the output list is 9 elements long' Text
 '::'          Literal.String.Escape
@@ -1222,16 +1222,16 @@
 "    seq2 = (1,2,3)\n    >>> [ (x,y) for x in seq1 for y in seq2]\n    [('a', 1), ('a', 2), ('a', 3), \n     ('b', 1), ('b', 2), ('b', 3), \n     ('c', 1), ('c', 2), ('c', 3)]\n\n" Literal.String
 
 "To avoid introducing an ambiguity into Python's grammar, if" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'expression'  Literal.String
 '``'          Literal.String
 ' is creating a tuple, it must be surrounded with' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'parentheses.  The first list comprehension below is a syntax error,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while the second one is correct' Text
 '::'          Literal.String.Escape
@@ -1249,53 +1249,53 @@
 '-----------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Generators are a special class of functions that simplify the task of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'writing iterators.  Regular functions compute a value and return it,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'but generators return an iterator that returns a stream of values.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "You're doubtless familiar with how regular function calls work in" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Python or C.  When you call a function, it gets a private namespace' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'where its local variables are created.  When the function reaches a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'return'      Literal.String
 '``'          Literal.String
 ' statement, the local variables are destroyed and the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'value is returned to the caller.  A later call to the same function' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'creates a new private namespace and a fresh set of local' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "variables. But, what if the local variables weren't thrown away on" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'exiting a function?  What if you could later resume the function where' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'it left off?  This is what generators provide; they can be thought of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'as resumable functions.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Here's the simplest example of a generator function" Text
 '::'          Literal.String.Escape
@@ -1312,28 +1312,28 @@
 'yield'       Literal.String
 '``'          Literal.String
 ' keyword is a generator function;' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "this is detected by Python's bytecode compiler which compiles the" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function specially as a result.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "When you call a generator function, it doesn't return a single value;" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'instead it returns a generator object that supports the iterator' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'protocol.  On executing the ' Text
 '``'          Literal.String
 'yield'       Literal.String
 '``'          Literal.String
 ' expression, the generator' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'outputs the value of ' Text
 '``'          Literal.String
@@ -1343,14 +1343,14 @@
 '``'          Literal.String
 'return'      Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'statement.  The big difference between ' Text
 '``'          Literal.String
 'yield'       Literal.String
 '``'          Literal.String
 ' and a'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'return'      Literal.String
@@ -1360,22 +1360,22 @@
 'yield'       Literal.String
 '``'          Literal.String
 ' the'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "generator's state of execution is suspended and local variables are" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "preserved.  On the next call to the generator's " Text
 '``'          Literal.String
 '.next()'     Literal.String
 '``'          Literal.String
 ' method,'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the function will resume executing.  ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Here's a sample usage of the " Text
 '``'          Literal.String
@@ -1396,32 +1396,32 @@
 'for i in generate_ints(5)' Literal.String
 '``'          Literal.String
 ', or'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'a,b,c = generate_ints(3)' Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Inside a generator function, the ' Text
 '``'          Literal.String
 'return'      Literal.String
 '``'          Literal.String
 ' statement can only be used' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'without a value, and signals the end of the procession of values;' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'after executing a ' Text
 '``'          Literal.String
 'return'      Literal.String
 '``'          Literal.String
 ' the generator cannot return any further' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'values.  '   Text
 '``'          Literal.String
@@ -1432,41 +1432,41 @@
 'return 5'    Literal.String
 '``'          Literal.String
 ', is a syntax' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "error inside a generator function.  The end of the generator's results" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'can also be indicated by raising ' Text
 '``'          Literal.String
 'StopIteration' Literal.String
 '``'          Literal.String
 ' manually, or by' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'just letting the flow of execution fall off the bottom of the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function.'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You could achieve the effect of generators manually by writing your' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'own class and storing all the local variables of the generator as' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'instance variables.  For example, returning a list of integers could' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'be done by setting ' Text
 '``'          Literal.String
 'self.count'  Literal.String
 '``'          Literal.String
 ' to 0, and having the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'next()'      Literal.String
@@ -1476,33 +1476,33 @@
 'self.count'  Literal.String
 '``'          Literal.String
 ' and return it.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'However, for a moderately complicated generator, writing a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'corresponding class can be much messier.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "The test suite included with Python's library, " Text
 '``'          Literal.String
 'test_generators.py' Literal.String
 '``'          Literal.String
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "contains a number of more interesting examples.  Here's one generator" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'that implements an in-order traversal of a tree using generators' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'recursively.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -1518,25 +1518,25 @@
 'test_generators.py' Literal.String
 '``'          Literal.String
 ' produce'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'solutions for the N-Queens problem (placing N queens on an NxN' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "chess board so that no queen threatens another) and the Knight's Tour" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '(finding a route that takes a knight to every square of an NxN chessboard' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'without visiting any square twice).' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Passing values into a generator' Generic.Heading
 '\n'          Text
@@ -1544,36 +1544,36 @@
 "''''''''''''''''''''''''''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'In Python 2.4 and earlier, generators only produced output.  Once a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "generator's code was invoked to create an iterator, there was no way to" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'pass any new information into the function when its execution is' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'resumed.  You could hack together this ability by making the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'generator look at a global variable or by passing in some mutable object' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'that callers then modify, but these approaches are messy.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "In Python 2.5 there's a simple way to pass values into a generator." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'yield'       Literal.String
 '``'          Literal.String
 ' became an expression, returning a value that can be assigned' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'to a variable or otherwise operated on' Text
 '::'          Literal.String.Escape
@@ -1591,72 +1591,72 @@
 '``'          Literal.String
 'yield'       Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 "expression when you're doing something with the returned value, as in" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "the above example.  The parentheses aren't always necessary, but it's" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "easier to always add them instead of having to remember when they're" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'needed.'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '(PEP 342 explains the exact rules, which are that a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'yield'       Literal.String
 '``'          Literal.String
 '-expression must always be parenthesized except when it' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'occurs at the top-level expression on the right-hand side of an' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'assignment.  This means you can write ' Text
 '``'          Literal.String
 'val = yield i' Literal.String
 '``'          Literal.String
 ' but have to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "use parentheses when there's an operation, as in " Text
 '``'          Literal.String
 'val = (yield i)\n+ 12' Literal.String
 '``'          Literal.String
 '.)'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Values are sent into a generator by calling its' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'send(value)' Literal.String
 '``'          Literal.String
 ' method.  This method resumes the ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "generator's code and the " Text
 '``'          Literal.String
 'yield'       Literal.String
 '``'          Literal.String
 ' expression returns the specified' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'value.  If the regular ' Text
 '``'          Literal.String
 'next()'      Literal.String
 '``'          Literal.String
 ' method is called, the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'yield'       Literal.String
@@ -1666,17 +1666,17 @@
 'None'        Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Here's a simple counter that increments by 1 and allows changing the" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'value of the internal counter.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -1689,43 +1689,43 @@
 
 "And here's an example of changing the counter" Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    >>> it = counter(10)' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    >>> print it.next()' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    0'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    >>> print it.next()' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    1'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    >>> print it.send(8)' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    8'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    >>> print it.next()' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    9'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    >>> print it.next()' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    Traceback (most recent call last)' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      File ' Text
 '``'          Literal.String
@@ -1739,33 +1739,33 @@
 'None'        Literal.String
 '``'          Literal.String
 ', you'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "should always check for this case.  Don't just use its value in" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "expressions unless you're sure that the " Text
 '``'          Literal.String
 'send()'      Literal.String
 '``'          Literal.String
 ' method'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'will be the only method used resume your generator function.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'In addition to ' Text
 '``'          Literal.String
 'send()'      Literal.String
 '``'          Literal.String
 ', there are two other new methods on' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'generators'  Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -1775,17 +1775,17 @@
 'throw(type, value=None, traceback=None)' Literal.String
 '``'          Literal.String
 ' is used to raise an exception inside the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  generator; the exception is raised by the ' Text
 '``'          Literal.String
 'yield'       Literal.String
 '``'          Literal.String
 ' expression' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "  where the generator's execution is paused." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -1798,16 +1798,16 @@
 '``'          Literal.String
 'GeneratorExit' Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  exception inside the generator to terminate the iteration.  ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  On receiving this' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "  exception, the generator's code must either raise" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '``'          Literal.String
@@ -1818,10 +1818,10 @@
 'StopIteration' Literal.String
 '``'          Literal.String
 '; catching the ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  exception and doing anything else is illegal and will trigger' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  a '        Text
 '``'          Literal.String
@@ -1832,71 +1832,71 @@
 'close()'     Literal.String
 '``'          Literal.String
 ' will also be called by ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "  Python's garbage collector when the generator is garbage-collected." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  If you need to run cleanup code when a ' Text
 '``'          Literal.String
 'GeneratorExit' Literal.String
 '``'          Literal.String
 ' occurs,'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  I suggest using a ' Text
 '``'          Literal.String
 'try: ... finally:' Literal.String
 '``'          Literal.String
 ' suite instead of ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  catching ' Text
 '``'          Literal.String
 'GeneratorExit' Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The cumulative effect of these changes is to turn generators from' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'one-way producers of information into both producers and consumers.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Generators also become ' Text
 '**coroutines**' Generic.Strong
 ', a more generalized form of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'subroutines.  Subroutines are entered at one point and exited at' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'another point (the top of the function, and a ' Text
 '``'          Literal.String
 'return'      Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'statement), but coroutines can be entered, exited, and resumed at' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'many different points (the ' Text
 '``'          Literal.String
 'yield'       Literal.String
 '``'          Literal.String
 ' statements).  ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Built-in functions' Generic.Heading
 '\n'          Text
@@ -1904,12 +1904,12 @@
 '----------------------------------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Let's look in more detail at built-in functions often used with iterators." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Two Python's built-in functions, " Text
 '``'          Literal.String
@@ -1920,15 +1920,15 @@
 'filter()'    Literal.String
 '``'          Literal.String
 ', are'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'somewhat obsolete; they duplicate the features of list comprehensions' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'but return actual lists instead of iterators.  ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'map(f, iterA, iterB, ...)' Literal.String
@@ -1938,9 +1938,9 @@
 'f(iterA[0],\niterB[0]), f(iterA[1], iterB[1]), f(iterA[2], iterB[2]), ...' Literal.String
 '``'          Literal.String
 '.  '         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -1952,55 +1952,55 @@
 "        return s.upper()\n    map(upper, ['sentence', 'fragment']) =>\n      ['SENTENCE', 'FRAGMENT']\n\n    [upper(s) for s in ['sentence', 'fragment']] =>\n      ['SENTENCE', 'FRAGMENT']\n\n" Literal.String
 
 'As shown above, you can achieve the same effect with a list' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'comprehension.  The ' Text
 '``'          Literal.String
 'itertools.imap()' Literal.String
 '``'          Literal.String
 ' function does the same thing' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "but can handle infinite iterators; it'll be discussed later, in the section on " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the '        Text
 '``'          Literal.String
 'itertools'   Literal.String
 '``'          Literal.String
 ' module.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'filter(predicate, iter)' Literal.String
 '``'          Literal.String
 ' returns a list ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'that contains all the sequence elements that meet a certain condition,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and is similarly duplicated by list comprehensions.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'A '          Text
 '**predicate**' Generic.Strong
 ' is a function that returns the truth value of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'some condition; for use with ' Text
 '``'          Literal.String
 'filter()'    Literal.String
 '``'          Literal.String
 ', the predicate must take a ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'single value.  ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2029,87 +2029,87 @@
 'itertools'   Literal.String
 '``'          Literal.String
 ' module,'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'itertools.ifilter()' Literal.String
 '``'          Literal.String
 ', that returns an iterator and ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'can therefore handle infinite sequences just as ' Text
 '``'          Literal.String
 'itertools.imap()' Literal.String
 '``'          Literal.String
 ' can.'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'reduce(func, iter, [initial_value])' Literal.String
 '``'          Literal.String
 " doesn't have a counterpart in" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the '        Text
 '``'          Literal.String
 'itertools'   Literal.String
 '``'          Literal.String
 ' module because it cumulatively performs an operation' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "on all the iterable's elements and therefore can't be applied to" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'infinite iterables.  ' Text
 '``'          Literal.String
 'func'        Literal.String
 '``'          Literal.String
 ' must be a function that takes two elements' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and returns a single value.  ' Text
 '``'          Literal.String
 'reduce()'    Literal.String
 '``'          Literal.String
 ' takes the first two elements' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'A and B returned by the iterator and calculates ' Text
 '``'          Literal.String
 'func(A, B)'  Literal.String
 '``'          Literal.String
 '.  It'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'then requests the third element, C, calculates ' Text
 '``'          Literal.String
 'func(func(A, B),\nC)' Literal.String
 '``'          Literal.String
 ', combines this result with the fourth element returned, and' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'continues until the iterable is exhausted.  If the iterable returns no' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'values at all, a ' Text
 '``'          Literal.String
 'TypeError'   Literal.String
 '``'          Literal.String
 ' exception is raised.  If the initial' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "value is supplied, it's used as a starting point and" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'func(initial_value, A)' Literal.String
 '``'          Literal.String
 ' is the first calculation.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2129,10 +2129,10 @@
 'reduce()'    Literal.String
 '``'          Literal.String
 ", you'll add up all the " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "elements of the iterable.  This case is so common that there's a special" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'built-in called ' Text
 '``'          Literal.String
@@ -2153,7 +2153,7 @@
 'reduce()'    Literal.String
 '``'          Literal.String
 ', though, it can be clearer to just write' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the obvious ' Text
 '``'          Literal.String
@@ -2173,12 +2173,12 @@
 'enumerate(iter)' Literal.String
 '``'          Literal.String
 ' counts off the elements in the iterable, returning' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2-tuples containing the count and each element.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2193,7 +2193,7 @@
 'enumerate()' Literal.String
 '``'          Literal.String
 ' is often used when looping through a list ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and recording the indexes at which certain conditions are met' Text
 '::'          Literal.String.Escape
@@ -2209,10 +2209,10 @@
 'sorted(iterable, [cmp=None], [key=None], [reverse=False)' Literal.String
 '``'          Literal.String
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'collects all the elements of the iterable into a list, sorts ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the list, and returns the sorted result.  The ' Text
 '``'          Literal.String
@@ -2223,23 +2223,23 @@
 'key'         Literal.String
 '``'          Literal.String
 ', '          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and '        Text
 '``'          Literal.String
 'reverse'     Literal.String
 '``'          Literal.String
 ' arguments are passed through to the ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "constructed list's " Text
 '``'          Literal.String
 '.sort()'     Literal.String
 '``'          Literal.String
 ' method.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2251,14 +2251,14 @@
 '    # Generate 8 random numbers between [0, 10000)\n    rand_list = random.sample(range(10000), 8)\n    rand_list =>\n      [769, 7953, 9828, 6431, 8442, 9878, 6213, 2207]\n    sorted(rand_list) =>\n      [769, 2207, 6213, 6431, 7953, 8442, 9828, 9878]\n    sorted(rand_list, reverse=True) =>\n      [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769]\n\n' Literal.String
 
 '(For a more detailed discussion of sorting, see the Sorting mini-HOWTO' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'in the Python wiki at http' Text
 ':'           Text
 '//wiki.python.org/moin/HowTo/Sorting.)' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The '        Text
 '``'          Literal.String
@@ -2269,21 +2269,21 @@
 'all(iter)'   Literal.String
 '``'          Literal.String
 ' built-ins look at ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "the truth values of an iterable's contents.  " Text
 '``'          Literal.String
 'any()'       Literal.String
 '``'          Literal.String
 ' returns '   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'True if any element in the iterable is a true value, and ' Text
 '``'          Literal.String
 'all()'       Literal.String
 '``'          Literal.String
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'returns True if all of the elements are true values' Text
 '::'          Literal.String.Escape
@@ -2301,18 +2301,18 @@
 '----------------------------------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "When writing functional-style programs, you'll often need little" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'functions that act as predicates or that combine elements in some way.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "If there's a Python built-in or a module function that's suitable, you" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "don't need to define a new function at all" Text
 '::'          Literal.String.Escape
@@ -2325,7 +2325,7 @@
 '        existing_files = filter(os.path.exists, file_list)\n\n' Literal.String
 
 "If the function you need doesn't exist, you need to write it.  One way" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'to write small functions is to use the ' Text
 '``'          Literal.String
@@ -2335,10 +2335,10 @@
 '``'          Literal.String
 'lambda'      Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'takes a number of parameters and an expression combining these parameters,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and creates a small function that returns the value of the expression' Text
 '::'          Literal.String.Escape
@@ -2355,7 +2355,7 @@
 'def'         Literal.String
 '``'          Literal.String
 ' statement and define a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function in the usual way' Text
 '::'          Literal.String.Escape
@@ -2368,29 +2368,29 @@
 "            return x.lower()\n\n        def print_assign(name, value):\n            return name + '=' + str(value)\n\n        def adder(x,y):\n            return x + y\n\n" Literal.String
 
 "Which alternative is preferable?  That's a style question; my usual" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'course is to avoid using ' Text
 '``'          Literal.String
 'lambda'      Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'One reason for my preference is that ' Text
 '``'          Literal.String
 'lambda'      Literal.String
 '``'          Literal.String
 ' is quite limited in' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the functions it can define.  The result has to be computable as a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "single expression, which means you can't have multiway" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'if... elif... else' Literal.String
@@ -2400,22 +2400,22 @@
 'try... except' Literal.String
 '``'          Literal.String
 ' statements.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'If you try to do too much in a ' Text
 '``'          Literal.String
 'lambda'      Literal.String
 '``'          Literal.String
 " statement, you'll end up" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "with an overly complicated expression that's hard to read.  Quick," Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "what's the following code doing?" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2427,10 +2427,10 @@
 '\n'          Literal.String
 
 'You can figure it out, but it takes time to disentangle the expression' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "to figure out what's going on.  Using a short nested" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'def'         Literal.String
@@ -2482,56 +2482,56 @@
 'for'         Literal.String
 '``'          Literal.String
 ' loops.'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Fredrik Lundh once suggested the following set of rules for refactoring ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'uses of '    Text
 '``'          Literal.String
 'lambda'      Literal.String
 '``'          Literal.String
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 '1)'          Literal.Number
 ' Write a lambda function.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2)'          Literal.Number
 ' Write a comment explaining what the heck that lambda does.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '3)'          Literal.Number
 ' Study the comment for a while, and think of a name that captures' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   the essence of the comment.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '4)'          Literal.Number
 ' Convert the lambda to a def statement, using that name.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '5)'          Literal.Number
 ' Remove the comment.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "I really like these rules, but you're free to disagree that this " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'lambda-free style is better.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The itertools module' Generic.Heading
 '\n'          Text
@@ -2539,46 +2539,46 @@
 '-----------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The '        Text
 '``'          Literal.String
 'itertools'   Literal.String
 '``'          Literal.String
 ' module contains a number of commonly-used iterators' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'as well as functions for combining several iterators.  This section' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "will introduce the module's contents by showing small examples." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "The module's functions fall into a few broad classes" Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 '*'           Literal.Number
 ' Functions that create a new iterator based on an existing iterator.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 " Functions for treating an iterator's elements as function arguments." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 " Functions for selecting portions of an iterator's output." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 " A function for grouping an iterator's output." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Creating new iterators' Generic.Heading
 '\n'          Text
@@ -2586,16 +2586,16 @@
 "''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'itertools.count(n)' Literal.String
 '``'          Literal.String
 ' returns an infinite stream of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'integers, increasing by 1 each time.  You can optionally supply the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'starting number, which defaults to 0' Text
 '::'          Literal.String.Escape
@@ -2611,15 +2611,15 @@
 'itertools.cycle(iter)' Literal.String
 '``'          Literal.String
 ' saves a copy of the contents of a provided' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'iterable and returns a new iterator that returns its elements from' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'first to last.  The new iterator will repeat these elements infinitely.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2637,16 +2637,16 @@
 '``'          Literal.String
 'n'           Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'times, or returns the element endlessly if ' Text
 '``'          Literal.String
 'n'           Literal.String
 '``'          Literal.String
 ' is not provided.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2661,18 +2661,18 @@
 'itertools.chain(iterA, iterB, ...)' Literal.String
 '``'          Literal.String
 ' takes an arbitrary number of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'iterables as input, and returns all the elements of the first' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'iterator, then all the elements of the second, and so on, until all of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the iterables have been exhausted.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2687,7 +2687,7 @@
 'itertools.izip(iterA, iterB, ...)' Literal.String
 '``'          Literal.String
 ' takes one element from each iterable' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and returns them in a tuple' Text
 '::'          Literal.String.Escape
@@ -2704,35 +2704,35 @@
 'zip()'       Literal.String
 '``'          Literal.String
 " function, but doesn't" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'construct an in-memory list and exhaust all the input iterators before' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "returning; instead tuples are constructed and returned only if they're" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'requested.  (The technical term for this behaviour is ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`lazy evaluation ' Literal.String
 '<http://en.wikipedia.org/wiki/Lazy_evaluation>' Literal.String.Interpol
 '`__'         Literal.String
 '.)'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This iterator is intended to be used with iterables that are all of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the same length.  If the iterables are of different lengths, the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'resulting stream will be the same length as the shortest iterable.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2744,53 +2744,53 @@
 "      ('a', 1), ('b', 2)\n\n" Literal.String
 
 'You should avoid doing this, though, because an element may be taken' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "from the longer iterators and discarded.  This means you can't go on" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'to use the iterators further because you risk skipping a discarded' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'element.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'itertools.islice(iter, [start], stop, [step])' Literal.String
 '``'          Literal.String
 ' returns a stream' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "that's a slice of the iterator.  With a single " Text
 '``'          Literal.String
 'stop'        Literal.String
 '``'          Literal.String
 ' argument, ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'it will return the first ' Text
 '``'          Literal.String
 'stop'        Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 "elements.  If you supply a starting index, you'll get " Text
 '``'          Literal.String
 'stop-start'  Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elements, and if you supply a value for ' Text
 '``'          Literal.String
 'step'        Literal.String
 '``'          Literal.String
 ', elements will be' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "skipped accordingly.  Unlike Python's string and list slicing, you" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "can't use negative values for " Text
 '``'          Literal.String
@@ -2805,9 +2805,9 @@
 'step'        Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2825,28 +2825,28 @@
 '``'          Literal.String
 'n'           Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'independent iterators that will all return the contents of the source' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "iterator.  If you don't supply a value for " Text
 '``'          Literal.String
 'n'           Literal.String
 '``'          Literal.String
 ', the default is 2.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Replicating iterators requires saving some of the contents of the source' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'iterator, so this can consume significant memory if the iterator is large' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and one of the new iterators is consumed more than the others.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -2863,21 +2863,21 @@
 "'''''''''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Two functions are used for calling other functions on the contents of an' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'iterable.'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'itertools.imap(f, iterA, iterB, ...)' Literal.String
 '``'          Literal.String
 ' returns '   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a stream containing ' Text
 '``'          Literal.String
@@ -2897,16 +2897,16 @@
 'operator'    Literal.String
 '``'          Literal.String
 ' module contains a set of functions ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "corresponding to Python's operators.  Some examples are " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'operator.add(a, b)' Literal.String
 '``'          Literal.String
 ' (adds two values), ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'operator.ne(a, b)' Literal.String
@@ -2916,38 +2916,38 @@
 'a!=b'        Literal.String
 '``'          Literal.String
 '),'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and '        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 "operator.attrgetter('id')" Literal.String
 '``'          Literal.String
 ' (returns a callable that' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'fetches the ' Text
 '``'          Literal.String
 '"id"'        Literal.String
 '``'          Literal.String
 ' attribute).' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'itertools.starmap(func, iter)' Literal.String
 '``'          Literal.String
 ' assumes that the iterable will ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'return a stream of tuples, and calls ' Text
 '``'          Literal.String
 'f()'         Literal.String
 '``'          Literal.String
 ' using these tuples as the ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'arguments'   Text
 '::'          Literal.String.Escape
@@ -2965,21 +2965,21 @@
 "''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Another group of functions chooses a subset of an iterator's elements" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'based on a predicate.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'itertools.ifilter(predicate, iter)' Literal.String
 '``'          Literal.String
 ' returns all the elements for' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'which the predicate returns true' Text
 '::'          Literal.String.Escape
@@ -2995,7 +2995,7 @@
 'itertools.ifilterfalse(predicate, iter)' Literal.String
 '``'          Literal.String
 ' is the opposite, ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'returning all elements for which the predicate returns false' Text
 '::'          Literal.String.Escape
@@ -3011,15 +3011,15 @@
 'itertools.takewhile(predicate, iter)' Literal.String
 '``'          Literal.String
 ' returns elements for as long' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'as the predicate returns true.  Once the predicate returns false, ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the iterator will signal the end of its results.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -3034,15 +3034,15 @@
 'itertools.dropwhile(predicate, iter)' Literal.String
 '``'          Literal.String
 ' discards elements while the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "predicate returns true, and then returns the rest of the iterable's" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'results.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -3059,7 +3059,7 @@
 "'''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "The last function I'll discuss, " Text
 '``'          Literal.String
@@ -3070,35 +3070,35 @@
 'key_func(elem)' Literal.String
 '``'          Literal.String
 ' is a'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function that can compute a key value for each element returned by the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "iterable.  If you don't supply a key function, the key is simply each" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'element itself.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'groupby()'   Literal.String
 '``'          Literal.String
 ' collects all the consecutive elements from the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'underlying iterable that have the same key value, and returns a stream' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of 2-tuples containing a key value and an iterator for the elements' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'with that key.  ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -3113,20 +3113,20 @@
 'groupby()'   Literal.String
 '``'          Literal.String
 " assumes that the underlying iterable's contents will" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'already be sorted based on the key.  Note that the returned iterators' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'also use the underlying iterable, so you have to consume the results' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of iterator-1 before requesting iterator-2 and its corresponding key.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The functools module' Generic.Heading
 '\n'          Text
@@ -3134,51 +3134,51 @@
 '----------------------------------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The '        Text
 '``'          Literal.String
 'functools'   Literal.String
 '``'          Literal.String
 ' module in Python 2.5 contains some higher-order' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'functions.  A ' Text
 '**higher-order function**' Generic.Strong
 ' takes one or more functions as' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'input and returns a new function.  The most useful tool in this module' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'is the '     Text
 '``'          Literal.String
 'partial()'   Literal.String
 '``'          Literal.String
 ' function.'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "For programs written in a functional style, you'll sometimes want to" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'construct variants of existing functions that have some of the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'parameters filled in.  Consider a Python function ' Text
 '``'          Literal.String
 'f(a, b, c)'  Literal.String
 '``'          Literal.String
 '; you'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'may wish to create a new function ' Text
 '``'          Literal.String
 'g(b, c)'     Literal.String
 '``'          Literal.String
 " that's equivalent to" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'f(1, b, c)'  Literal.String
@@ -3188,12 +3188,12 @@
 'f()'         Literal.String
 '``'          Literal.String
 "'s parameters.  " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This is called "partial function application".' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The constructor for ' Text
 '``'          Literal.String
@@ -3204,19 +3204,19 @@
 '(function, arg1,\narg2, ... kwarg1=value1, kwarg2=value2)' Literal.String
 '``'          Literal.String
 '.  The resulting object is' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'callable, so you can just call it to invoke ' Text
 '``'          Literal.String
 'function'    Literal.String
 '``'          Literal.String
 ' with the'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'filled-in arguments.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Here's a small but realistic example" Text
 '::'          Literal.String.Escape
@@ -3234,29 +3234,29 @@
 '-------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The '        Text
 '``'          Literal.String
 'operator'    Literal.String
 '``'          Literal.String
 ' module was mentioned earlier.  It contains a set of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "functions corresponding to Python's operators.  These functions " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'are often useful in functional-style code because they save you ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'from writing trivial functions that perform a single operation.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Some of the functions in this module are' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -3284,14 +3284,14 @@
 'floordiv()'  Literal.String
 '``'          Literal.String
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 '``'          Literal.String
 'abs()'       Literal.String
 '``'          Literal.String
 ', ...'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 ' Logical operations' Text
@@ -3305,7 +3305,7 @@
 'truth()'     Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 ' Bitwise operations' Text
@@ -3323,7 +3323,7 @@
 'invert()'    Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 ' Comparisons' Text
@@ -3353,7 +3353,7 @@
 'ge()'        Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Literal.Number
 ' Object identity' Text
@@ -3367,25 +3367,25 @@
 'is_not()'    Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Consult '    Text
 "`the operator module's documentation " Literal.String
 '<http://docs.python.org/lib/module-operator.html>' Literal.String.Interpol
 '`__'         Literal.String
 ' for a complete' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'list.'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The functional module' Generic.Heading
 '\n'          Text
@@ -3393,31 +3393,31 @@
 '---------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Collin Winter's " Text
 '`functional module ' Literal.String
 '<http://oakwinter.com/code/functional/>' Literal.String.Interpol
 '`__'         Literal.String
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'provides a number of more' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'advanced tools for functional programming. It also reimplements' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'several Python built-ins, trying to make them more intuitive to those' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'used to functional programming in other languages.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This section contains an introduction to some of the most important' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'functions in ' Text
 '``'          Literal.String
@@ -3426,30 +3426,30 @@
 '; full documentation can be found at ' Text
 '`'           Text
 'the'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "project's website <http" Text
 ':'           Text
 '//oakwinter.com/code/functional/documentation/>' Text
 '`'           Text
 '__.'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'compose(outer, inner, unpack=False)' Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The '        Text
 '``'          Literal.String
 'compose()'   Literal.String
 '``'          Literal.String
 ' function implements function composition.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'In other words, it returns a wrapper around the ' Text
 '``'          Literal.String
@@ -3460,7 +3460,7 @@
 'inner'       Literal.String
 '``'          Literal.String
 ' callables, such' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'that the return value from ' Text
 '``'          Literal.String
@@ -3471,9 +3471,9 @@
 'outer'       Literal.String
 '``'          Literal.String
 '.  That is,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -3485,9 +3485,9 @@
 '        ...     return a + b\n        ...\n        >>> def double(a):\n        ...     return 2 * a\n        ...\n        >>> compose(double, add)(5, 6)\n        22\n\n' Literal.String
 
 'is equivalent to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -3503,13 +3503,13 @@
 'unpack'      Literal.String
 '``'          Literal.String
 ' keyword is provided to work around the fact that Python functions are not always' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`fully curried ' Literal.String
 '<http://en.wikipedia.org/wiki/Currying>' Literal.String.Interpol
 '`__'         Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'By default, it is expected that the ' Text
 '``'          Literal.String
@@ -3519,7 +3519,7 @@
 '``'          Literal.String
 'outer'       Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function will take a single argument. Setting the ' Text
 '``'          Literal.String
@@ -3530,7 +3530,7 @@
 'compose'     Literal.String
 '``'          Literal.String
 ' to expect a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tuple from ' Text
 '``'          Literal.String
@@ -3541,9 +3541,9 @@
 'outer'       Literal.String
 '``'          Literal.String
 '. Put simply,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -3565,9 +3565,9 @@
 '                    \n' Literal.String
 
 'while'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -3593,10 +3593,10 @@
 'compose()'   Literal.String
 '``'          Literal.String
 " only accepts two functions, it's trivial to" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "build up a version that will compose any number of functions. We'll" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'use '        Text
 '``'          Literal.String
@@ -3611,7 +3611,7 @@
 'partial()'   Literal.String
 '``'          Literal.String
 ' (the last of which' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'is provided by both ' Text
 '``'          Literal.String
@@ -3622,9 +3622,9 @@
 'functools'   Literal.String
 '``'          Literal.String
 ').'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -3636,7 +3636,7 @@
 '        \n        multi_compose = partial(reduce, compose)\n        \n' Literal.String
 
 '    '        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'We can also use ' Text
 '``'          Literal.String
@@ -3651,7 +3651,7 @@
 'partial()'   Literal.String
 '``'          Literal.String
 ' to craft a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'version of ' Text
 '``'          Literal.String
@@ -3670,10 +3670,10 @@
 '``'          Literal.String
 'flip(func)'  Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                    ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'flip()'      Literal.String
@@ -3683,12 +3683,12 @@
 'func'        Literal.String
 '``'          Literal.String
 ' and  '      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'causes it to receive its non-keyword arguments in reverse order.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '::'          Literal.String.Escape
 '\n\n'        Text
@@ -3702,27 +3702,27 @@
 '``'          Literal.String
 'foldl(func, start, iterable)' Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '                    ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'foldl()'     Literal.String
 '``'          Literal.String
 " takes a binary function, a starting value (usually some kind of 'zero'), and an iterable." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The function is applied to the starting value and the first element of the list, then the result of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'that and the second element of the list, then the result of that and the third element of the list,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and so on.'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This means that a call such as' Text
 '::'          Literal.String.Escape
@@ -3745,7 +3745,7 @@
 '\n'          Literal.String
 
 '    '        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'foldl()'     Literal.String
@@ -3769,7 +3769,7 @@
 'reduce'      Literal.String
 '``'          Literal.String
 ' like'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'so'          Text
 '::'          Literal.String.Escape
@@ -3794,10 +3794,10 @@
 'partial()'   Literal.String
 '``'          Literal.String
 ' to'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "write a cleaner, more aesthetically-pleasing version of Python's" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 '"".join(...)' Literal.String
@@ -3818,57 +3818,57 @@
 '------------------------------------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The author would like to thank the following people for offering' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'suggestions, corrections and assistance with various drafts of this' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'article'     Text
 ':'           Text
 ' Ian Bicking, Nick Coghlan, Nick Efford, Raymond Hettinger,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Jim Jewett, Mike Krell, Leandro Lameiro, Jussi Salmela, ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Collin Winter, Blake Winton.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Version 0.1' Text
 ':'           Text
 ' posted June 30 2006.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Version 0.11' Text
 ':'           Text
 ' posted July 1 2006.  Typo fixes.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Version 0.2' Text
 ':'           Text
 ' posted July 10 2006.  Merged genexp and listcomp' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sections into one.  Typo fixes.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Version 0.21' Text
 ':'           Text
 ' Added more references suggested on the tutor mailing list.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Version 0.30' Text
 ':'           Text
@@ -3877,17 +3877,17 @@
 'functional'  Literal.String
 '``'          Literal.String
 ' module written by' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Collin Winter; adds short section on the operator module; a few other' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'edits.'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'References'  Generic.Heading
 '\n'          Text
@@ -3895,7 +3895,7 @@
 '--------------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'General'     Generic.Heading
 '\n'          Text
@@ -3903,84 +3903,84 @@
 "'''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '**Structure and Interpretation of Computer Programs**' Generic.Strong
 ', by '       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Harold Abelson and Gerald Jay Sussman with Julie Sussman.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Full text at http' Text
 ':'           Text
 '//mitpress.mit.edu/sicp/.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'In this classic textbook of computer science,  chapters 2 and 3 discuss the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'use of sequences and streams to organize the data flow inside a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'program.  The book uses Scheme for its examples, but many of the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'design approaches described in these chapters are applicable to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'functional-style Python code.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http'        Text
 ':'           Text
 '//www.defmacro.org/ramblings/fp.html' Text
 ':'           Text
 ' A general ' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'introduction to functional programming that uses Java examples' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and has a lengthy historical introduction.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http'        Text
 ':'           Text
 '//en.wikipedia.org/wiki/Functional_programming' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'General Wikipedia entry describing functional programming.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http'        Text
 ':'           Text
 '//en.wikipedia.org/wiki/Coroutine' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Entry for coroutines.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http'        Text
 ':'           Text
 '//en.wikipedia.org/wiki/Currying' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Entry for the concept of currying.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Python-specific' Generic.Heading
 '\n'          Text
@@ -3988,55 +3988,55 @@
 "'''''''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http'        Text
 ':'           Text
 '//gnosis.cx/TPiP/' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "The first chapter of David Mertz's book " Text
 ':title-reference:' Name.Attribute
 '`Text Processing in Python`' Name.Variable
 ' '           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'discusses functional programming for text processing, in the section titled' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"Utilizing Higher-Order Functions in Text Processing".' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Mertz also wrote a 3-part series of articles on functional programming' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "for IBM's DeveloperWorks site; see " Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`part 1 '    Literal.String
 '<http://www-128.ibm.com/developerworks/library/l-prog.html>' Literal.String.Interpol
 '`__'         Literal.String
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`part 2 '    Literal.String
 '<http://www-128.ibm.com/developerworks/library/l-prog2.html>' Literal.String.Interpol
 '`__'         Literal.String
 ', and'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`part 3 '    Literal.String
 '<http://www-128.ibm.com/developerworks/linux/library/l-prog3.html>' Literal.String.Interpol
 '`__'         Literal.String
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Python documentation' Generic.Heading
 '\n'          Text
@@ -4044,65 +4044,65 @@
 "'''''''''''''''''''''''''''" Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http'        Text
 ':'           Text
 '//docs.python.org/lib/module-itertools.html' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Documentation for the ' Text
 '``'          Literal.String
 'itertools'   Literal.String
 '``'          Literal.String
 ' module.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http'        Text
 ':'           Text
 '//docs.python.org/lib/module-operator.html' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Documentation for the ' Text
 '``'          Literal.String
 'operator'    Literal.String
 '``'          Literal.String
 ' module.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http'        Text
 ':'           Text
 '//www.python.org/dev/peps/pep-0289/' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PEP 289'     Text
 ':'           Text
 ' "Generator Expressions"' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http'        Text
 ':'           Text
 '//www.python.org/dev/peps/pep-0342/' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'PEP 342'     Text
 ':'           Text
 ' "Coroutines via Enhanced Generators" describes the new generator' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'features in Python 2.5.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 ".. comment\n\n    Topics to place\n    -----------------------------\n\n    XXX os.walk()\n\n    XXX Need a large example.\n\n    But will an example add much?  I'll post a first draft and see\n    what the comments say.\n\n" Comment.Preproc
 
diff --git a/tests/examplefiles/rst/jinjadesignerdoc.rst.output b/tests/examplefiles/rst/jinjadesignerdoc.rst.output
index 795d754293..778d4d7de9 100644
--- a/tests/examplefiles/rst/jinjadesignerdoc.rst.output
+++ b/tests/examplefiles/rst/jinjadesignerdoc.rst.output
@@ -7,12 +7,12 @@
 '======================' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This part of the Jinja documentaton is meant for template designers.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Basics'      Generic.Heading
 '\n'          Text
@@ -20,30 +20,30 @@
 '======'      Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The Jinja template language is designed to strike a balance between content' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and application logic. Nevertheless you can use a python like statement' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "language. You don't have to know how Python works to create Jinja templates," Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'but if you know it you can use some additional statements you may know from' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Python.'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Here is a small example template' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -227,7 +227,7 @@
 '\n\n'        Text
 
 'This covers the default settings. The application developer might have changed' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the syntax from ' Text
 '``'          Literal.String
@@ -238,54 +238,54 @@
 '<% foo %>'   Literal.String
 '``'          Literal.String
 ' or something similar. This' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'documentation just covers the default values.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'A variable looks like ' Text
 '``'          Literal.String
 '{{ foobar }}' Literal.String
 '``'          Literal.String
 ' where foobar is the variable name. Inside' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of statements (' Text
 '``'          Literal.String
 '{% some content here %}' Literal.String
 '``'          Literal.String
 ') variables are just normal names' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'without the braces around it. In fact ' Text
 '``'          Literal.String
 '{{ foobar }}' Literal.String
 '``'          Literal.String
 ' is just an alias for' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the statement ' Text
 '``'          Literal.String
 '{% print foobar %}' Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Variables are coming from the context provided by the application. Normally there' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'should be a documentation regarding the context contents but if you want to know' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the content of the current context, you can add this to your template' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -315,19 +315,19 @@
 '\n\n'        Text
 
 "A context isn't flat which means that each variable can has subvariables, as long" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'as it is representable as python data structure. You can access attributes of' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a variable using the dot and bracket operators. The following examples show' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'this'        Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -396,16 +396,16 @@
 '======='     Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'In the examples above you might have noticed the pipe symbols. Pipe symbols tell' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the engine that it has to apply a filter on the variable. Here is a small example' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -434,15 +434,15 @@
 '\n\n'        Other
 
 'If you want, you can also put whitespace between the filters.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This will look for a variable ' Text
 '`variable`'  Name.Variable
 ', pass it to the filter ' Text
 '`replace`'   Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'with the arguments ' Text
 '``'          Literal.String
@@ -453,27 +453,27 @@
 "'bar'"       Literal.String
 '``'          Literal.String
 ', and pass the result to the filter' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`escape`'    Name.Variable
 ' that automatically XML-escapes the value. The ' Text
 '`e`'         Name.Variable
 ' filter is an alias for' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`escape`'    Name.Variable
 '. Here is the complete list of supported filters' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '['           Text
 '['           Text
 'list_of_filters]]' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -481,21 +481,21 @@
 '::'          Punctuation
 ' '           Text
 'note'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    Filters have a pretty low priority. If you want to add fitered values' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    you have to put them into parentheses. The same applies if you want to access' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    attributes' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    ..'      Punctuation
 ' '           Text
@@ -587,15 +587,15 @@
 '====='       Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You can use the ' Text
 '`is`'        Name.Variable
 ' operator to perform tests on a value' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -645,16 +645,16 @@
 'These tests are especially useful when used in ' Text
 '`if`'        Name.Variable
 ' conditions.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '['           Text
 '['           Text
 'list_of_tests]]' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Global Functions' Generic.Heading
 '\n'          Text
@@ -662,52 +662,52 @@
 '================' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Test functions and filter functions live in their own namespace. Global' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'functions not. They behave like normal objects in the context. Beside the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'functions added by the application or framewhere there are two functions' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'available per default' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`range`'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    Works like the python ' Text
 '`range function`_' Literal.String
 " just that it doesn't support" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    ranges greater than ' Text
 '``'          Literal.String
 '1000000'     Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`debug`'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    Function that outputs the contents of the context.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Loops'       Generic.Heading
 '\n'          Text
@@ -715,20 +715,20 @@
 '====='       Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'To iterate over a sequence, you can use the ' Text
 '`for`'       Name.Variable
 ' loop. It basically looks like a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'normal Python ' Text
 '`for`'       Name.Variable
 ' loop and works pretty much the same' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -850,143 +850,143 @@
 'else'        Literal.String
 '``'          Literal.String
 ' block only' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'executed if there was no iteration because the sequence was empty.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Inside of a ' Text
 '`for`'       Name.Variable
 ' loop block you can access some special variables' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' Variable             | Description                            |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+======================+========================================+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.index`' Name.Variable
 '         | The current iteration of the loop.     |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.index0`' Name.Variable
 '        | The current iteration of the loop,     |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 '                      | starting counting by 0.                |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.revindex`' Name.Variable
 '      | The number of iterations from the end  |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 '                      | of the loop.                           |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.revindex0`' Name.Variable
 '     | The number of iterations from the end  |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 '                      | of the loop, starting counting by 0.   |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.first`' Name.Variable
 '         | True if first iteration.               |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.last`' Name.Variable
 '          | True if last iteration.                |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.even`' Name.Variable
 '          | True if current iteration is even.     |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.odd`'  Name.Variable
 '           | True if current iteration is odd.      |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.length`' Name.Variable
 '        | Total number of items in the sequence. |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 ' '           Text
 '`loop.parent`' Name.Variable
 '        | The context of the parent loop.        |' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+----------------------+----------------------------------------+' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Loops also support recursion. Let's assume you have a sitemap where each item" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'might have a number of child items. A template for that could look like this' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -1116,7 +1116,7 @@
 '\n\n'        Text
 
 'What happens here? Basically the first thing that is different to a normal' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'loop is the additional ' Text
 '``'          Literal.String
@@ -1125,20 +1125,20 @@
 ' modifier in the ' Text
 '`for`'       Name.Variable
 '-loop declaration.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'It tells the template engine that we want recursion. If recursion is enabled' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the special ' Text
 '`loop`'      Name.Variable
 ' variable is callable. If you call it with a sequence it will' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'automatically render the loop at that position with the new sequence as argument.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Cycling'     Generic.Heading
 '\n'          Text
@@ -1146,22 +1146,22 @@
 '======='     Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Sometimes you might want to have different text snippets for each row in a list,' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for example to have alternating row colors. You can easily do this by using the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 '{% cycle %}' Literal.String
 '``'          Literal.String
 ' tag'        Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -1246,16 +1246,16 @@
 'Each time Jinja encounters a ' Text
 '`cycle`'     Name.Variable
 ' tag it will cycle through the list' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of given items and return the next one. If you pass it one item jinja assumes' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'that this item is a sequence from the context and uses this' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -1294,7 +1294,7 @@
 '=========='  Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Jinja supports Python-like ' Text
 '`if`'        Name.Variable
@@ -1304,9 +1304,9 @@
 '`else`'      Name.Variable
 ' constructs' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -1391,18 +1391,18 @@
 '\n\n'        Other
 
 'If the user is active the first block is rendered. If not and the user was' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'deleted the second one, in all other cases the third one.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You can also use comparison operators' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -1488,30 +1488,30 @@
 '::'          Punctuation
 ' '           Text
 'Note'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    Of course you can use ' Text
 '`or`'        Name.Variable
 ' / '         Text
 '`and`'       Name.Variable
 ' and parentheses to create more complex' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    conditions, but usually the logic is already handled in the application and' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "    you don't have to create such complex constructs in the template code. However" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    in some situations it might be a good thing to have the abilities to create' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    them.'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Operators'   Generic.Heading
 '\n'          Text
@@ -1519,7 +1519,7 @@
 '========='   Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Inside '     Text
 '``'          Literal.String
@@ -1528,23 +1528,23 @@
 ' blocks, '   Text
 '`if`'        Name.Variable
 ' conditions and many other parts you can' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'can use expressions. In expressions you can use any of the following operators' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    ======= ===================================================================' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 '+'           Literal.String
 '``'          Literal.String
 '   add the right operand to the left one.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text
 '``'          Literal.String
@@ -1555,14 +1555,14 @@
 '3'           Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 '-'           Literal.String
 '``'          Literal.String
 '   subtract the right operand from the left one.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text
 '``'          Literal.String
@@ -1573,14 +1573,14 @@
 '0'           Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 '/'           Literal.String
 '``'          Literal.String
 '   divide the left operand by the right one.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text
 '``'          Literal.String
@@ -1591,14 +1591,14 @@
 '0.5'         Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 '*'           Literal.String
 '``'          Literal.String
 '   multiply the left operand with the right one.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text
 '``'          Literal.String
@@ -1609,14 +1609,14 @@
 '4'           Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 '**'          Literal.String
 '``'          Literal.String
 '  raise the left operand to the power of the right' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            operand. ' Text
 '``'          Literal.String
@@ -1627,7 +1627,7 @@
 '8'           Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
@@ -1638,51 +1638,51 @@
 '{{ 1 in [1,2,3] }}' Literal.String
 '``'          Literal.String
 ' would'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            return true.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 'is'          Literal.String
 '``'          Literal.String
 '  perform a test on the value. See the section about' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            tests for more information.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 '|'           Literal.String
 '``'          Literal.String
 '   apply a filter on the value. See the section about' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            filters for more information.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 'and'         Literal.String
 '``'          Literal.String
 ' return true if the left and the right operand is true.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 'or'          Literal.String
 '``'          Literal.String
 '  return true if the left or the right operand is true.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
 'not'         Literal.String
 '``'          Literal.String
 ' negate a statement (see below)' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '``'          Literal.String
@@ -1695,7 +1695,7 @@
 '{{ user.get_username() }}' Literal.String
 '``'          Literal.String
 '. Inside of the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            parentheses you can use variables' Text
 ':'           Text
@@ -1704,15 +1704,15 @@
 '{{ user.get(username) }}' Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    ======= ===================================================================' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Note that there is no support for any bit operations or something similar.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -1725,7 +1725,7 @@
 ' and '       Text
 '`in`'        Name.Variable
 ' operators support negation' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  using an infix notation too' Text
 ':'           Text
@@ -1737,7 +1737,7 @@
 '``'          Literal.String
 'foo not in bar' Literal.String
 '``'          Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  instead of ' Text
 '``'          Literal.String
@@ -1748,7 +1748,7 @@
 'not foo in bar' Literal.String
 '``'          Literal.String
 '. All other expressions' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  require a prefix notation' Text
 ':'           Text
@@ -1757,9 +1757,9 @@
 'not (foo and bar)' Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Boolean Values' Generic.Heading
 '\n'          Text
@@ -1767,12 +1767,12 @@
 '==============' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'In If-Conditions Jinja performs a boolean check. All empty values (eg' Text
 ':'           Text
 ' empty'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'lists '      Text
 '``'          Literal.String
@@ -1785,7 +1785,7 @@
 ' etc) evaluate to ' Text
 '`false`'     Name.Variable
 '. Numbers that are' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'equal to '   Text
 '`0`'         Name.Variable
@@ -1794,23 +1794,23 @@
 ' are considered ' Text
 '`false`'     Name.Variable
 ' too. The boolean value of other' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'objects depends on the behavior the application developer gave it. Usually' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'items are '  Text
 '`true`'      Name.Variable
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Here some examples that should explain it' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -1882,13 +1882,13 @@
 '======='     Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Some objects support slicing operations. For example lists' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -1971,12 +1971,12 @@
 
 'For more informations about slicing have a look at the ' Text
 '`slicing chapter`_' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'in the "Dive into Python" e-book.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Macros'      Generic.Heading
 '\n'          Text
@@ -1984,16 +1984,16 @@
 '======'      Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'If you want to use a partial template in more than one place, you might want to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'create a macro from it' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2073,9 +2073,9 @@
 
 'Now you can use it from everywhere in the code by passing it an item' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2121,9 +2121,9 @@
 
 'You can also specify more than one value' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2235,28 +2235,28 @@
 '===========' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The most powerful part of Jinja is template inheritance. Template inheritance' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'allows you to build a base "skeleton" template that contains all the common' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'elements of your site and defines ' Text
 '**blocks**'  Generic.Strong
 ' that child templates can override.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Sounds complicated but is very basic. It's easiest to understand it by starting" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'with an example.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Base Template' Generic.Heading
 '\n'          Text
@@ -2264,23 +2264,23 @@
 '-------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "This template, which we'll call " Text
 '``'          Literal.String
 'base.html'   Literal.String
 '``'          Literal.String
 ', defines a simple HTML skeleton' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "document that you might use for a simple two-column page. It's the job of" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"child" templates to fill the empty blocks with content' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2487,17 +2487,17 @@
 '{% block %}' Literal.String
 '``'          Literal.String
 ' tags define four blocks that child templates' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'can fill in. All the ' Text
 '`block`'     Name.Variable
 ' tag does is to tell the template engine that a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'child template may override those portions of the template.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Child Template' Generic.Heading
 '\n'          Text
@@ -2505,13 +2505,13 @@
 '--------------' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'A child template might look like this' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2666,30 +2666,30 @@
 '{% extends %}' Literal.String
 '``'          Literal.String
 ' tag is the key here. It tells the template engine that' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'this template "extends" another template. When the template system evaluates' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'this template, first it locates the parent.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The filename of the template depends on the template loader. For example the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '``'          Literal.String
 'FileSystemLoader' Literal.String
 '``'          Literal.String
 ' allows you to access other templates by giving the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'filename. You can access templates in subdirectories with an slash' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2710,21 +2710,21 @@
 '\n\n'        Other
 
 'But this behavior can depend on the application using Jinja.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Note that since the child template didn't define the " Text
 '``'          Literal.String
 'footer'      Literal.String
 '``'          Literal.String
 ' block, the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'value from the parent template is used instead.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2732,39 +2732,39 @@
 '::'          Punctuation
 ' '           Text
 'Note'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 "    You can't define multiple " Text
 '``'          Literal.String
 '{% block %}' Literal.String
 '``'          Literal.String
 ' tags with the same name in the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    same template. This limitation exists because a block tag works in "both"' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "    directions. That is, a block tag doesn't just provide a hole to fill - it" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    also defines the content that fills the hole in the ' Text
 '*parent*'    Generic.Emph
 '. If there were' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    two similarly-named ' Text
 '``'          Literal.String
 '{% block %}' Literal.String
 '``'          Literal.String
 " tags in a template, that template's" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "    parent wouldn't know which one of the blocks' content to use." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Template Inclusion' Generic.Heading
 '\n'          Text
@@ -2772,26 +2772,26 @@
 '==================' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You can load another template at a given position using ' Text
 '``'          Literal.String
 '{% include %}' Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "Usually it's a better idea to use inheritance but if you for example want to" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'load macros, ' Text
 '`include`'   Name.Variable
 ' works better than ' Text
 '`extends`'   Name.Variable
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2831,12 +2831,12 @@
 'myhelpers.html' Literal.String
 '``'          Literal.String
 ', you can now' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'use it from the template as shown above.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Filtering Blocks' Generic.Heading
 '\n'          Text
@@ -2844,16 +2844,16 @@
 '================' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Sometimes it could be a good idea to filter a complete block of text. For' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'example, if you want to escape some html code' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2892,9 +2892,9 @@
 
 'Of course you can chain filters too' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2932,9 +2932,9 @@
 '"&lt;b&gt;some text&lt;/b&gt;"' Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Defining Variables' Generic.Heading
 '\n'          Text
@@ -2942,7 +2942,7 @@
 '==================' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You can also define variables in the namespace using the ' Text
 '``'          Literal.String
@@ -2950,9 +2950,9 @@
 '``'          Literal.String
 ' tag'        Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -2989,9 +2989,9 @@
 'foobar'      Literal.String
 '``'          Literal.String
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Scopes'      Generic.Heading
 '\n'          Text
@@ -2999,19 +2999,19 @@
 '======'      Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Jinja has multiple scopes. A scope is something like a new transparent foil on' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'a stack of foils. You can only write to the outermost foil but read all of them' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'since you can look through them. If you remove the top foil all data on that' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foil disappears. Some tags in Jinja add a new layer to the stack. Currently' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'these are '  Text
 '`block`'     Name.Variable
@@ -3022,16 +3022,16 @@
 ' and '       Text
 '`filter`'    Name.Variable
 '. This means that variables and' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'other elements defined inside a macro, loop or some of the other tags listed' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'above will be only available in that block. Here an example' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3107,39 +3107,39 @@
 'angryname'   Literal.String
 '``'          Literal.String
 ' just exists inside the macro, not outside it.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Defined macros appear on the context as variables. Because of this, they are' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'affected by the scoping too. A macro defined inside of a macro is just available' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "in those two macros (the macro itself and the macro it's defined in). For " Text
 '`set`'       Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'and '        Text
 '`macro`'     Name.Variable
 ' two additional rules exist' Text
 ':'           Text
 ' If a macro is defined in an extended' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'template but outside of a visible block (thus outside of any block) will be' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'available in all blocks below. This allows you to use ' Text
 '`include`'   Name.Variable
 ' statements to' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'load often used macros at once.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Undefined Variables' Generic.Heading
 '\n'          Text
@@ -3147,44 +3147,44 @@
 '===================' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'If you have already worked with python you probably know about the fact that' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'undefined variables raise an exception. This is different in Jinja. There is a' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'special value called ' Text
 '`undefined`' Name.Variable
 ' that represents values that do not exist.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'This special variable works complete different from any variables you maybe' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'know. If you print it using ' Text
 '``'          Literal.String
 '{{ variable }}' Literal.String
 '``'          Literal.String
 " it will not appear because it's" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'literally empty. If you try to iterate over it, it will work. But no items' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'are returned. Comparing this value to any other value results in ' Text
 '`false`'     Name.Variable
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Even if you compare it to itself' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3230,7 +3230,7 @@
 '    will return true.\n\n' Other
 
 'There are also some additional rules regarding this special value. Any' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'mathematical operators (' Text
 '``'          Literal.String
@@ -3249,13 +3249,13 @@
 '/'           Literal.String
 '``'          Literal.String
 ') return the operand' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'as result'   Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3301,13 +3301,13 @@
 ' evaluates to ' Text
 '`false`'     Name.Variable
 '. It has no length, all' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'attribute calls return undefined, calling too' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3342,21 +3342,21 @@
 '========'    Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Sometimes you might want to add Jinja syntax elements into the template' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'without executing them. In that case you have quite a few possibilities.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'For small parts this might be a good way' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3380,9 +3380,9 @@
 '``'          Literal.String
 ' block'      Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3432,24 +3432,24 @@
 '=================' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Jinja has some keywords you cannot use a variable names. This limitation' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "exists to make look coherent. Syntax highlighters won't mess things up and" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "you will don't have unexpected output." Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The following keywords exist and cannot be used as identifiers' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '`and`'       Name.Variable
@@ -3466,7 +3466,7 @@
 ', '          Text
 '`endfilter`' Name.Variable
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '`endfor`'    Name.Variable
@@ -3483,7 +3483,7 @@
 ', '          Text
 '`filter`'    Name.Variable
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '`for`'       Name.Variable
@@ -3504,7 +3504,7 @@
 ', '          Text
 '`pluralize`' Name.Variable
 ','           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '`raw`'       Name.Variable
@@ -3514,18 +3514,18 @@
 '`set`'       Name.Variable
 ', '          Text
 '`trans`'     Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'If you want to use such a name you have to prefix or suffix it or use' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'alternative names' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3570,18 +3570,18 @@
 '\n\n'        Other
 
 'If future Jinja releases add new keywords those will be "light" keywords which' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "means that they won't raise an error for several releases but yield warnings" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "on the application side. But it's very unlikely that new keywords will be" Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'added.'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Internationalization' Generic.Heading
 '\n'          Text
@@ -3589,18 +3589,18 @@
 '====================' Generic.Heading
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'If the application is configured for i18n, you can define translatable blocks' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for translators using the ' Text
 '`trans`'     Name.Variable
 ' tag or the special underscore function' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3651,17 +3651,17 @@
 '\n\n'        Other
 
 'The latter one is useful if you want translatable arguments for filters etc.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'If you want to have plural forms too, use the ' Text
 '`pluralize`' Name.Variable
 ' block'      Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3780,45 +3780,45 @@
 '\n\n'        Other
 
 'If you have multiple arguments, the first one is assumed to be the indicator (the' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'number that is used to determine the correct singular or plural form. If you' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "don't have the indicator variable on position 1 you have to tell the " Text
 '`pluralize`' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tag the correct variable name.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Inside translatable blocks you cannot use blocks or expressions (however you can' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'still use the ' Text
 '``'          Literal.String
 'raw'         Literal.String
 '``'          Literal.String
 ' block which will work as expected). The variable' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print syntax (' Text
 '``'          Literal.String
 '{{ variablename }}' Literal.String
 '``'          Literal.String
 ') is the only way to insert the variables' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'defined in the ' Text
 '``'          Literal.String
 'trans'       Literal.String
 '``'          Literal.String
 ' header. Filters must be applied in the header.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3826,24 +3826,24 @@
 '::'          Punctuation
 ' '           Text
 'note'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    Please make sure that you always use pluralize blocks where required.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    Many languages have more complex plural forms than the English language.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    Never try to workaround that issue by using something like this' Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    ..'      Punctuation
 ' '           Text
@@ -3901,7 +3901,7 @@
 ' http'       Text
 ':'           Text
 '//diveintopython.org/native_data_types/lists.html#odbchelper.list.slice' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '..'          Punctuation
 ' '           Text
@@ -3909,4 +3909,4 @@
 ' http'       Text
 ':'           Text
 '//docs.python.org/tut/node6.html#SECTION006300000000000000000' Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/rts/example.rts.output b/tests/examplefiles/rts/example.rts.output
index 81f2bc24ef..9e5c3007ab 100644
--- a/tests/examplefiles/rts/example.rts.output
+++ b/tests/examplefiles/rts/example.rts.output
@@ -1,7 +1,7 @@
 '# Example of a Riverbed TrafficScript (*.rts) file.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http.setHeader' Name.Function
 '('           Operator
@@ -36,7 +36,7 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$body'       Name.Variable
 ' ='          Operator
@@ -48,14 +48,14 @@
 ';'           Operator
 ' '           Text
 '# get the POST data' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$single'     Name.Variable
 ' ='          Operator
 ' '           Text
 "'Hello \\\nworld'" Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$double'     Name.Variable
 ' ='          Operator
@@ -77,7 +77,7 @@
 'd'           Literal.String
 '"'           Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$pi'         Name.Variable
 ' ='          Operator
@@ -86,7 +86,7 @@
 '.'           Operator
 '14157'       Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$message'    Name.Variable
 ' ='          Operator
@@ -116,7 +116,7 @@
 '('           Operator
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$four'       Name.Variable
 ' ='          Operator
@@ -127,10 +127,10 @@
 ' '           Text
 '2'           Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Sets $ratio to "75%" (for example)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$ratio'      Name.Variable
 ' ='          Operator
@@ -161,7 +161,7 @@
 '%'           Literal.String
 '"'           Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$contentLength' Name.Variable
 ' ='          Operator
@@ -188,7 +188,7 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 '('           Operator
@@ -206,7 +206,7 @@
 ')'           Operator
 ' '           Text
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'log.warn'    Name.Function
@@ -239,10 +239,10 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '4'           Literal.Number
 ' '           Text
@@ -255,7 +255,7 @@
 '*'           Operator
 ' '           Text
 '$a'          Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-'           Operator
 '$b'          Name.Variable
@@ -267,7 +267,7 @@
 '-'           Operator
 ' '           Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '7'           Literal.Number
 ' '           Text
@@ -276,7 +276,7 @@
 '3'           Literal.Number
 '    '        Text
 '# Returns 1' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 'f'           Literal.String
@@ -291,7 +291,7 @@
 '0'           Literal.Number
 ' '           Text
 '# true'      Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '('           Operator
 ' '           Text
@@ -317,7 +317,7 @@
 ')'           Operator
 ' '           Text
 '# true'      Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$a'          Name.Variable
 ' '           Text
@@ -327,7 +327,7 @@
 '$b'          Name.Variable
 ' '           Text
 '# true if $a or $b is true' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0x1234'      Literal.Number
 ' '           Text
@@ -336,7 +336,7 @@
 '255'         Literal.Number
 '         '   Text
 '# 0x34'      Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number
 '|'           Operator
@@ -345,14 +345,14 @@
 '4'           Literal.Number
 ' '           Text
 '#7'          Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number
 '^'           Operator
 '3'           Literal.Number
 ' '           Text
 '#2'          Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '~'           Operator
 '1'           Literal.Number
@@ -362,7 +362,7 @@
 '0xffff'      Literal.Number
 '          '  Text
 '# 65534'     Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number
 ' '           Text
@@ -372,7 +372,7 @@
 '2'           Literal.Number
 '               ' Text
 '# 4'         Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
 ' '           Text
@@ -382,7 +382,7 @@
 '1'           Literal.Number
 '               ' Text
 '# 1'         Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$foo'        Name.Variable
 ' '           Text
@@ -392,7 +392,7 @@
 '5'           Literal.Number
 ' '           Text
 '# Product equals ($foo = $foo * 5)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$foo'        Name.Variable
 ' '           Text
@@ -402,7 +402,7 @@
 '2'           Literal.Number
 ' '           Text
 '# Quotient equals ($foo = $foo / 5)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$foo'        Name.Variable
 ' '           Text
@@ -412,7 +412,7 @@
 '2'           Literal.Number
 ' '           Text
 '# Modulo equals ($foo = $foo % 5)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$foo'        Name.Variable
 ' '           Text
@@ -423,7 +423,7 @@
 '2'           Literal.Number
 ' '           Text
 '# Bit-shift left equals ($foo = $foo << 2)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$foo'        Name.Variable
 ' '           Text
@@ -434,7 +434,7 @@
 '2'           Literal.Number
 ' '           Text
 '# Bit-shift right equals ($foo = $foo >> 2)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$foo'        Name.Variable
 ' '           Text
@@ -444,7 +444,7 @@
 '2'           Literal.Number
 ' '           Text
 '# Bitwise AND equals ($foo = $foo & 2)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$foo'        Name.Variable
 ' '           Text
@@ -454,7 +454,7 @@
 '2'           Literal.Number
 ' '           Text
 '# Bitwise OR equals ($foo = $foo | 2)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$foo'        Name.Variable
 ' '           Text
@@ -464,14 +464,14 @@
 '2'           Literal.Number
 ' '           Text
 '# Bitwise XOR equals ($foo = $foo ^ 2)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$int'        Name.Variable
 ' ='          Operator
 ' '           Text
 '10'          Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$double'     Name.Variable
 ' ='          Operator
@@ -480,7 +480,7 @@
 '.'           Operator
 '71828'       Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'string.len'  Name.Function
 '('           Operator
@@ -491,10 +491,10 @@
 ';'           Operator
 ' '           Text
 '# casts to string, returns 7' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Convert $string to a number, and add 4:' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$r'          Name.Variable
 ' ='          Operator
@@ -507,7 +507,7 @@
 ';'           Operator
 '  '          Text
 '# $r is 14'  Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 '('           Operator
@@ -533,7 +533,7 @@
 ')'           Operator
 ' '           Text
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'pool.use'    Name.Function
@@ -555,14 +555,14 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
 ' '           Text
 'else'        Keyword
 ' '           Text
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'pool.use'    Name.Function
@@ -588,12 +588,12 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
 '('           Operator
@@ -618,7 +618,7 @@
 ')'           Operator
 ' '           Text
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'log.info'    Name.Function
@@ -650,12 +650,12 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'i'           Name.Function
 '$count'      Name.Variable
@@ -663,7 +663,7 @@
 ' '           Text
 '0'           Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while'       Keyword
 '('           Operator
@@ -677,7 +677,7 @@
 ')'           Operator
 ' '           Text
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'log.info'    Name.Function
@@ -709,7 +709,7 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '$count'      Name.Variable
@@ -721,24 +721,24 @@
 ' '           Text
 '1'           Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$count'      Name.Variable
 ' ='          Operator
 ' '           Text
 '0'           Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'do'          Keyword
 ' '           Text
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 'log.info'    Name.Function
@@ -770,7 +770,7 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 '$count'      Name.Variable
@@ -782,7 +782,7 @@
 ' '           Text
 '1'           Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
 ' '           Text
@@ -797,9 +797,9 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$mime'       Name.Variable
 ' ='          Operator
@@ -824,7 +824,7 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 '('           Operator
@@ -853,7 +853,7 @@
 ' '           Text
 'break'       Keyword
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$array'      Name.Variable
 ' ='          Operator
@@ -899,7 +899,7 @@
 ' '           Text
 ']'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$someone'    Name.Variable
 ' ='          Operator
@@ -909,7 +909,7 @@
 '0'           Literal.Number
 ']'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$arraylen'   Name.Variable
 ' ='          Operator
@@ -919,7 +919,7 @@
 '$array'      Name.Variable
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'log.info'    Name.Function
 '('           Operator
@@ -960,9 +960,9 @@
 '"'           Literal.String
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Keyword
 ' '           Text
@@ -987,7 +987,7 @@
 ' '           Text
 ')'           Operator
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'log.info'    Name.Function
@@ -1024,12 +1024,12 @@
 ']'           Operator
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$hash'       Name.Variable
 ' ='          Operator
@@ -1055,7 +1055,7 @@
 't'           Literal.String
 '"'           Literal.String
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '          '  Text
 '"'           Literal.String
@@ -1076,7 +1076,7 @@
 't'           Literal.String
 '"'           Literal.String
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '          '  Text
 '"'           Literal.String
@@ -1103,7 +1103,7 @@
 'e'           Literal.String
 '"'           Literal.String
 ','           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '          '  Text
 '"'           Literal.String
@@ -1125,9 +1125,9 @@
 ' '           Text
 ']'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foreach'     Keyword
 ' '           Text
@@ -1143,7 +1143,7 @@
 ')'           Operator
 ')'           Operator
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 'log.info'    Name.Function
@@ -1182,7 +1182,7 @@
 ']'           Operator
 ' '           Text
 '.'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Literal.String
 ';'           Literal.String
@@ -1191,12 +1191,12 @@
 ';'           Operator
 ' '           Text
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Declare a subroutine to calculate factorials' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub'         Keyword
 ' '           Text
@@ -1208,7 +1208,7 @@
 ')'           Operator
 ' '           Text
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'if'          Keyword
@@ -1226,7 +1226,7 @@
 ' '           Text
 '1'           Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '       '     Text
 'return'      Keyword
@@ -1242,20 +1242,20 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Put entries into the array' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$c'          Name.Variable
 ' ='          Operator
 ' '           Text
 '0'           Literal.Number
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while'       Keyword
 '('           Operator
@@ -1270,7 +1270,7 @@
 ')'           Operator
 ' '           Text
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 '$msg'        Name.Variable
@@ -1316,7 +1316,7 @@
 '$c'          Name.Variable
 ' '           Text
 ')'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.'           Operator
 '"'           Literal.String
@@ -1324,7 +1324,7 @@
 '"'           Literal.String
 ' '           Text
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 'data.set'    Name.Function
@@ -1347,7 +1347,7 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$c'          Name.Variable
 '+'           Operator
@@ -1355,10 +1355,10 @@
 ';'           Operator
 ' '           Text
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Look up several entries.  Note: the 1000th entry is empty' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$msg'        Name.Variable
 ' ='          Operator
@@ -1366,7 +1366,7 @@
 '"'           Literal.String
 '"'           Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$msg'        Name.Variable
 ' '           Text
@@ -1411,10 +1411,10 @@
 '\\n'         Literal.String.Escape
 '"'           Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# delete the entire array (but no other data stored by data.set)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 'data.reset'  Name.Function
 '('           Operator
@@ -1431,7 +1431,7 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'http.sendResponse' Name.Function
 '('           Operator
@@ -1468,7 +1468,7 @@
 ' '           Text
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub'         Keyword
 ' '           Text
@@ -1476,11 +1476,11 @@
 '('           Operator
 ')'           Operator
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 '# Prints each header to the event log.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 '$headers'    Name.Variable
@@ -1490,7 +1490,7 @@
 '('           Operator
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '   '         Text
 'foreach'     Keyword
@@ -1503,7 +1503,7 @@
 '$headers'    Name.Variable
 ')'           Operator
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text
 'log.info'    Name.Function
@@ -1526,32 +1526,32 @@
 ')'           Operator
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
 ' '           Text
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text
 'foo'         Name.Function
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo.headbug' Name.Function
 '('           Operator
 ')'           Operator
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Sets the regex string as ^192\\.168\\. ; the two examples' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# below have the same effect' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$regex'      Name.Variable
 ' ='          Operator
@@ -1574,14 +1574,14 @@
 '.'           Literal.String
 '"'           Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '$regex'      Name.Variable
 ' ='          Operator
 ' '           Text
 "'^192\\.168\\.'" Literal.String
 ';'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if'          Keyword
 ' '           Text
@@ -1600,11 +1600,11 @@
 ')'           Operator
 ' '           Text
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '# IP is on 192.168.* network' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/scala/exports.scala.output b/tests/examplefiles/scala/exports.scala.output
index 0968bf2979..695716576e 100644
--- a/tests/examplefiles/scala/exports.scala.output
+++ b/tests/examplefiles/scala/exports.scala.output
@@ -8,7 +8,7 @@
 'a'           Name.Namespace
 '.'           Punctuation
 '_'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'export'      Keyword
 ' '           Text.Whitespace
@@ -42,7 +42,7 @@
 ' '           Text.Whitespace
 'y'           Name
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'export'      Keyword
 ' '           Text.Whitespace
@@ -55,7 +55,7 @@
 ' '           Text.Whitespace
 'y'           Name
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'export'      Keyword
 ' '           Text.Whitespace
@@ -119,7 +119,7 @@
 'a'           Name.Namespace
 '.'           Punctuation
 '_'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'export'      Keyword
 ' '           Text.Whitespace
@@ -150,7 +150,7 @@
 ' '           Text.Whitespace
 'y'           Name
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'export'      Keyword
 ' '           Text.Whitespace
@@ -165,7 +165,7 @@
 ' '           Text.Whitespace
 '`test-name`' Name
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'export'      Keyword
@@ -173,7 +173,7 @@
 'scanUnit'    Name.Namespace
 '.'           Punctuation
 'scan'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text.Whitespace
 'export'      Keyword
@@ -190,4 +190,4 @@
 ' '           Text.Whitespace
 '_'           Name
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/scala/imports.scala.output b/tests/examplefiles/scala/imports.scala.output
index 631d0d0e55..76dc5635c8 100644
--- a/tests/examplefiles/scala/imports.scala.output
+++ b/tests/examplefiles/scala/imports.scala.output
@@ -43,14 +43,14 @@
 ' '           Text.Whitespace
 '`test-name`' Name
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
 'a'           Name.Namespace
 '.'           Punctuation
 'given'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
@@ -61,7 +61,7 @@
 ' '           Text.Whitespace
 'a'           Name
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
@@ -73,21 +73,21 @@
 ' '           Text.Whitespace
 'y'           Name
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
 'a'           Name.Namespace
 '.'           Punctuation
 '_'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
 'a'           Name.Namespace
 '.'           Punctuation
 'x'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
@@ -98,7 +98,7 @@
 'y'           Name.Namespace
 '.'           Punctuation
 'z'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
@@ -115,7 +115,7 @@
 ' '           Text.Whitespace
 'FileNotFoundException' Name.Class
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
@@ -124,7 +124,7 @@
 'io'          Name.Namespace
 '.'           Punctuation
 'File'        Name.Class
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
@@ -140,7 +140,7 @@
 'Int'         Name.Class
 ']'           Punctuation
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
@@ -156,16 +156,16 @@
 '?'           Name
 ']'           Punctuation
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
 'a'           Name.Namespace
 '.'           Punctuation
 'givenSomething' Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
 ' '           Text.Whitespace
 'givenPackage' Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/scala/package.scala.output b/tests/examplefiles/scala/package.scala.output
index 40acee66fe..e021db5894 100644
--- a/tests/examplefiles/scala/package.scala.output
+++ b/tests/examplefiles/scala/package.scala.output
@@ -5,11 +5,11 @@
 'package'     Keyword
 ' '           Text.Whitespace
 'com'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'package'     Keyword
 ' '           Text.Whitespace
 'com'         Name.Namespace
 '.'           Punctuation
 'example'     Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/scdoc/scdoc_manual.scd.output b/tests/examplefiles/scdoc/scdoc_manual.scd.output
index 179760c59f..00ae789233 100644
--- a/tests/examplefiles/scdoc/scdoc_manual.scd.output
+++ b/tests/examplefiles/scdoc/scdoc_manual.scd.output
@@ -1,12 +1,12 @@
 'scdoc(5)'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Generic.Heading
 ' NAME\n'     Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'scdoc'       Text
 ' '           Text
@@ -23,14 +23,14 @@
 'manual'      Text
 ' '           Text
 'pages'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Generic.Heading
 ' SYNTAX\n'   Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Input'       Text
 ' '           Text
@@ -45,14 +45,14 @@
 'UTF-8'       Text
 ' '           Text
 'encoding.'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' PREAMBLE\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Each'        Text
 ' '           Text
@@ -71,9 +71,9 @@
 'following'   Text
 ' '           Text
 'preamble:'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '*name*'      Generic.Strong
@@ -87,7 +87,7 @@
 '["center'    Text
 '\\_'         Text
 'header"]]'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -122,7 +122,7 @@
 'the'         Text
 ' '           Text
 'section'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 "you're"      Text
 ' '           Text
@@ -145,9 +145,9 @@
 'manual'      Text
 ' '           Text
 'sections).'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '_left'       Text
 '\\_'         Text
@@ -172,7 +172,7 @@
 'the'         Text
 ' '           Text
 'text'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'positioned'  Text
 ' '           Text
@@ -197,7 +197,7 @@
 '*must*'      Generic.Strong
 ' '           Text
 'be'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'surrounded'  Text
 ' '           Text
@@ -206,14 +206,14 @@
 'double'      Text
 ' '           Text
 'quotes.'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' SECTION HEADERS\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Each'        Text
 ' '           Text
@@ -240,12 +240,12 @@
 'to'          Text
 ' '           Text
 'the'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'following:'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '#'           Text
@@ -253,9 +253,9 @@
 'HEADER'      Text
 ' '           Text
 'NAME'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Subsection'  Text
 ' '           Text
@@ -282,7 +282,7 @@
 'must'        Text
 ' '           Text
 'have'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'an'          Text
 ' '           Text
@@ -295,14 +295,14 @@
 'either'      Text
 ' '           Text
 'side.'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' PARAGRAPHS\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Begin'       Text
 ' '           Text
@@ -319,14 +319,14 @@
 'empty'       Text
 ' '           Text
 'line.'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' LINE BREAKS\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Insert'      Text
 ' '           Text
@@ -349,28 +349,28 @@
 '\\+'         Text
 '\\+'         Text
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
 'result'      Text
 ' '           Text
 'looks++'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'like'        Text
 ' '           Text
 'this.'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' FORMATTING\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Text'        Text
 ' '           Text
@@ -397,7 +397,7 @@
 '\\*'         Text
 'bold'        Text
 '\\*'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'or'          Text
 ' '           Text
@@ -417,14 +417,14 @@
 'be'          Text
 ' '           Text
 'disregarded.' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' INDENTATION\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You'         Text
 ' '           Text
@@ -457,7 +457,7 @@
 'spaces'      Text
 ' '           Text
 'in'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'the'         Text
 ' '           Text
@@ -474,9 +474,9 @@
 'contain'     Text
 ' '           Text
 'headers.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'The'         Text
@@ -490,9 +490,9 @@
 'like'        Text
 ' '           Text
 'this.'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'You'         Text
@@ -511,9 +511,9 @@
 ' '           Text
 '_formatting_' Generic.Emph
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Deindent'    Text
 ' '           Text
@@ -538,17 +538,17 @@
 'your'        Text
 ' '           Text
 'indentation' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'depth.'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' LISTS\n'    Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You'         Text
 ' '           Text
@@ -569,18 +569,18 @@
 'like'        Text
 ' '           Text
 'so:'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```\n'       Literal.String
 
 '- Item 1\n- Item 2\n\t- Subitem 1\n\t- Subitem 2\n- Item 3\n' Text
 
 '```'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -591,7 +591,7 @@
 'like'        Text
 ' '           Text
 'this:'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -600,14 +600,14 @@
 'Item'        Text
 ' '           Text
 '1'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-'           Keyword
 ' '           Text
 'Item'        Text
 ' '           Text
 '2'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '-'           Keyword
@@ -615,7 +615,7 @@
 'Subitem'     Text
 ' '           Text
 '1'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '-'           Keyword
@@ -623,16 +623,16 @@
 'Subitem'     Text
 ' '           Text
 '2'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-'           Keyword
 ' '           Text
 'Item'        Text
 ' '           Text
 '3'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You'         Text
 ' '           Text
@@ -663,7 +663,7 @@
 'same'        Text
 ' '           Text
 'indent'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'level,'      Text
 ' '           Text
@@ -690,16 +690,16 @@
 'list'        Text
 ' '           Text
 'entry.'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```\n'       Literal.String
 
 "- Item 1 is pretty long so let's\n  break it up onto two lines\n- Item 2 is shorter\n\t- But its children can go on\n\t  for a while\n" Text
 
 '```'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -718,7 +718,7 @@
 'so'          Text
 ' '           Text
 "let's"       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -733,7 +733,7 @@
 'two'         Text
 ' '           Text
 'lines'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-'           Keyword
 ' '           Text
@@ -744,7 +744,7 @@
 'is'          Text
 ' '           Text
 'shorter'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 '-'           Keyword
@@ -760,7 +760,7 @@
 'go'          Text
 ' '           Text
 'on'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 ' '           Text
@@ -770,14 +770,14 @@
 'a'           Text
 ' '           Text
 'while'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' NUMBERED LISTS\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Numbered'    Text
 ' '           Text
@@ -804,7 +804,7 @@
 '(.)'         Text
 ' '           Text
 'instead'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of'          Text
 ' '           Text
@@ -815,39 +815,39 @@
 'like'        Text
 ' '           Text
 'so:'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```\n'       Literal.String
 
 '. Item 1\n. Item 2\n. Item 3,\n  with multiple lines\n' Text
 
 '```'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.'           Text
 ' '           Text
 'Item'        Text
 ' '           Text
 '1'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.'           Text
 ' '           Text
 'Item'        Text
 ' '           Text
 '2'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.'           Text
 ' '           Text
 'Item'        Text
 ' '           Text
 '3,'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
@@ -856,14 +856,14 @@
 'multiple'    Text
 ' '           Text
 'lines'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' TABLES\n'   Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'To'          Text
 ' '           Text
@@ -892,9 +892,9 @@
 'of'          Text
 ' '           Text
 'rows.'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Each'        Text
 ' '           Text
@@ -931,7 +931,7 @@
 'or'          Text
 ' '           Text
 'column'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'respectively' Text
 ' '           Text
@@ -954,7 +954,7 @@
 'multiple'    Text
 ' '           Text
 'lines),'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'followed'    Text
 ' '           Text
@@ -989,7 +989,7 @@
 'or'          Text
 ' '           Text
 'right,'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'followed'    Text
 ' '           Text
@@ -1023,7 +1023,7 @@
 'space'       Text
 ' '           Text
 'instead'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'of'          Text
 ' '           Text
@@ -1052,14 +1052,14 @@
 'in'          Text
 ' '           Text
 'the'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'previous'    Text
 ' '           Text
 'row.'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'The'         Text
 ' '           Text
@@ -1090,7 +1090,7 @@
 'has'         Text
 ' '           Text
 'special'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'meaning.'    Text
 ' '           Text
@@ -1121,7 +1121,7 @@
 'produce'     Text
 ' '           Text
 'a'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'table'       Text
 ' '           Text
@@ -1152,12 +1152,12 @@
 'the'         Text
 ' '           Text
 'whole'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'table.'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'To'          Text
 ' '           Text
@@ -1182,18 +1182,18 @@
 'last'        Text
 ' '           Text
 'row.'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```\n'       Literal.String
 
 '[[ *Foo*\n:- _Bar_\n:-\n|  *Row 1*\n:  Hello\n:] world!\n|  *Row 2*\n:  こんにちは\n:  世界\n   !\n' Text
 
 '```'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '[['          Text
 ' '           Text
@@ -1206,7 +1206,7 @@
 '\n'          Text
 
 ':-'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Text
 ' '           Text
@@ -1218,12 +1218,12 @@
 ' '           Text
 ' '           Text
 'Hello'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ':]'          Text
 ' '           Text
 'world!'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Text
 ' '           Text
@@ -1235,26 +1235,26 @@
 ' '           Text
 ' '           Text
 'こんにちは'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ':'           Text
 ' '           Text
 ' '           Text
 '世界'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ' '           Text
 ' '           Text
 '!'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' LITERAL TEXT\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'You'         Text
 ' '           Text
@@ -1283,7 +1283,7 @@
 'codes'       Text
 ' '           Text
 'and'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'literal'     Text
 ' '           Text
@@ -1310,7 +1310,7 @@
 'subsequent'  Text
 ' '           Text
 'symbol'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'to'          Text
 ' '           Text
@@ -1343,7 +1343,7 @@
 'also'        Text
 ' '           Text
 'make'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'blocks'      Text
 ' '           Text
@@ -1356,18 +1356,18 @@
 'like'        Text
 ' '           Text
 'so:'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```\n'       Literal.String
 
 '\\```\n_This formatting_ will *not* be interpreted by scdoc.\n\\```\n' Text
 
 '```'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'These'       Text
 ' '           Text
@@ -1394,7 +1394,7 @@
 'is'          Text
 ' '           Text
 'shown'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'literally'   Text
 ' '           Text
@@ -1427,7 +1427,7 @@
 'your'        Text
 ' '           Text
 'own'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'roff'        Text
 ' '           Text
@@ -1454,7 +1454,7 @@
 'within'      Text
 ' '           Text
 'literal'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'blocks,'     Text
 ' '           Text
@@ -1484,17 +1484,17 @@
 'a'           Text
 ' '           Text
 'literal'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'block.'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '##'          Generic.Subheading
 ' COMMENTS\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Lines'       Text
 ' '           Text
@@ -1513,23 +1513,23 @@
 'are'         Text
 ' '           Text
 'ignored.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```\n'       Literal.String
 
 '; This is a comment\n' Text
 
 '```'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Generic.Heading
 ' CONVENTIONS\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'By'          Text
 ' '           Text
@@ -1554,9 +1554,9 @@
 '80'          Text
 ' '           Text
 'columns.'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Generic.Heading
 ' SEE ALSO\n' Text
@@ -1566,14 +1566,14 @@
 '*scdoc*'     Generic.Strong
 '('           Text
 '1)'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Generic.Heading
 ' AUTHORS\n'  Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Maintained'  Text
 ' '           Text
@@ -1596,7 +1596,7 @@
 'found'       Text
 ' '           Text
 'at'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'https://git.sr.ht/~sircmpwn/scdoc' Text
 ' '           Text
@@ -1615,7 +1615,7 @@
 'email'       Text
 ' '           Text
 'to'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '~sircmpwn/public-inbox@lists.sr.ht.' Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/scilab/bench_chol.tst b/tests/examplefiles/scilab/bench_chol.tst
new file mode 100644
index 0000000000..d03eea05d7
--- /dev/null
+++ b/tests/examplefiles/scilab/bench_chol.tst
@@ -0,0 +1,23 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2007-2008 - INRIA
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+//==============================================================================
+// Benchmark for chol function
+//==============================================================================
+
+// <-- BENCH NB RUN : 10 -->
+
+stacksize(30000000);
+
+a = 0;
+b = 0;
+a = rand(900, 900, 'n');
+a = a'*a;
+
+// <-- BENCH START -->
+b = chol(a);
+// <-- BENCH END -->
diff --git a/tests/examplefiles/scilab/bench_chol.tst.output b/tests/examplefiles/scilab/bench_chol.tst.output
new file mode 100644
index 0000000000..a63bfe5139
--- /dev/null
+++ b/tests/examplefiles/scilab/bench_chol.tst.output
@@ -0,0 +1,95 @@
+'// =============================================================================' Comment.Single
+'\n'          Text.Whitespace
+
+'// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab' Comment.Single
+'\n'          Text.Whitespace
+
+'// Copyright (C) 2007-2008 - INRIA' Comment.Single
+'\n'          Text.Whitespace
+
+'//'          Comment.Single
+'\n'          Text.Whitespace
+
+'//  This file is distributed under the same license as the Scilab package.' Comment.Single
+'\n'          Text.Whitespace
+
+'// =============================================================================' Comment.Single
+'\n\n'        Text.Whitespace
+
+'//==============================================================================' Comment.Single
+'\n'          Text.Whitespace
+
+'// Benchmark for chol function' Comment.Single
+'\n'          Text.Whitespace
+
+'//==============================================================================' Comment.Single
+'\n\n'        Text.Whitespace
+
+'// <-- BENCH NB RUN : 10 -->' Comment.Single
+'\n\n'        Text.Whitespace
+
+'stacksize'   Name.Builtin
+'('           Punctuation
+'30000000'    Literal.Number.Integer
+');'          Punctuation
+'\n\n'        Text.Whitespace
+
+'a'           Name
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'b'           Name
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'a'           Name
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'rand'        Name.Builtin
+'('           Punctuation
+'900'         Literal.Number.Integer
+','           Punctuation
+' '           Text.Whitespace
+'900'         Literal.Number.Integer
+','           Punctuation
+' '           Text.Whitespace
+"'"           Literal.String
+"n'"          Literal.String
+');'          Punctuation
+'\n'          Text.Whitespace
+
+'a'           Name
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'a'           Name
+"'"           Operator
+'*'           Operator
+'a'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'// <-- BENCH START -->' Comment.Single
+'\n'          Text.Whitespace
+
+'b'           Name
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'chol'        Name.Builtin
+'('           Punctuation
+'a'           Name
+');'          Punctuation
+'\n'          Text.Whitespace
+
+'// <-- BENCH END -->' Comment.Single
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/singularity/Singularity.output b/tests/examplefiles/singularity/Singularity.output
index da97d9b3da..5fe858b093 100644
--- a/tests/examplefiles/singularity/Singularity.output
+++ b/tests/examplefiles/singularity/Singularity.output
@@ -102,217 +102,217 @@
 '18.04'       Literal.Number
 ' # pass: leading whitespace allowed\n' Comment
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%setup'      Generic.Heading
 '\n    '      Text.Whitespace
 'touch'       Text
-' '           Text
+' '           Text.Whitespace
 '/file1'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'touch'       Text
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'SINGULARITY_ROOTFS' Name.Variable
 '}'           Literal.String.Interpol
 '/file2'      Text
-' '           Text
+' '           Text.Whitespace
 '# pass: leading whitespace optional\n' Comment.Single
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%files'      Generic.Heading
 '\n    '      Text.Whitespace
 '/file1'      Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 '/file1'      Text
-' '           Text
+' '           Text.Whitespace
 '/opt'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%environment' Generic.Heading
 '\n    '      Text.Whitespace
 'export'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'LISTEN_PORT' Name.Variable
 '='           Operator
 '12345'       Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 'export'      Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'LC_ALL'      Name.Variable
 '='           Operator
 'C'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%runscript'  Generic.Heading
 '\n    '      Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Container was created ' Literal.String.Double
 '$NOW'        Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Arguments received: ' Literal.String.Double
 '$*'          Name.Variable
 '"'           Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'exec'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$@'          Name.Variable
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%startscript' Generic.Heading
 '\n    '      Text.Whitespace
 'nc'          Text
-' '           Text
+' '           Text.Whitespace
 '-lp'         Text
-' '           Text
+' '           Text.Whitespace
 '$LISTEN_PORT' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%test'       Generic.Heading
 '\n    '      Text.Whitespace
 'grep'        Text
-' '           Text
+' '           Text.Whitespace
 '-q'          Text
-' '           Text
+' '           Text.Whitespace
 'NAME'        Name.Variable
 '='           Operator
 '\\"'         Literal.String.Escape
 'Ubuntu'      Text
 '\\"'         Literal.String.Escape
-' '           Text
+' '           Text.Whitespace
 '/etc/os-release' Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '['           Operator
-' '           Text
+' '           Text.Whitespace
 '$?'          Name.Variable
-' '           Text
+' '           Text.Whitespace
 '-eq'         Text
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 ']'           Operator
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"Container base is Ubuntu as expected."' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'else'        Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"Container base is not Ubuntu."' Literal.String.Double
-'\n    '      Text
+'\n    '      Text.Whitespace
 'fi'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%labels'     Generic.Heading
 '\n    '      Text.Whitespace
 'Author'      Text
-' '           Text
+' '           Text.Whitespace
 'd@sylabs.io' Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'Version'     Text
-' '           Text
+' '           Text.Whitespace
 'v0.0.1'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%help'       Generic.Heading
 '\n    '      Text.Whitespace
 'This'        Text
-' '           Text
+' '           Text.Whitespace
 'is'          Text
-' '           Text
+' '           Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 'demo'        Text
-' '           Text
+' '           Text.Whitespace
 'container'   Text
-' '           Text
+' '           Text.Whitespace
 'used'        Text
-' '           Text
+' '           Text.Whitespace
 'to'          Text
-' '           Text
+' '           Text.Whitespace
 'illustrate'  Text
-' '           Text
+' '           Text.Whitespace
 'a'           Text
-' '           Text
+' '           Text.Whitespace
 'def'         Text
-' '           Text
+' '           Text.Whitespace
 'file'        Text
-' '           Text
+' '           Text.Whitespace
 'that'        Text
-' '           Text
+' '           Text.Whitespace
 'uses'        Text
-' '           Text
+' '           Text.Whitespace
 'all'         Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'supported'   Text
-' '           Text
+' '           Text.Whitespace
 'sections.'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '%post'       Generic.Heading
 '\n    '      Text.Whitespace
 'apt-get'     Text
-' '           Text
+' '           Text.Whitespace
 'update'      Text
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'apt-get'     Text
-' '           Text
+' '           Text.Whitespace
 'install'     Text
-' '           Text
+' '           Text.Whitespace
 '-y'          Text
-' '           Text
+' '           Text.Whitespace
 'netcat'      Text
-'\n    '      Text
+'\n    '      Text.Whitespace
 'NOW'         Name.Variable
 '='           Operator
 '$(('         Keyword
 'date'        Text
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 '))'          Keyword
-' '           Text
+' '           Text.Whitespace
 "# pass: don't highlight '%'\n" Comment.Single
 
-'    '        Text
+'    '        Text.Whitespace
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'export NOW=\\"' Literal.String.Double
 '${'          Literal.String.Interpol
@@ -320,8 +320,8 @@
 '}'           Literal.String.Interpol
 '\\"'         Literal.String.Double
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '>>'          Text
-' '           Text
+' '           Text.Whitespace
 '$SINGULARITY_ENVIRONMENT' Name.Variable
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/slim/example.slim.output b/tests/examplefiles/slim/example.slim.output
index 0ba4296755..01656d6132 100644
--- a/tests/examplefiles/slim/example.slim.output
+++ b/tests/examplefiles/slim/example.slim.output
@@ -74,21 +74,21 @@
 
 '      '      Text.Whitespace
 '=='          Punctuation
-' '           Text
+' '           Text.Whitespace
 'yield'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 '      '      Text.Whitespace
 '-'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'unless'      Keyword
-' '           Text
+' '           Text.Whitespace
 'items'       Name
 '.'           Operator
 'empty?'      Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 'table'       Name.Tag
@@ -96,17 +96,17 @@
 
 '          '  Text.Whitespace
 '-'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 'item'        Name
-' '           Text
+' '           Text.Whitespace
 'in'          Keyword
-' '           Text
+' '           Text.Whitespace
 'items'       Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '            ' Text.Whitespace
 'tr'          Name.Tag
@@ -116,27 +116,27 @@
 'td'          Name.Tag
 '.name'       Name.Class
 ' ='          Punctuation
-' '           Text
+' '           Text.Whitespace
 'item'        Name
 '.'           Operator
 'name'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '              ' Text.Whitespace
 'td'          Name.Tag
 '.price'      Name.Class
 ' ='          Punctuation
-' '           Text
+' '           Text.Whitespace
 'item'        Name
 '.'           Operator
 'price'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 '-'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text.Whitespace
 'p'           Name.Tag
@@ -162,13 +162,13 @@
 
 '      '      Text.Whitespace
 '='           Punctuation
-' '           Text
+' '           Text.Whitespace
 'render'      Name
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String.Single
 'footer'      Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '      '      Text.Whitespace
 '| Copyright (C) #{year} #{author}\n' Text
diff --git a/tests/examplefiles/slurm/example.sl.output b/tests/examplefiles/slurm/example.sl.output
index eaae005e96..a7fbac670b 100644
--- a/tests/examplefiles/slurm/example.sl.output
+++ b/tests/examplefiles/slurm/example.sl.output
@@ -9,6 +9,6 @@
 '#SBATCH --cpus-per-task=8\n' Keyword.Pseudo
 
 'srun'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '/usr/bin/sleep' Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/smithy/test.smithy b/tests/examplefiles/smithy/test.smithy
index 3d20f064c8..9317fee9bb 100644
--- a/tests/examplefiles/smithy/test.smithy
+++ b/tests/examplefiles/smithy/test.smithy
@@ -2,6 +2,18 @@ $version: "1.0"
 
 namespace test
 
+metadata "foo" = ["bar", "baz"]
+metadata validators = [
+    {
+        name: "ValidatorName"
+        id: "ValidatorId"
+        message: "Some string"
+        configuration: {
+            selector: "operation"
+        }
+    }
+]
+
 /// Define how an HTTP request is serialized given a specific protocol,
 /// authentication scheme, and set of input parameters.
 @trait(selector: "operation")
diff --git a/tests/examplefiles/smithy/test.smithy.output b/tests/examplefiles/smithy/test.smithy.output
index 1f224897fe..db44a381d8 100644
--- a/tests/examplefiles/smithy/test.smithy.output
+++ b/tests/examplefiles/smithy/test.smithy.output
@@ -7,6 +7,58 @@
 ' test'       Name.Class
 '\n\n'        Text.Whitespace
 
+'metadata'    Keyword.Declaration
+' '           Text.Whitespace
+'"foo"'       Name.Class
+' '           Text.Whitespace
+'='           Name.Decorator
+' '           Text.Whitespace
+'['           Text
+'"bar"'       Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'"baz"'       Literal.String.Double
+']'           Text
+'\n'          Text.Whitespace
+
+'metadata'    Keyword.Declaration
+' '           Text.Whitespace
+'validators'  Name.Class
+' '           Text.Whitespace
+'='           Name.Decorator
+' '           Text.Whitespace
+'['           Text
+'\n    '      Text.Whitespace
+'{'           Text
+'\n        '  Text.Whitespace
+'name:'       Name.Label
+' '           Text.Whitespace
+'"ValidatorName"' Literal.String.Double
+'\n        '  Text.Whitespace
+'id:'         Name.Label
+' '           Text.Whitespace
+'"ValidatorId"' Literal.String.Double
+'\n        '  Text.Whitespace
+'message:'    Name.Label
+' '           Text.Whitespace
+'"Some string"' Literal.String.Double
+'\n        '  Text.Whitespace
+'configuration:' Name.Label
+' '           Text.Whitespace
+'{'           Text
+'\n            ' Text.Whitespace
+'selector:'   Name.Label
+' '           Text.Whitespace
+'"operation"' Literal.String.Double
+'\n        '  Text.Whitespace
+'}'           Text
+'\n    '      Text.Whitespace
+'}'           Text
+'\n'          Text.Whitespace
+
+']'           Text
+'\n\n'        Text.Whitespace
+
 '/// Define how an HTTP request is serialized given a specific protocol,' Comment.Multiline
 '\n'          Text.Whitespace
 
diff --git a/tests/examplefiles/solidity/test.sol b/tests/examplefiles/solidity/test.sol
index f7a6495ecb..df32d21189 100644
--- a/tests/examplefiles/solidity/test.sol
+++ b/tests/examplefiles/solidity/test.sol
@@ -11,7 +11,6 @@ pragma solidity >=0.4.0 <0.7.0;
 */
 
 contract ContractName {
-
     address public publicaddress;
 
     uint varname1 = 1234;
@@ -20,16 +19,20 @@ contract ContractName {
     string astringsingle = 'test "string" value\' single';
     string astringdouble = "test 'string' value\" double";
 
+    address public shipper;
+    address private arbiter;
+    address astronaut;
+
     enum State {
-      NotStarted,
-      WorkInProgress,
-      Done
+        NotStarted,
+        WorkInProgress,
+        Done
     }
     State public state;
 
     struct AStruct {
         string name;
-        uint8 type;
+        uint8 atype;
     }
 
     mapping(address => AStruct) registry;
@@ -39,36 +42,79 @@ contract ContractName {
     event Withdraw(uint256 value);
 
     function addRegistry(string _name, uint8 _type) {
-        AStruct memory newItem = AStruct({
-            name: _name,
-            type: _type
-        });
+        AStruct memory newItem = AStruct({name: _name, atype: _type});
 
         registry[msg.sender] = newItem;
     }
 
-    function getHash(AStruct item) returns(uint) {
-        return uint(keccak256(item.name, item.type));
+    function getHash(AStruct item) returns (uint) {
+        return uint(keccak256(item.name, item.atype));
     }
 
     function pay() public payable {
-      require(msg.sender == astronaut);
-      state = State.Paid;
-      Paid(msg.value);
+        require(msg.sender == astronaut);
+        state = State.Paid;
+        Paid(msg.value);
     }
 
     function receive() public {
-      require(msg.sender == arbiter);
-      require(state == State.Paid);
-      state = State.Received;
-      Received(now);
+        require(msg.sender == arbiter);
+        require(state == State.Paid);
+        state = State.Received;
+        Received(now);
     }
 
     function withdraw() public {
-      require(msg.sender == shipper);
-      require(state == State.Received);
-      state = State.Withdrawn;
-      Withdraw(this.balance);
-      shipper.transfer(this.balance);
+        require(msg.sender == shipper);
+        require(state == State.Received);
+        state = State.Withdrawn;
+        Withdraw(this.balance);
+        shipper.transfer(this.balance);
+    }
+
+    function max(uint a, uint b) public returns (uint) {
+        if (a > b && b < a) {
+            return a;
+        } else {
+            return b;
+        }
+    }
+
+    function operators() public {
+        uint a = 20;
+        uint b = 10;
+        // arithmetic
+        uint _sum = a + b;
+        uint _diff = a - b;
+        uint _mul = a * b;
+        uint _div = a / b;
+        uint _mod = a % b;
+        uint _dec = --b;
+        uint _inc = ++a;
+
+        // comparison
+        bool _eq = a == b;
+        bool _noteq = a != b;
+        bool _greater = a > b;
+        bool _less = a < b;
+        bool _geq = a >= b;
+        bool _leq = a <= b;
+
+        // logical boolean
+        bool x = true;
+        bool y = false;
+        bool _and = x && y;
+        bool _or = a || b;
+        bool _not = !a;
+
+        // bitwise
+        uint64 i = 20;
+        uint64 j = 10;
+        uint64 _bitand = i & j;
+        uint64 _bitor = i | j;
+        uint64 _bitxor = i ^ j;
+        uint64 _leftshift = i << j;
+        uint64 _rightshift = i >> j;
+        uint64 _bitnot = ~i;
     }
 }
diff --git a/tests/examplefiles/solidity/test.sol.output b/tests/examplefiles/solidity/test.sol.output
index 1eaa9bea9d..d7d1ee6865 100644
--- a/tests/examplefiles/solidity/test.sol.output
+++ b/tests/examplefiles/solidity/test.sol.output
@@ -30,7 +30,7 @@
 'ContractName' Name.Entity
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n\n    '    Text.Whitespace
+'\n    '      Text.Whitespace
 'address'     Keyword.Type
 ' '           Text.Whitespace
 'public '     Keyword
@@ -73,18 +73,35 @@
 '"test \'string\' value\\" double"' Literal.String.Double
 ';'           Punctuation
 '\n\n    '    Text.Whitespace
+'address'     Keyword.Type
+' '           Text.Whitespace
+'public '     Keyword
+'shipper'     Name.Variable
+';'           Punctuation
+'\n    '      Text.Whitespace
+'address'     Keyword.Type
+' '           Text.Whitespace
+'private '    Keyword
+'arbiter'     Name.Variable
+';'           Punctuation
+'\n    '      Text.Whitespace
+'address'     Keyword.Type
+' '           Text.Whitespace
+'astronaut'   Name.Variable
+';'           Punctuation
+'\n\n    '    Text.Whitespace
 'enum'        Keyword.Type
 ' '           Text.Whitespace
 'State'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'NotStarted'  Text
 ','           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'WorkInProgress' Text
 ','           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'Done'        Text
 '\n    '      Text.Whitespace
 '}'           Punctuation
@@ -109,7 +126,7 @@
 '\n        '  Text.Whitespace
 'uint8'       Keyword.Type
 ' '           Text.Whitespace
-'type'        Name.Variable
+'atype'       Name.Variable
 ';'           Punctuation
 '\n    '      Text.Whitespace
 '}'           Punctuation
@@ -184,18 +201,16 @@
 'AStruct'     Text
 '('           Punctuation
 '{'           Punctuation
-'\n            ' Text.Whitespace
 'name'        Text
-':'           Punctuation
+':'           Operator
 ' '           Text.Whitespace
 '_name'       Text
 ','           Punctuation
-'\n            ' Text.Whitespace
-'type'        Text
-':'           Punctuation
+' '           Text.Whitespace
+'atype'       Text
+':'           Operator
 ' '           Text.Whitespace
 '_type'       Text
-'\n        '  Text.Whitespace
 '}'           Punctuation
 ')'           Punctuation
 ';'           Punctuation
@@ -222,6 +237,7 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'returns'     Keyword.Type
+' '           Text.Whitespace
 '('           Punctuation
 'uint'        Keyword.Type
 ')'           Punctuation
@@ -241,7 +257,7 @@
 ' '           Text.Whitespace
 'item'        Text
 '.'           Punctuation
-'type'        Text
+'atype'       Text
 ')'           Punctuation
 ')'           Punctuation
 ';'           Punctuation
@@ -259,7 +275,7 @@
 'payable'     Keyword.Type
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'require'     Keyword.Type
 '('           Punctuation
 'msg.sender'  Keyword
@@ -270,7 +286,7 @@
 'astronaut'   Text
 ')'           Punctuation
 ';'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'state'       Text
 ' '           Text.Whitespace
 '='           Operator
@@ -279,7 +295,7 @@
 '.'           Punctuation
 'Paid'        Text
 ';'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'Paid'        Text
 '('           Punctuation
 'msg.value'   Keyword
@@ -297,7 +313,7 @@
 'public'      Keyword.Type
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'require'     Keyword.Type
 '('           Punctuation
 'msg.sender'  Keyword
@@ -308,7 +324,7 @@
 'arbiter'     Text
 ')'           Punctuation
 ';'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'require'     Keyword.Type
 '('           Punctuation
 'state'       Text
@@ -321,7 +337,7 @@
 'Paid'        Text
 ')'           Punctuation
 ';'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'state'       Text
 ' '           Text.Whitespace
 '='           Operator
@@ -330,7 +346,7 @@
 '.'           Punctuation
 'Received'    Text
 ';'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'Received'    Text
 '('           Punctuation
 'now'         Text
@@ -348,7 +364,7 @@
 'public'      Keyword.Type
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'require'     Keyword.Type
 '('           Punctuation
 'msg.sender'  Keyword
@@ -359,7 +375,7 @@
 'shipper'     Text
 ')'           Punctuation
 ';'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'require'     Keyword.Type
 '('           Punctuation
 'state'       Text
@@ -372,7 +388,7 @@
 'Received'    Text
 ')'           Punctuation
 ';'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'state'       Text
 ' '           Text.Whitespace
 '='           Operator
@@ -381,7 +397,7 @@
 '.'           Punctuation
 'Withdrawn'   Text
 ';'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'Withdraw'    Text
 '('           Punctuation
 'this'        Keyword.Type
@@ -389,7 +405,7 @@
 'balance'     Text
 ')'           Punctuation
 ';'           Punctuation
-'\n      '    Text.Whitespace
+'\n        '  Text.Whitespace
 'shipper'     Text
 '.'           Punctuation
 'transfer'    Text
@@ -401,6 +417,433 @@
 ';'           Punctuation
 '\n    '      Text.Whitespace
 '}'           Punctuation
+'\n\n    '    Text.Whitespace
+'function'    Keyword.Type
+' '           Text.Whitespace
+'max'         Name.Variable
+'('           Punctuation
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'a'           Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'b'           Name.Variable
+')'           Punctuation
+' '           Text.Whitespace
+'public'      Keyword.Type
+' '           Text.Whitespace
+'returns'     Keyword.Type
+' '           Text.Whitespace
+'('           Punctuation
+'uint'        Keyword.Type
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'if'          Keyword.Type
+' '           Text.Whitespace
+'('           Punctuation
+'a'           Text
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'b'           Text
+' '           Text.Whitespace
+'&'           Operator
+'&'           Operator
+' '           Text.Whitespace
+'b'           Text
+' '           Text.Whitespace
+'<'           Operator
+' '           Text.Whitespace
+'a'           Text
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'return'      Keyword.Type
+' '           Text.Whitespace
+'a'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'else'        Keyword.Type
+' '           Text.Whitespace
+'{'           Punctuation
+'\n            ' Text.Whitespace
+'return'      Keyword.Type
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n\n    '    Text.Whitespace
+'function'    Keyword.Type
+' '           Text.Whitespace
+'operators'   Name.Variable
+'('           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'public'      Keyword.Type
+' '           Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'a'           Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'20'          Literal.Number.Decimal
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'b'           Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Decimal
+';'           Punctuation
+'\n        '  Text.Whitespace
+'// arithmetic\n' Comment.Single
+
+'        '    Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'_sum'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'_diff'       Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'_mul'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'_div'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'_mod'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'%'           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'_dec'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'-'           Operator
+'-'           Operator
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint'        Keyword.Type
+' '           Text.Whitespace
+'_inc'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'+'           Operator
+'+'           Operator
+'a'           Text
+';'           Punctuation
+'\n\n        ' Text.Whitespace
+'// comparison\n' Comment.Single
+
+'        '    Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'_eq'         Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'='           Operator
+'='           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'_noteq'      Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'!'           Operator
+'='           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'_greater'    Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'_less'       Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'<'           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'_geq'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'>'           Operator
+'='           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'_leq'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'<'           Operator
+'='           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n\n        ' Text.Whitespace
+'// logical boolean\n' Comment.Single
+
+'        '    Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'x'           Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'true'        Keyword.Type
+';'           Punctuation
+'\n        '  Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'y'           Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'false'       Keyword.Type
+';'           Punctuation
+'\n        '  Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'_and'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'x'           Text
+' '           Text.Whitespace
+'&'           Operator
+'&'           Operator
+' '           Text.Whitespace
+'y'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'_or'         Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'a'           Text
+' '           Text.Whitespace
+'|'           Operator
+'|'           Operator
+' '           Text.Whitespace
+'b'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'bool'        Keyword.Type
+' '           Text.Whitespace
+'_not'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'!'           Operator
+'a'           Text
+';'           Punctuation
+'\n\n        ' Text.Whitespace
+'// bitwise\n' Comment.Single
+
+'        '    Text.Whitespace
+'uint64'      Keyword.Type
+' '           Text.Whitespace
+'i'           Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'20'          Literal.Number.Decimal
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint64'      Keyword.Type
+' '           Text.Whitespace
+'j'           Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'10'          Literal.Number.Decimal
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint64'      Keyword.Type
+' '           Text.Whitespace
+'_bitand'     Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'i'           Text
+' '           Text.Whitespace
+'&'           Operator
+' '           Text.Whitespace
+'j'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint64'      Keyword.Type
+' '           Text.Whitespace
+'_bitor'      Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'i'           Text
+' '           Text.Whitespace
+'|'           Operator
+' '           Text.Whitespace
+'j'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint64'      Keyword.Type
+' '           Text.Whitespace
+'_bitxor'     Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'i'           Text
+' '           Text.Whitespace
+'^'           Operator
+' '           Text.Whitespace
+'j'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint64'      Keyword.Type
+' '           Text.Whitespace
+'_leftshift'  Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'i'           Text
+' '           Text.Whitespace
+'<'           Operator
+'<'           Operator
+' '           Text.Whitespace
+'j'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint64'      Keyword.Type
+' '           Text.Whitespace
+'_rightshift' Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'i'           Text
+' '           Text.Whitespace
+'>'           Operator
+'>'           Operator
+' '           Text.Whitespace
+'j'           Text
+';'           Punctuation
+'\n        '  Text.Whitespace
+'uint64'      Keyword.Type
+' '           Text.Whitespace
+'_bitnot'     Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'~'           Operator
+'i'           Text
+';'           Punctuation
+'\n    '      Text.Whitespace
+'}'           Punctuation
 '\n'          Text.Whitespace
 
 '}'           Punctuation
diff --git a/tests/examplefiles/spice/example.spice b/tests/examplefiles/spice/example.spice
index 699efdf252..55d87753d2 100644
--- a/tests/examplefiles/spice/example.spice
+++ b/tests/examplefiles/spice/example.spice
@@ -1,3 +1,19 @@
+const int test 0x123;
+
+type BloodType enum {
+    A,
+    B = 3,
+    AB,
+    ZERO = 0
+}
+
+type Person struct {
+    string firstName
+    string lastName
+    unsigned int age
+    BloodType bloodType
+}
+
 // Function to compute fibonacci numbers recursively
 f<int> fib(int n) {
     if n <= 2 {
diff --git a/tests/examplefiles/spice/example.spice.output b/tests/examplefiles/spice/example.spice.output
index 3d75ef94c1..9746813d32 100644
--- a/tests/examplefiles/spice/example.spice.output
+++ b/tests/examplefiles/spice/example.spice.output
@@ -1,3 +1,96 @@
+'const'       Keyword.Pseudo
+' '           Text.Whitespace
+'int'         Keyword.Type
+' '           Text.Whitespace
+'test'        Name.Other
+' '           Text.Whitespace
+'0x123'       Literal.Number.Hex
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'type'        Keyword.Declaration
+' '           Text.Whitespace
+'BloodType'   Name.Other
+' '           Text.Whitespace
+'enum'        Keyword.Declaration
+' '           Text.Whitespace
+'{'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'A'           Name.Other
+','           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'B'           Name.Other
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'3'           Literal.Number.Integer
+','           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'AB'          Name.Other
+','           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'ZERO'        Name.Other
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'0'           Literal.Number.Integer
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'type'        Keyword.Declaration
+' '           Text.Whitespace
+'Person'      Name.Other
+' '           Text.Whitespace
+'struct'      Keyword.Declaration
+' '           Text.Whitespace
+'{'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'string'      Keyword.Type
+' '           Text.Whitespace
+'firstName'   Name.Other
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'string'      Keyword.Type
+' '           Text.Whitespace
+'lastName'    Name.Other
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'unsigned'    Keyword.Pseudo
+' '           Text.Whitespace
+'int'         Keyword.Type
+' '           Text.Whitespace
+'age'         Name.Other
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'BloodType'   Name.Other
+' '           Text.Whitespace
+'bloodType'   Name.Other
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
 '// Function to compute fibonacci numbers recursively\n' Comment.Single
 
 'f'           Keyword.Declaration
diff --git a/tests/examplefiles/splus/test.R.output b/tests/examplefiles/splus/test.R.output
index 87e5832d39..fd82bb28fb 100644
--- a/tests/examplefiles/splus/test.R.output
+++ b/tests/examplefiles/splus/test.R.output
@@ -1,412 +1,412 @@
 '#!/usr/bin/env Rscript' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '### Example R script for syntax highlighting' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '# This is also a comment' Comment.Single
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Valid names' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUV0123456789._a' Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.foo_'       Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '._foo'       Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Invalid names' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0'           Literal.Number
 'abc'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.'           Name
 '0'           Literal.Number
 'abc'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'abc'         Name
 '+'           Operator
 'cde'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Reserved Words' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NA'          Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NA_integer_' Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NA_real_'    Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NA_character_' Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NA_complex_' Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NULL'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NaN'         Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Inf'         Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## Not reserved' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NULLa'       Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NULL1'       Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NULL.'       Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'NA_foo_'     Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'NULL'        Keyword.Constant
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Numbers'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '12345678901' Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '123456.78901' Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '123e3'       Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '123E3'       Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '6.02e23'     Literal.Number
-'\t\n'        Text
+'\t\n'        Text.Whitespace
 
 '1.6e-35'     Literal.Number
-'\t\n'        Text
+'\t\n'        Text.Whitespace
 
 '1'           Literal.Number
 '.E12'        Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '.'           Name
 '1234'        Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## integers' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '123L'        Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1.23L'       Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## imaginary numbers' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '123i'        Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-123i'       Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '123e4i'      Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '123e-4i'     Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## Hex numbers' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0xabcdefABCDEF01234' Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0xabcp123'   Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0xabcP123'   Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## Not hex'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0'           Literal.Number
 'xg'          Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Special operators %xyz%' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## %xyz%'    Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '%%'          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'diag'        Name.Function
 '('           Punctuation
 '2'           Literal.Number
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '%*%'         Operator
-' '           Text
+' '           Text.Whitespace
 'diag'        Name.Function
 '('           Punctuation
 '2'           Literal.Number
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '%/%'         Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '%in%'        Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 ':'           Operator
 '10'          Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'diag'        Name.Function
 '('           Punctuation
 '2'           Literal.Number
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '%o%'         Operator
-' '           Text
+' '           Text.Whitespace
 'diag'        Name.Function
 '('           Punctuation
 '2'           Literal.Number
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'diag'        Name.Function
 '('           Punctuation
 '2'           Literal.Number
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '%x%'         Operator
-' '           Text
+' '           Text.Whitespace
 'diag'        Name.Function
 '('           Punctuation
 '2'           Literal.Number
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`%foo bar%`' Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'function'    Name.Function
 '('           Punctuation
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'y'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'y'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '%foo bar%'   Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Control Structures (3.2) and Function' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## if, else' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'if '         Name.Function
 '('           Punctuation
 'TRUE'        Keyword.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'print'       Name.Function
 '('           Punctuation
 '"'           Literal.String
 'foo"'        Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'else'        Name
-' '           Text
+' '           Text.Whitespace
 'print'       Name.Function
 '('           Punctuation
 '"'           Literal.String
 'bar"'        Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## For, in'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'for'         Name.Function
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 'in'          Name
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 ':'           Operator
 '5'           Literal.Number
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'print'       Name.Function
 '('           Punctuation
 'i'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## While, break' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'while '      Name.Function
 '('           Punctuation
 'TRUE'        Keyword.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n    '      Text
+'\n    '      Text.Whitespace
 'if '         Name.Function
 '('           Punctuation
 'i'           Name
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'break'       Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## Repeat'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'repeat'      Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '1'           Literal.Number
 '+1'          Literal.Number
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## Switch'   Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'x'           Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'switch'      Name.Function
 '('           Punctuation
 'x'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
 '+2'          Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'mean'        Name.Function
 '('           Punctuation
 '1'           Literal.Number
@@ -414,28 +414,28 @@
 '10'          Literal.Number
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'rnorm'       Name.Function
 '('           Punctuation
 '5'           Literal.Number
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## Function, dot-dot-dot, return, sum' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'function'    Name.Function
 '('           Punctuation
 '...'         Keyword.Constant
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'return'      Name.Function
 '('           Punctuation
 'sum'         Name.Function
@@ -443,560 +443,560 @@
 '...'         Keyword.Constant
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Not keywords' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'functiona'   Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function.'   Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function1'   Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n\n\n'      Text
+'\n\n\n'      Text.Whitespace
 
 '## Grouping Tokens 10.3.7' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## Parentheses' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## brackets' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'function'    Name.Function
 '('           Punctuation
 'a'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-'\n    '      Text
+'\n    '      Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Indexing 10.3.8' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## []'       Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'bar'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 ':'           Operator
 '10'          Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'bar'         Name
 '['           Punctuation
 '3'           Literal.Number
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## [[]]'     Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'list'        Name.Function
 '('           Punctuation
 'a'           Name
 '='           Operator
 '1'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 '='           Operator
 '2'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'c'           Name
 '='           Operator
 '3'           Literal.Number
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
 '[['          Punctuation
 '"'           Literal.String
 'a"'          Literal.String
 ']]'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '## $'        Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
 '$'           Operator
 'a'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
 '$'           Operator
 '"'           Literal.String
 'a"'          Literal.String
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Operators' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '!'           Operator
-' '           Text
+' '           Text.Whitespace
 'TRUE'        Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 '?'           Operator
 '"'           Literal.String
 'help"'       Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1'           Literal.Number
 ':'           Operator
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
 '^'           Operator
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '>='          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '<='          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TRUE'        Keyword.Constant
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 'FALSE'       Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TRUE'        Keyword.Constant
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'FALSE'       Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TRUE'        Keyword.Constant
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'FALSE'       Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'TRUE'        Keyword.Constant
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'FALSE'       Keyword.Constant
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '->'          Operator
-' '           Text
+' '           Text.Whitespace
 'foo'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<<-'         Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '->>'         Operator
-' '           Text
+' '           Text.Whitespace
 'foo'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'base'        Name
 ':::'         Operator
 'sum'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'base'        Name
 '::'          Operator
 'sum'         Name
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Strings'  Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'hello, world!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "hello, world!'" Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Hello, \'world!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 'Hello, "world!\'' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "Hello, \\'world!\\''" Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Hello, \\"world!\\""' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Hello,\nworld!"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'foo'         Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 "'"           Literal.String
 "Hello,\nworld!'" Literal.String
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Backtick strings' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '`foo123 +!"bar\'baz`' Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Builtin funcitons' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'file.create' Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'gamma'       Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'grep'        Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'paste'       Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'rbind'       Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'rownames'    Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'R.Version'   Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'R.version.string' Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sample'      Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sapply'      Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'save.image'  Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'seq'         Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'setwd'       Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sin'         Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Data structures' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'servo'       Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'matrix'      Name.Function
 '('           Punctuation
 '1'           Literal.Number
 ':'           Operator
 '25'          Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'nrow'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '5'           Literal.Number
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'numeric'     Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'vector'      Name.Function
 '('           Punctuation
 'servo'       Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'data.frame'  Name.Function
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'list1'       Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 'list'        Name.Function
 '('           Punctuation
 'time'        Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
 ':'           Operator
 '40'          Literal.Number
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# multidimensional array ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'array'       Name.Function
 '('           Punctuation
@@ -1045,7 +1045,7 @@
 ')'           Punctuation
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'dim'         Name
 '='           Operator
 'c'           Name.Function
@@ -1057,32 +1057,32 @@
 '2'           Literal.Number
 ')'           Punctuation
 ')'           Punctuation
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '## Namespace' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'library'     Name.Function
 '('           Punctuation
 'ggplot2'     Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'require'     Name.Function
 '('           Punctuation
 'plyr'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'attach'      Name.Function
 '('           Punctuation
 'cars'        Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'source'      Name.Function
 '('           Punctuation
 '"'           Literal.String
 'test.R"'     Literal.String
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/ssp/test.ssp.output b/tests/examplefiles/ssp/test.ssp.output
index c746cfcfb9..e4fce29aa5 100644
--- a/tests/examplefiles/ssp/test.ssp.output
+++ b/tests/examplefiles/ssp/test.ssp.output
@@ -14,7 +14,7 @@
 '"'           Literal.String
 ' '           Text.Whitespace
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%'          Keyword
 ' '           Text.Whitespace
@@ -23,25 +23,27 @@
 'com.acme.MySnippets._' Name.Namespace
 ' '           Text.Whitespace
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<html'       Name.Tag
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<body'       Name.Tag
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<h1'         Name.Tag
 '>'           Name.Tag
-'Hello ${someName}%' Text
+'Hello'       Text
+' '           Text.Whitespace
+'${someName}%' Text
 '</h1>'       Name.Tag
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '<ul'         Name.Tag
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%='         Keyword
 ' '           Text.Whitespace
@@ -59,19 +61,19 @@
 '{'           Punctuation
 ' '           Text.Whitespace
 '%>'          Keyword
-'\n  '        Text
+'\n  '        Text.Whitespace
 '<li'         Name.Tag
 '>'           Name.Tag
 '${person.name}' Text
 '</li>'       Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%'          Keyword
 ' '           Text.Whitespace
 '}'           Punctuation
 ' '           Text.Whitespace
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</ul>'       Name.Tag
-'  \n'        Text
+'  \n'        Text.Whitespace
diff --git a/tests/examplefiles/tea/example.tea.output b/tests/examplefiles/tea/example.tea.output
index 6a62ba8a9c..5cc86bb3db 100644
--- a/tests/examplefiles/tea/example.tea.output
+++ b/tests/examplefiles/tea/example.tea.output
@@ -88,35 +88,37 @@
 '\n'          Text.Whitespace
 
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<html'       Name.Tag
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<head'       Name.Tag
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<title'      Name.Tag
 '>'           Name.Tag
 'Example'     Text
 '<title'      Name.Tag
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<body'       Name.Tag
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<a'          Name.Tag
-' '           Text
+' '           Text.Whitespace
 'href='       Name.Attribute
 '"http://example.com"' Literal.String
 '>'           Name.Tag
-'Test link'   Text
+'Test'        Text
+' '           Text.Whitespace
+'link'        Text
 '</a>'        Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<%'          Keyword
 ' '           Text.Whitespace
@@ -226,4 +228,4 @@
 '\n'          Text.Whitespace
 
 '%>'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/teal/example.teal.output b/tests/examplefiles/teal/example.teal.output
index f25e26b388..9de9781b60 100644
--- a/tests/examplefiles/teal/example.teal.output
+++ b/tests/examplefiles/teal/example.teal.output
@@ -1,41 +1,41 @@
 '//example teal code taken from https://developer.algorand.org/tutorials/writing-simple-smart-contract/' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '// Check the Fee is resonable ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '// In this case 10,000 microalgos' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'txn'         Name.Function
-' '           Text
+' '           Text.Whitespace
 'Fee'         Keyword
 '\n'          Text
 
 'int'         Name.Function
-' '           Text
+' '           Text.Whitespace
 '10000'       Literal.Number.Integer
 '\n'          Text
 
 '<='          Name.Function
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '// Check the length of the passphrase is correct ' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'arg'         Name.Function
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '\n'          Text
 
 'len'         Name.Function
-' '           Text
+' '           Text.Whitespace
 '\n'          Text
 
 'int'         Name.Function
-' '           Text
+' '           Text.Whitespace
 '73'          Literal.Number.Integer
 '\n'          Text
 
@@ -45,13 +45,13 @@
 '&&'          Name.Function
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '// The sha256 value of the passphrase' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'arg'         Name.Function
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number.Integer
 '\n'          Text
 
@@ -59,7 +59,7 @@
 '\n'          Text
 
 'byte'        Name.Function
-' '           Text
+' '           Text.Whitespace
 'base64 '     Literal.String.Affix
 '30AT2gOReDBdJmLBO/DgvjC6hIXgACecTpFDcP1bJHU=' Literal.String.Other
 '\n'          Text
@@ -70,20 +70,20 @@
 '&&'          Name.Function
 '\n'          Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '// Make sure the CloseRemainderTo is not set' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'txn'         Name.Function
-' '           Text
+' '           Text.Whitespace
 'CloseRemainderTo' Keyword
 '\n'          Text
 
 'txn'         Name.Function
-' '           Text
+' '           Text.Whitespace
 'Receiver'    Keyword
-' '           Text
+' '           Text.Whitespace
 '\n'          Text
 
 '=='          Name.Function
diff --git a/tests/examplefiles/tid/TiddlyWiki5.tid.output b/tests/examplefiles/tid/TiddlyWiki5.tid.output
index dbf9cf8a67..609f9f0583 100644
--- a/tests/examplefiles/tid/TiddlyWiki5.tid.output
+++ b/tests/examplefiles/tid/TiddlyWiki5.tid.output
@@ -2,19 +2,19 @@
 ':'           Text
 ' '           Text
 'Formatting'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'created'     Keyword
 ':'           Text
 ' '           Text
 '20131205155959399' Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'modified'    Keyword
 ':'           Text
 ' '           Text
 '20200201075357846' Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 'tags'        Keyword
 ':'           Text
@@ -22,7 +22,7 @@
 'TiddlyWiki'  Text
 ' '           Text
 'WikiText'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'title'       Keyword
 ': '          Text
@@ -36,9 +36,9 @@
 'vnd'         Text
 '.'           Text
 'tiddlywiki'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\define'    Keyword
 ' '           Text
@@ -49,7 +49,7 @@
 '<div class="cell positive">' Name.Tag
 '+'           Text
 '</div>'      Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\define'    Keyword
 ' '           Text
@@ -60,9 +60,9 @@
 '<div class="cell negative">' Name.Tag
 '-'           Text
 '</div>'      Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\define'    Keyword
 ' '           Text
@@ -75,7 +75,7 @@
 'variables'   Text
 '('           Text
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Hi'          Text
 ','           Text
@@ -96,12 +96,12 @@
 ' '           Text
 '$(address)$' Name.Tag
 '.'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\end'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<style>'     Literal.String
 '\n'          Literal.String
@@ -162,14 +162,14 @@
 '\n'          Text.Whitespace
 
 '</style>'    Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '!'           Generic.Heading
 'Main Header\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Available'   Text
 ' '           Text
@@ -179,7 +179,7 @@
 ' '           Text
 'includes'    Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -194,7 +194,7 @@
 'for'         Text
 ' '           Text
 '`code`'      Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
 '**'          Keyword
 ' '           Text
@@ -218,7 +218,7 @@
 '&#96;'       Literal.String.Regex
 '&#96;'       Literal.String.Regex
 '</code>'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 '*'           Keyword
@@ -228,7 +228,7 @@
 'for'         Text
 ' '           Text
 "''bold text''" Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Keyword
 '`//italic//`' Literal.String.Backtick
@@ -242,7 +242,7 @@
 '$:/core/images/italic' Name.Tag
 '}}'          Text
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*#'          Keyword
 ' '           Text
@@ -251,15 +251,15 @@
 'for'         Text
 ' '           Text
 '__underscored text__' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Ordered'     Text
 ' '           Text
 'list'        Text
 ':'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -278,7 +278,7 @@
 '$:/core/images/superscript' Name.Tag
 '}}'          Text
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Keyword
 ' '           Text
@@ -295,7 +295,7 @@
 '$:/core/images/subscript' Name.Tag
 '}}'          Text
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#*'          Keyword
 ' '           Text
@@ -312,9 +312,9 @@
 '$:/core/images/strikethrough' Name.Tag
 '}}'          Text
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<span style="font-style: italic;">' Name.Tag
 "'"           Text
@@ -326,14 +326,14 @@
 '&#96;'       Literal.String.Regex
 '&amp;'       Literal.String.Regex
 '</span>'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '!!'          Generic.Subheading
 'Links\n'     Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Internal'    Text
 ' '           Text
@@ -343,9 +343,9 @@
 '[['          Text
 'Code Blocks in WikiText' Name.Tag
 ']]'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'External'    Text
 ' '           Text
@@ -357,9 +357,9 @@
 '|'           Text
 'https://tiddlywiki.com' Name.Attribute
 ']]'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Image'       Text
 ' '           Text
@@ -371,9 +371,9 @@
 '{{'          Text
 '$:/core/images/underline' Name.Tag
 '}}'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'Just'        Text
 ' '           Text
@@ -383,45 +383,45 @@
 ':'           Text
 ' '           Text
 'ftp://ftp.halifax.rwth-aachen.de/' Name.Attribute
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '!!!'         Generic.Subheading
 'Code\n'      Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```'         Literal.String
 'bash'        Literal.String
 '\n'          Text
 
 'cd'          Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '$HOME'       Name.Variable
 '/workspace'  Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```'         Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '!!!'         Generic.Subheading
 'Table\n'     Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|myclass anotherClass|k' Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|This is a caption |c' Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|Header|Header|h' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Text
 "'"           Text
@@ -434,7 +434,7 @@
 '<<neg>>'     Name.Tag
 ' '           Text
 '|'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Text
 '/'           Text
@@ -447,29 +447,29 @@
 '<<pos>>'     Name.Tag
 ' '           Text
 '|'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|Footer|Footer|f' Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '!'           Generic.Heading
 'Block quote\n' Text
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<<<\n'       Literal.String
 
 'Computers are like a bicycle for our minds\n' Text
 
 '<<< Steve Jobs' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '; Term being defined' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
 ':'           Text
 ' '           Text
@@ -480,4 +480,4 @@
 'that'        Text
 ' '           Text
 'term'        Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/tlb/block.tlb b/tests/examplefiles/tlb/block.tlb
new file mode 100644
index 0000000000..7e6666cdee
--- /dev/null
+++ b/tests/examplefiles/tlb/block.tlb
@@ -0,0 +1,868 @@
+unit$_ = Unit;
+true$_ = True;
+// EMPTY False;
+bool_false$0 = Bool;
+bool_true$1 = Bool;
+bool_false$0 = BoolFalse;
+bool_true$1 = BoolTrue;
+nothing$0 {X:Type} = Maybe X;
+just$1 {X:Type} value:X = Maybe X;
+left$0 {X:Type} {Y:Type} value:X = Either X Y;
+right$1 {X:Type} {Y:Type} value:Y = Either X Y;
+pair$_ {X:Type} {Y:Type} first:X second:Y = Both X Y;
+
+bit$_ (## 1) = Bit;
+/*
+ *
+ *   FROM hashmap.tlb
+ *
+ */
+// ordinary Hashmap / HashmapE, with fixed length keys
+//
+hm_edge#_ {n:#} {X:Type} {l:#} {m:#} label:(HmLabel ~l n) 
+          {n = (~m) + l} node:(HashmapNode m X) = Hashmap n X;
+
+hmn_leaf#_ {X:Type} value:X = HashmapNode 0 X;
+hmn_fork#_ {n:#} {X:Type} left:^(Hashmap n X) 
+           right:^(Hashmap n X) = HashmapNode (n + 1) X;
+
+hml_short$0 {m:#} {n:#} len:(Unary ~n) {n <= m} s:(n * Bit) = HmLabel ~n m;
+hml_long$10 {m:#} n:(#<= m) s:(n * Bit) = HmLabel ~n m;
+hml_same$11 {m:#} v:Bit n:(#<= m) = HmLabel ~n m;
+
+unary_zero$0 = Unary ~0;
+unary_succ$1 {n:#} x:(Unary ~n) = Unary ~(n + 1);
+
+hme_empty$0 {n:#} {X:Type} = HashmapE n X;
+hme_root$1 {n:#} {X:Type} root:^(Hashmap n X) = HashmapE n X;
+
+// true#_ = True;
+_ {n:#} _:(Hashmap n True) = BitstringSet n;
+
+//  HashmapAug, hashmap with an extra value 
+//   (augmentation) of type Y at every node
+//
+ahm_edge#_ {n:#} {X:Type} {Y:Type} {l:#} {m:#} 
+  label:(HmLabel ~l n) {n = (~m) + l} 
+  node:(HashmapAugNode m X Y) = HashmapAug n X Y;
+ahmn_leaf#_ {X:Type} {Y:Type} extra:Y value:X = HashmapAugNode 0 X Y;
+ahmn_fork#_ {n:#} {X:Type} {Y:Type} left:^(HashmapAug n X Y)
+  right:^(HashmapAug n X Y) extra:Y = HashmapAugNode (n + 1) X Y;
+
+ahme_empty$0 {n:#} {X:Type} {Y:Type} extra:Y 
+          = HashmapAugE n X Y;
+ahme_root$1 {n:#} {X:Type} {Y:Type} root:^(HashmapAug n X Y) 
+  extra:Y = HashmapAugE n X Y;
+
+// VarHashmap / VarHashmapE, with variable-length keys
+//
+vhm_edge#_ {n:#} {X:Type} {l:#} {m:#} label:(HmLabel ~l n) 
+           {n = (~m) + l} node:(VarHashmapNode m X) 
+           = VarHashmap n X;
+vhmn_leaf$00 {n:#} {X:Type} value:X = VarHashmapNode n X;
+vhmn_fork$01 {n:#} {X:Type} left:^(VarHashmap n X) 
+             right:^(VarHashmap n X) value:(Maybe X) 
+             = VarHashmapNode (n + 1) X;
+vhmn_cont$1 {n:#} {X:Type} branch:Bit child:^(VarHashmap n X) 
+            value:X = VarHashmapNode (n + 1) X;
+
+// nothing$0 {X:Type} = Maybe X;
+// just$1 {X:Type} value:X = Maybe X;
+
+vhme_empty$0 {n:#} {X:Type} = VarHashmapE n X;
+vhme_root$1 {n:#} {X:Type} root:^(VarHashmap n X) 
+            = VarHashmapE n X;
+
+//
+// PfxHashmap / PfxHashmapE, with variable-length keys
+//                           constituting a prefix code
+//
+
+phm_edge#_ {n:#} {X:Type} {l:#} {m:#} label:(HmLabel ~l n) 
+           {n = (~m) + l} node:(PfxHashmapNode m X) 
+           = PfxHashmap n X;
+
+phmn_leaf$0 {n:#} {X:Type} value:X = PfxHashmapNode n X;
+phmn_fork$1 {n:#} {X:Type} left:^(PfxHashmap n X) 
+            right:^(PfxHashmap n X) = PfxHashmapNode (n + 1) X;
+
+phme_empty$0 {n:#} {X:Type} = PfxHashmapE n X;
+phme_root$1 {n:#} {X:Type} root:^(PfxHashmap n X) 
+            = PfxHashmapE n X;
+/*
+ *
+ *  END hashmap.tlb
+ *
+ */
+//
+// TON BLOCK LAYOUT
+//
+addr_none$00 = MsgAddressExt;
+addr_extern$01 len:(## 9) external_address:(bits len) 
+             = MsgAddressExt;
+anycast_info$_ depth:(#<= 30) { depth >= 1 }
+   rewrite_pfx:(bits depth) = Anycast;
+addr_std$10 anycast:(Maybe Anycast) 
+   workchain_id:int8 address:bits256  = MsgAddressInt;
+addr_var$11 anycast:(Maybe Anycast) addr_len:(## 9) 
+   workchain_id:int32 address:(bits addr_len) = MsgAddressInt;
+_ _:MsgAddressInt = MsgAddress;
+_ _:MsgAddressExt = MsgAddress;
+//
+var_uint$_ {n:#} len:(#< n) value:(uint (len * 8))
+         = VarUInteger n;
+var_int$_ {n:#} len:(#< n) value:(int (len * 8)) 
+        = VarInteger n;
+nanograms$_ amount:(VarUInteger 16) = Grams;  
+//
+extra_currencies$_ dict:(HashmapE 32 (VarUInteger 32)) 
+                 = ExtraCurrencyCollection;
+currencies$_ grams:Grams other:ExtraCurrencyCollection 
+           = CurrencyCollection;
+//
+int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool
+  src:MsgAddressInt dest:MsgAddressInt 
+  value:CurrencyCollection ihr_fee:Grams fwd_fee:Grams
+  created_lt:uint64 created_at:uint32 = CommonMsgInfo;
+ext_in_msg_info$10 src:MsgAddressExt dest:MsgAddressInt 
+  import_fee:Grams = CommonMsgInfo;
+ext_out_msg_info$11 src:MsgAddressInt dest:MsgAddressExt
+  created_lt:uint64 created_at:uint32 = CommonMsgInfo;
+
+int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool
+  src:MsgAddress dest:MsgAddressInt 
+  value:CurrencyCollection ihr_fee:Grams fwd_fee:Grams
+  created_lt:uint64 created_at:uint32 = CommonMsgInfoRelaxed;
+ext_out_msg_info$11 src:MsgAddress dest:MsgAddressExt
+  created_lt:uint64 created_at:uint32 = CommonMsgInfoRelaxed;
+
+tick_tock$_ tick:Bool tock:Bool = TickTock;
+
+_ split_depth:(Maybe (## 5)) special:(Maybe TickTock)
+  code:(Maybe ^Cell) data:(Maybe ^Cell)
+  library:(HashmapE 256 SimpleLib) = StateInit;
+  
+simple_lib$_ public:Bool root:^Cell = SimpleLib;
+
+message$_ {X:Type} info:CommonMsgInfo
+  init:(Maybe (Either StateInit ^StateInit))
+  body:(Either X ^X) = Message X;
+
+message$_ {X:Type} info:CommonMsgInfoRelaxed
+  init:(Maybe (Either StateInit ^StateInit))
+  body:(Either X ^X) = MessageRelaxed X;
+  
+_ (Message Any) = MessageAny;
+
+//
+interm_addr_regular$0 use_dest_bits:(#<= 96) 
+  = IntermediateAddress;
+interm_addr_simple$10 workchain_id:int8 addr_pfx:uint64 
+  = IntermediateAddress;
+interm_addr_ext$11 workchain_id:int32 addr_pfx:uint64
+  = IntermediateAddress;
+msg_envelope#4 cur_addr:IntermediateAddress 
+  next_addr:IntermediateAddress fwd_fee_remaining:Grams 
+  msg:^(Message Any) = MsgEnvelope;
+//
+msg_import_ext$000 msg:^(Message Any) transaction:^Transaction 
+              = InMsg;
+msg_import_ihr$010 msg:^(Message Any) transaction:^Transaction 
+    ihr_fee:Grams proof_created:^Cell = InMsg;
+msg_import_imm$011 in_msg:^MsgEnvelope
+    transaction:^Transaction fwd_fee:Grams = InMsg;
+msg_import_fin$100 in_msg:^MsgEnvelope 
+    transaction:^Transaction fwd_fee:Grams = InMsg;
+msg_import_tr$101  in_msg:^MsgEnvelope out_msg:^MsgEnvelope 
+    transit_fee:Grams = InMsg;
+msg_discard_fin$110 in_msg:^MsgEnvelope transaction_id:uint64 
+    fwd_fee:Grams = InMsg;
+msg_discard_tr$111 in_msg:^MsgEnvelope transaction_id:uint64 
+    fwd_fee:Grams proof_delivered:^Cell = InMsg;
+//
+import_fees$_ fees_collected:Grams 
+  value_imported:CurrencyCollection = ImportFees;
+
+_ (HashmapAugE 256 InMsg ImportFees) = InMsgDescr;
+
+msg_export_ext$000 msg:^(Message Any)
+    transaction:^Transaction = OutMsg;
+msg_export_imm$010 out_msg:^MsgEnvelope 
+    transaction:^Transaction reimport:^InMsg = OutMsg;
+msg_export_new$001 out_msg:^MsgEnvelope 
+    transaction:^Transaction = OutMsg;
+msg_export_tr$011  out_msg:^MsgEnvelope 
+    imported:^InMsg = OutMsg;
+msg_export_deq$1100 out_msg:^MsgEnvelope
+    import_block_lt:uint63 = OutMsg;
+msg_export_deq_short$1101 msg_env_hash:bits256
+    next_workchain:int32 next_addr_pfx:uint64
+    import_block_lt:uint64 = OutMsg;
+msg_export_tr_req$111 out_msg:^MsgEnvelope 
+    imported:^InMsg = OutMsg;
+msg_export_deq_imm$100 out_msg:^MsgEnvelope 
+    reimport:^InMsg = OutMsg;
+
+_ enqueued_lt:uint64 out_msg:^MsgEnvelope = EnqueuedMsg;
+
+_ (HashmapAugE 256 OutMsg CurrencyCollection) = OutMsgDescr;
+
+_ (HashmapAugE 352 EnqueuedMsg uint64) = OutMsgQueue;
+
+processed_upto$_ last_msg_lt:uint64 last_msg_hash:bits256 = ProcessedUpto;
+// key is [ shard:uint64 mc_seqno:uint32 ]  
+_ (HashmapE 96 ProcessedUpto) = ProcessedInfo;
+
+ihr_pending$_ import_lt:uint64 = IhrPendingSince;
+_ (HashmapE 320 IhrPendingSince) = IhrPendingInfo;
+
+_ out_queue:OutMsgQueue proc_info:ProcessedInfo
+  ihr_pending:IhrPendingInfo = OutMsgQueueInfo;
+//
+storage_used$_ cells:(VarUInteger 7) bits:(VarUInteger 7) 
+  public_cells:(VarUInteger 7) = StorageUsed;
+
+storage_used_short$_ cells:(VarUInteger 7) 
+  bits:(VarUInteger 7) = StorageUsedShort;
+
+storage_info$_ used:StorageUsed last_paid:uint32
+              due_payment:(Maybe Grams) = StorageInfo;
+
+account_none$0 = Account;
+account$1 addr:MsgAddressInt storage_stat:StorageInfo
+          storage:AccountStorage = Account;
+
+account_storage$_ last_trans_lt:uint64
+    balance:CurrencyCollection state:AccountState 
+  = AccountStorage;
+
+account_uninit$00 = AccountState;
+account_active$1 _:StateInit = AccountState;
+account_frozen$01 state_hash:bits256 = AccountState;
+
+acc_state_uninit$00 = AccountStatus;
+acc_state_frozen$01 = AccountStatus;
+acc_state_active$10 = AccountStatus;
+acc_state_nonexist$11 = AccountStatus;
+
+/* duplicates
+tick_tock$_ tick:Bool tock:Bool = TickTock;
+
+_ split_depth:(Maybe (## 5)) special:(Maybe TickTock)
+  code:(Maybe ^Cell) data:(Maybe ^Cell)
+  library:(Maybe ^Cell) = StateInit;
+*/
+
+account_descr$_ account:^Account last_trans_hash:bits256 
+  last_trans_lt:uint64 = ShardAccount;
+
+depth_balance$_ split_depth:(#<= 30) balance:CurrencyCollection = DepthBalanceInfo;
+
+_ (HashmapAugE 256 ShardAccount DepthBalanceInfo) = ShardAccounts;
+
+transaction$0111 account_addr:bits256 lt:uint64 
+  prev_trans_hash:bits256 prev_trans_lt:uint64 now:uint32
+  outmsg_cnt:uint15
+  orig_status:AccountStatus end_status:AccountStatus
+  ^[ in_msg:(Maybe ^(Message Any)) out_msgs:(HashmapE 15 ^(Message Any)) ]
+  total_fees:CurrencyCollection state_update:^(HASH_UPDATE Account)
+  description:^TransactionDescr = Transaction;
+
+merkle_update#02 {X:Type} old_hash:bits256 new_hash:bits256
+  old:^X new:^X = MERKLE_UPDATE X;
+update_hashes#72 {X:Type} old_hash:bits256 new_hash:bits256
+  = HASH_UPDATE X;
+merkle_proof#03 {X:Type} virtual_hash:bits256 depth:uint16 virtual_root:^X = MERKLE_PROOF X;
+
+acc_trans#5 account_addr:bits256
+            transactions:(HashmapAug 64 ^Transaction CurrencyCollection)
+            state_update:^(HASH_UPDATE Account)
+          = AccountBlock;
+
+_ (HashmapAugE 256 AccountBlock CurrencyCollection) = ShardAccountBlocks;
+//
+tr_phase_storage$_ storage_fees_collected:Grams 
+  storage_fees_due:(Maybe Grams)
+  status_change:AccStatusChange
+  = TrStoragePhase;
+
+acst_unchanged$0 = AccStatusChange;  // x -> x
+acst_frozen$10 = AccStatusChange;    // init -> frozen
+acst_deleted$11 = AccStatusChange;   // frozen -> deleted
+
+tr_phase_credit$_ due_fees_collected:(Maybe Grams)
+  credit:CurrencyCollection = TrCreditPhase;
+
+tr_phase_compute_skipped$0 reason:ComputeSkipReason
+  = TrComputePhase;
+tr_phase_compute_vm$1 success:Bool msg_state_used:Bool 
+  account_activated:Bool gas_fees:Grams
+  ^[ gas_used:(VarUInteger 7)
+  gas_limit:(VarUInteger 7) gas_credit:(Maybe (VarUInteger 3))
+  mode:int8 exit_code:int32 exit_arg:(Maybe int32)
+  vm_steps:uint32
+  vm_init_state_hash:bits256 vm_final_state_hash:bits256 ]
+  = TrComputePhase;
+cskip_no_state$00 = ComputeSkipReason;
+cskip_bad_state$01 = ComputeSkipReason;
+cskip_no_gas$10 = ComputeSkipReason;
+
+tr_phase_action$_ success:Bool valid:Bool no_funds:Bool
+  status_change:AccStatusChange
+  total_fwd_fees:(Maybe Grams) total_action_fees:(Maybe Grams)
+  result_code:int32 result_arg:(Maybe int32) tot_actions:uint16
+  spec_actions:uint16 skipped_actions:uint16 msgs_created:uint16 
+  action_list_hash:bits256 tot_msg_size:StorageUsedShort 
+  = TrActionPhase;
+
+tr_phase_bounce_negfunds$00 = TrBouncePhase;
+tr_phase_bounce_nofunds$01 msg_size:StorageUsedShort
+  req_fwd_fees:Grams = TrBouncePhase;
+tr_phase_bounce_ok$1 msg_size:StorageUsedShort 
+  msg_fees:Grams fwd_fees:Grams = TrBouncePhase;
+//
+trans_ord$0000 credit_first:Bool
+  storage_ph:(Maybe TrStoragePhase)
+  credit_ph:(Maybe TrCreditPhase)
+  compute_ph:TrComputePhase action:(Maybe ^TrActionPhase)
+  aborted:Bool bounce:(Maybe TrBouncePhase)
+  destroyed:Bool
+  = TransactionDescr;
+
+trans_storage$0001 storage_ph:TrStoragePhase
+  = TransactionDescr;
+
+trans_tick_tock$001 is_tock:Bool storage_ph:TrStoragePhase
+  compute_ph:TrComputePhase action:(Maybe ^TrActionPhase)
+  aborted:Bool destroyed:Bool = TransactionDescr;
+//
+split_merge_info$_ cur_shard_pfx_len:(## 6)
+  acc_split_depth:(## 6) this_addr:bits256 sibling_addr:bits256
+  = SplitMergeInfo;
+trans_split_prepare$0100 split_info:SplitMergeInfo
+  storage_ph:(Maybe TrStoragePhase)
+  compute_ph:TrComputePhase action:(Maybe ^TrActionPhase)
+  aborted:Bool destroyed:Bool
+  = TransactionDescr;
+trans_split_install$0101 split_info:SplitMergeInfo
+  prepare_transaction:^Transaction
+  installed:Bool = TransactionDescr;
+
+trans_merge_prepare$0110 split_info:SplitMergeInfo
+  storage_ph:TrStoragePhase aborted:Bool
+  = TransactionDescr;
+trans_merge_install$0111 split_info:SplitMergeInfo
+  prepare_transaction:^Transaction
+  storage_ph:(Maybe TrStoragePhase)
+  credit_ph:(Maybe TrCreditPhase)
+  compute_ph:TrComputePhase action:(Maybe ^TrActionPhase)
+  aborted:Bool destroyed:Bool
+  = TransactionDescr;
+
+smc_info#076ef1ea actions:uint16 msgs_sent:uint16
+  unixtime:uint32 block_lt:uint64 trans_lt:uint64 
+  rand_seed:bits256 balance_remaining:CurrencyCollection
+  myself:MsgAddressInt = SmartContractInfo;
+//
+//
+out_list_empty$_ = OutList 0;
+out_list$_ {n:#} prev:^(OutList n) action:OutAction
+  = OutList (n + 1);
+action_send_msg#0ec3c86d mode:(## 8) 
+  out_msg:^(MessageRelaxed Any) = OutAction;
+action_set_code#ad4de08e new_code:^Cell = OutAction;
+action_reserve_currency#36e6b809 mode:(## 8)
+  currency:CurrencyCollection = OutAction;
+libref_hash$0 lib_hash:bits256 = LibRef;
+libref_ref$1 library:^Cell = LibRef;
+action_change_library#26fa1dd4 mode:(## 7) { mode <= 2 }
+  libref:LibRef = OutAction;
+
+out_list_node$_ prev:^Cell action:OutAction = OutListNode;
+//
+//
+shard_ident$00 shard_pfx_bits:(#<= 60) 
+  workchain_id:int32 shard_prefix:uint64 = ShardIdent;
+
+ext_blk_ref$_ end_lt:uint64
+  seq_no:uint32 root_hash:bits256 file_hash:bits256 
+  = ExtBlkRef;
+
+block_id_ext$_ shard_id:ShardIdent seq_no:uint32
+  root_hash:bits256 file_hash:bits256 = BlockIdExt;
+
+master_info$_ master:ExtBlkRef = BlkMasterInfo;
+
+shard_state#9023afe2 global_id:int32
+  shard_id:ShardIdent 
+  seq_no:uint32 vert_seq_no:#
+  gen_utime:uint32 gen_lt:uint64
+  min_ref_mc_seqno:uint32
+  out_msg_queue_info:^OutMsgQueueInfo
+  before_split:(## 1)
+  accounts:^ShardAccounts
+  ^[ overload_history:uint64 underload_history:uint64
+  total_balance:CurrencyCollection
+  total_validator_fees:CurrencyCollection
+  libraries:(HashmapE 256 LibDescr)
+  master_ref:(Maybe BlkMasterInfo) ]
+  custom:(Maybe ^McStateExtra)
+  = ShardStateUnsplit;
+  
+_ ShardStateUnsplit = ShardState;
+split_state#5f327da5 left:^ShardStateUnsplit right:^ShardStateUnsplit = ShardState;
+
+shared_lib_descr$00 lib:^Cell publishers:(Hashmap 256 True)
+  = LibDescr;
+
+block_info#9bc7a987 version:uint32 
+  not_master:(## 1) 
+  after_merge:(## 1) before_split:(## 1) 
+  after_split:(## 1) 
+  want_split:Bool want_merge:Bool
+  key_block:Bool vert_seqno_incr:(## 1)
+  flags:(## 8) { flags <= 1 }
+  seq_no:# vert_seq_no:# { vert_seq_no >= vert_seqno_incr } 
+  { prev_seq_no:# } { ~prev_seq_no + 1 = seq_no } 
+  shard:ShardIdent gen_utime:uint32
+  start_lt:uint64 end_lt:uint64
+  gen_validator_list_hash_short:uint32
+  gen_catchain_seqno:uint32
+  min_ref_mc_seqno:uint32
+  prev_key_block_seqno:uint32
+  gen_software:flags . 0?GlobalVersion
+  master_ref:not_master?^BlkMasterInfo 
+  prev_ref:^(BlkPrevInfo after_merge)
+  prev_vert_ref:vert_seqno_incr?^(BlkPrevInfo 0)
+  = BlockInfo;
+
+prev_blk_info$_ prev:ExtBlkRef = BlkPrevInfo 0;
+prev_blks_info$_ prev1:^ExtBlkRef prev2:^ExtBlkRef = BlkPrevInfo 1;
+
+block#11ef55aa global_id:int32
+  info:^BlockInfo value_flow:^ValueFlow
+  state_update:^(MERKLE_UPDATE ShardState) 
+  extra:^BlockExtra = Block;
+
+block_extra in_msg_descr:^InMsgDescr
+  out_msg_descr:^OutMsgDescr
+  account_blocks:^ShardAccountBlocks
+  rand_seed:bits256
+  created_by:bits256
+  custom:(Maybe ^McBlockExtra) = BlockExtra;
+//
+value_flow ^[ from_prev_blk:CurrencyCollection 
+  to_next_blk:CurrencyCollection
+  imported:CurrencyCollection
+  exported:CurrencyCollection ]
+  fees_collected:CurrencyCollection
+  ^[
+  fees_imported:CurrencyCollection
+  recovered:CurrencyCollection
+  created:CurrencyCollection
+  minted:CurrencyCollection
+  ] = ValueFlow;
+
+//
+//
+bt_leaf$0 {X:Type} leaf:X = BinTree X;
+bt_fork$1 {X:Type} left:^(BinTree X) right:^(BinTree X) 
+          = BinTree X;
+
+fsm_none$0 = FutureSplitMerge;
+fsm_split$10 split_utime:uint32 interval:uint32 = FutureSplitMerge;
+fsm_merge$11 merge_utime:uint32 interval:uint32 = FutureSplitMerge;
+
+shard_descr#b seq_no:uint32 reg_mc_seqno:uint32
+  start_lt:uint64 end_lt:uint64
+  root_hash:bits256 file_hash:bits256 
+  before_split:Bool before_merge:Bool
+  want_split:Bool want_merge:Bool
+  nx_cc_updated:Bool flags:(## 3) { flags = 0 }
+  next_catchain_seqno:uint32 next_validator_shard:uint64
+  min_ref_mc_seqno:uint32 gen_utime:uint32
+  split_merge_at:FutureSplitMerge
+  fees_collected:CurrencyCollection
+  funds_created:CurrencyCollection = ShardDescr;
+
+shard_descr_new#a seq_no:uint32 reg_mc_seqno:uint32
+  start_lt:uint64 end_lt:uint64
+  root_hash:bits256 file_hash:bits256 
+  before_split:Bool before_merge:Bool
+  want_split:Bool want_merge:Bool
+  nx_cc_updated:Bool flags:(## 3) { flags = 0 }
+  next_catchain_seqno:uint32 next_validator_shard:uint64
+  min_ref_mc_seqno:uint32 gen_utime:uint32
+  split_merge_at:FutureSplitMerge
+  ^[ fees_collected:CurrencyCollection
+     funds_created:CurrencyCollection ] = ShardDescr;
+
+_ (HashmapE 32 ^(BinTree ShardDescr)) = ShardHashes;
+
+bta_leaf$0 {X:Type} {Y:Type} extra:Y leaf:X = BinTreeAug X Y;
+bta_fork$1 {X:Type} {Y:Type} left:^(BinTreeAug X Y) 
+           right:^(BinTreeAug X Y) extra:Y = BinTreeAug X Y;
+
+_ fees:CurrencyCollection create:CurrencyCollection = ShardFeeCreated;
+_ (HashmapAugE 96 ShardFeeCreated ShardFeeCreated) = ShardFees;
+
+_ config_addr:bits256 config:^(Hashmap 32 ^Cell) 
+  = ConfigParams;
+
+validator_info$_
+  validator_list_hash_short:uint32 
+  catchain_seqno:uint32
+  nx_cc_updated:Bool
+= ValidatorInfo;
+
+validator_base_info$_
+  validator_list_hash_short:uint32 
+  catchain_seqno:uint32
+= ValidatorBaseInfo;
+
+_ key:Bool max_end_lt:uint64 = KeyMaxLt;
+_ key:Bool blk_ref:ExtBlkRef = KeyExtBlkRef;
+
+_ (HashmapAugE 32 KeyExtBlkRef KeyMaxLt) = OldMcBlocksInfo;
+
+
+counters#_ last_updated:uint32 total:uint64 cnt2048:uint64 cnt65536:uint64 = Counters; 
+creator_info#4 mc_blocks:Counters shard_blocks:Counters = CreatorStats; 
+block_create_stats#17 counters:(HashmapE 256 CreatorStats) = BlockCreateStats;
+block_create_stats_ext#34 counters:(HashmapAugE 256 CreatorStats uint32) = BlockCreateStats;
+
+masterchain_state_extra#cc26
+  shard_hashes:ShardHashes
+  config:ConfigParams
+  ^[ flags:(## 16) { flags <= 1 }
+     validator_info:ValidatorInfo
+     prev_blocks:OldMcBlocksInfo
+     after_key_block:Bool
+     last_key_block:(Maybe ExtBlkRef)
+     block_create_stats:(flags . 0)?BlockCreateStats ]
+  global_balance:CurrencyCollection
+= McStateExtra;
+
+ed25519_pubkey#8e81278a pubkey:bits256 = SigPubKey;  // 288 bits
+ed25519_signature#5 R:bits256 s:bits256 = CryptoSignatureSimple;  // 516 bits
+_ CryptoSignatureSimple = CryptoSignature;
+sig_pair$_ node_id_short:bits256 sign:CryptoSignature = CryptoSignaturePair;  // 256+x ~ 772 bits
+
+certificate#4 temp_key:SigPubKey valid_since:uint32 valid_until:uint32 = Certificate;  // 356 bits
+certificate_env#a419b7d certificate:Certificate = CertificateEnv;  // 384 bits
+signed_certificate$_ certificate:Certificate certificate_signature:CryptoSignature
+  = SignedCertificate;  // 356+516 = 872 bits
+// certificate_signature is the signature of CertificateEnv (with embedded certificate) with persistent key
+chained_signature#f signed_cert:^SignedCertificate temp_key_signature:CryptoSignatureSimple
+  = CryptoSignature;   // 4+(356+516)+516 = 520 bits+ref (1392 bits total)
+// temp_key_signature is the signature of whatever was originally intended to be signed with temp_key from certificate
+
+masterchain_block_extra#cca5
+  key_block:(## 1)
+  shard_hashes:ShardHashes
+  shard_fees:ShardFees
+  ^[ prev_blk_signatures:(HashmapE 16 CryptoSignaturePair)
+     recover_create_msg:(Maybe ^InMsg)
+     mint_msg:(Maybe ^InMsg) ]
+  config:key_block?ConfigParams
+= McBlockExtra;
+
+//
+//  CONFIGURATION PARAMETERS
+//
+
+validator#53 public_key:SigPubKey weight:uint64 = ValidatorDescr;
+validator_addr#73 public_key:SigPubKey weight:uint64 adnl_addr:bits256 = ValidatorDescr;
+validators#11 utime_since:uint32 utime_until:uint32 
+  total:(## 16) main:(## 16) { main <= total } { main >= 1 } 
+  list:(Hashmap 16 ValidatorDescr) = ValidatorSet;
+validators_ext#12 utime_since:uint32 utime_until:uint32 
+  total:(## 16) main:(## 16) { main <= total } { main >= 1 } 
+  total_weight:uint64 list:(HashmapE 16 ValidatorDescr) = ValidatorSet;
+
+_ config_addr:bits256 = ConfigParam 0;
+_ elector_addr:bits256 = ConfigParam 1;
+_ minter_addr:bits256 = ConfigParam 2;  // ConfigParam 0 is used if absent
+_ fee_collector_addr:bits256 = ConfigParam 3;  // ConfigParam 1 is used if absent
+_ dns_root_addr:bits256 = ConfigParam 4;  // root TON DNS resolver
+
+_ mint_new_price:Grams mint_add_price:Grams = ConfigParam 6;
+_ to_mint:ExtraCurrencyCollection = ConfigParam 7;
+
+capabilities#c4 version:uint32 capabilities:uint64 = GlobalVersion;
+_ GlobalVersion = ConfigParam 8;  // all zero if absent
+_ mandatory_params:(Hashmap 32 True) = ConfigParam 9;
+_ critical_params:(Hashmap 32 True) = ConfigParam 10;
+
+cfg_vote_cfg#36 min_tot_rounds:uint8 max_tot_rounds:uint8 min_wins:uint8 max_losses:uint8 min_store_sec:uint32 max_store_sec:uint32 bit_price:uint32 cell_price:uint32 = ConfigProposalSetup;
+cfg_vote_setup#91 normal_params:^ConfigProposalSetup critical_params:^ConfigProposalSetup = ConfigVotingSetup;
+_ ConfigVotingSetup = ConfigParam 11;
+
+cfg_proposal#f3 param_id:int32 param_value:(Maybe ^Cell) if_hash_equal:(Maybe uint256) 
+  = ConfigProposal;
+cfg_proposal_status#ce expires:uint32 proposal:^ConfigProposal is_critical:Bool
+  voters:(HashmapE 16 True) remaining_weight:int64 validator_set_id:uint256 
+  rounds_remaining:uint8 wins:uint8 losses:uint8 = ConfigProposalStatus;
+
+wfmt_basic#1 vm_version:int32 vm_mode:uint64 = WorkchainFormat 1;
+wfmt_ext#0 min_addr_len:(## 12) max_addr_len:(## 12) addr_len_step:(## 12)
+  { min_addr_len >= 64 } { min_addr_len <= max_addr_len } 
+  { max_addr_len <= 1023 } { addr_len_step <= 1023 }
+  workchain_type_id:(## 32) { workchain_type_id >= 1 }
+  = WorkchainFormat 0;
+
+workchain#a6 enabled_since:uint32 actual_min_split:(## 8) 
+  min_split:(## 8) max_split:(## 8) { actual_min_split <= min_split }
+//workchain#a5 enabled_since:uint32 min_split:(## 8) max_split:(## 8)
+//  { min_split <= max_split } { max_split <= 60 }
+  basic:(## 1) active:Bool accept_msgs:Bool flags:(## 13) { flags = 0 }
+  zerostate_root_hash:bits256 zerostate_file_hash:bits256
+  version:uint32 format:(WorkchainFormat basic)
+  = WorkchainDescr;
+
+_ workchains:(HashmapE 32 WorkchainDescr) = ConfigParam 12;
+
+complaint_prices#1a deposit:Grams bit_price:Grams cell_price:Grams = ComplaintPricing; 
+_ ComplaintPricing = ConfigParam 13;
+
+block_grams_created#6b masterchain_block_fee:Grams basechain_block_fee:Grams
+  = BlockCreateFees;
+_ BlockCreateFees = ConfigParam 14;
+
+_ validators_elected_for:uint32 elections_start_before:uint32 
+  elections_end_before:uint32 stake_held_for:uint32
+  = ConfigParam 15;
+  
+_ max_validators:(## 16) max_main_validators:(## 16) min_validators:(## 16) 
+  { max_validators >= max_main_validators } 
+  { max_main_validators >= min_validators } 
+  { min_validators >= 1 }
+  = ConfigParam 16;
+
+_ min_stake:Grams max_stake:Grams min_total_stake:Grams max_stake_factor:uint32 = ConfigParam 17;
+
+_#cc utime_since:uint32 bit_price_ps:uint64 cell_price_ps:uint64 
+  mc_bit_price_ps:uint64 mc_cell_price_ps:uint64 = StoragePrices;
+_ (Hashmap 32 StoragePrices) = ConfigParam 18;
+
+gas_prices#dd gas_price:uint64 gas_limit:uint64 gas_credit:uint64 
+  block_gas_limit:uint64 freeze_due_limit:uint64 delete_due_limit:uint64 
+  = GasLimitsPrices;
+
+gas_prices_ext#de gas_price:uint64 gas_limit:uint64 special_gas_limit:uint64 gas_credit:uint64 
+  block_gas_limit:uint64 freeze_due_limit:uint64 delete_due_limit:uint64 
+  = GasLimitsPrices;
+
+gas_flat_pfx#d1 flat_gas_limit:uint64 flat_gas_price:uint64 other:GasLimitsPrices
+  = GasLimitsPrices;
+
+config_mc_gas_prices#_ GasLimitsPrices = ConfigParam 20;
+config_gas_prices#_ GasLimitsPrices = ConfigParam 21;
+
+param_limits#c3 underload:# soft_limit:# { underload <= soft_limit }
+  hard_limit:# { soft_limit <= hard_limit } = ParamLimits;
+block_limits#5d bytes:ParamLimits gas:ParamLimits lt_delta:ParamLimits
+  = BlockLimits;
+  
+config_mc_block_limits#_ BlockLimits = ConfigParam 22;
+config_block_limits#_ BlockLimits = ConfigParam 23;
+
+// msg_fwd_fees = (lump_price + ceil((bit_price * msg.bits + cell_price * msg.cells)/2^16)) nanograms
+// ihr_fwd_fees = ceil((msg_fwd_fees * ihr_price_factor)/2^16) nanograms
+// bits in the root cell of a message are not included in msg.bits (lump_price pays for them)
+msg_forward_prices#ea lump_price:uint64 bit_price:uint64 cell_price:uint64
+  ihr_price_factor:uint32 first_frac:uint16 next_frac:uint16 = MsgForwardPrices;
+
+// used for messages to/from masterchain
+config_mc_fwd_prices#_ MsgForwardPrices = ConfigParam 24;
+// used for all other messages
+config_fwd_prices#_ MsgForwardPrices = ConfigParam 25;
+
+catchain_config#c1 mc_catchain_lifetime:uint32 shard_catchain_lifetime:uint32 
+  shard_validators_lifetime:uint32 shard_validators_num:uint32 = CatchainConfig;
+
+catchain_config_new#c2 flags:(## 7) { flags = 0 } shuffle_mc_validators:Bool
+  mc_catchain_lifetime:uint32 shard_catchain_lifetime:uint32
+  shard_validators_lifetime:uint32 shard_validators_num:uint32 = CatchainConfig;
+
+consensus_config#d6 round_candidates:# { round_candidates >= 1 }
+  next_candidate_delay_ms:uint32 consensus_timeout_ms:uint32
+  fast_attempts:uint32 attempt_duration:uint32 catchain_max_deps:uint32
+  max_block_bytes:uint32 max_collated_bytes:uint32 = ConsensusConfig;
+
+consensus_config_new#d7 flags:(## 7) { flags = 0 } new_catchain_ids:Bool
+  round_candidates:(## 8) { round_candidates >= 1 }
+  next_candidate_delay_ms:uint32 consensus_timeout_ms:uint32
+  fast_attempts:uint32 attempt_duration:uint32 catchain_max_deps:uint32
+  max_block_bytes:uint32 max_collated_bytes:uint32 = ConsensusConfig;
+
+consensus_config_v3#d8 flags:(## 7) { flags = 0 } new_catchain_ids:Bool
+  round_candidates:(## 8) { round_candidates >= 1 }
+  next_candidate_delay_ms:uint32 consensus_timeout_ms:uint32
+  fast_attempts:uint32 attempt_duration:uint32 catchain_max_deps:uint32
+  max_block_bytes:uint32 max_collated_bytes:uint32 
+  proto_version:uint16 = ConsensusConfig;
+
+consensus_config_v4#d9 flags:(## 7) { flags = 0 } new_catchain_ids:Bool
+  round_candidates:(## 8) { round_candidates >= 1 }
+  next_candidate_delay_ms:uint32 consensus_timeout_ms:uint32
+  fast_attempts:uint32 attempt_duration:uint32 catchain_max_deps:uint32
+  max_block_bytes:uint32 max_collated_bytes:uint32
+  proto_version:uint16 catchain_max_blocks_coeff:uint32 = ConsensusConfig;
+
+_ CatchainConfig = ConfigParam 28;
+_ ConsensusConfig = ConfigParam 29;
+
+_ fundamental_smc_addr:(HashmapE 256 True) = ConfigParam 31;
+_ prev_validators:ValidatorSet = ConfigParam 32;
+_ prev_temp_validators:ValidatorSet = ConfigParam 33;
+_ cur_validators:ValidatorSet = ConfigParam 34;
+_ cur_temp_validators:ValidatorSet = ConfigParam 35;
+_ next_validators:ValidatorSet = ConfigParam 36;
+_ next_temp_validators:ValidatorSet = ConfigParam 37;
+
+validator_temp_key#3 adnl_addr:bits256 temp_public_key:SigPubKey seqno:# valid_until:uint32 = ValidatorTempKey;
+signed_temp_key#4 key:^ValidatorTempKey signature:CryptoSignature = ValidatorSignedTempKey;
+_ (HashmapE 256 ValidatorSignedTempKey) = ConfigParam 39;
+
+misbehaviour_punishment_config_v1#01 
+  default_flat_fine:Grams default_proportional_fine:uint32
+  severity_flat_mult:uint16 severity_proportional_mult:uint16
+  unpunishable_interval:uint16
+  long_interval:uint16 long_flat_mult:uint16 long_proportional_mult:uint16
+  medium_interval:uint16 medium_flat_mult:uint16 medium_proportional_mult:uint16
+   = MisbehaviourPunishmentConfig;
+_ MisbehaviourPunishmentConfig = ConfigParam 40;
+
+oracle_bridge_params#_ bridge_address:bits256 oracle_mutlisig_address:bits256 oracles:(HashmapE 256 uint256) external_chain_address:bits256 = OracleBridgeParams;
+_ OracleBridgeParams = ConfigParam 71; // Ethereum bridge
+_ OracleBridgeParams = ConfigParam 72; // Binance Smart Chain bridge
+_ OracleBridgeParams = ConfigParam 73; // Polygon bridge
+
+//
+//  PROOFS
+//
+block_signatures_pure#_ sig_count:uint32 sig_weight:uint64
+  signatures:(HashmapE 16 CryptoSignaturePair) = BlockSignaturesPure;
+block_signatures#11 validator_info:ValidatorBaseInfo pure_signatures:BlockSignaturesPure = BlockSignatures;
+block_proof#c3 proof_for:BlockIdExt root:^Cell signatures:(Maybe ^BlockSignatures) = BlockProof;
+
+chain_empty$_ = ProofChain 0;
+chain_link$_ {n:#} root:^Cell prev:n?^(ProofChain n) = ProofChain (n + 1);
+top_block_descr#d5 proof_for:BlockIdExt signatures:(Maybe ^BlockSignatures) 
+  len:(## 8) { len >= 1 } { len <= 8 } chain:(ProofChain len) = TopBlockDescr;
+
+//
+//  COLLATED DATA
+//
+top_block_descr_set#4ac789f3 collection:(HashmapE 96 ^TopBlockDescr) = TopBlockDescrSet;
+
+//
+//  VALIDATOR MISBEHAVIOR COMPLAINTS
+//
+prod_info#34 utime:uint32 mc_blk_ref:ExtBlkRef state_proof:^(MERKLE_PROOF Block)
+  prod_proof:^(MERKLE_PROOF ShardState) = ProducerInfo;
+no_blk_gen from_utime:uint32 prod_info:^ProducerInfo = ComplaintDescr;
+no_blk_gen_diff prod_info_old:^ProducerInfo prod_info_new:^ProducerInfo = ComplaintDescr;
+validator_complaint#bc validator_pubkey:bits256 description:^ComplaintDescr created_at:uint32 severity:uint8 reward_addr:uint256 paid:Grams suggested_fine:Grams suggested_fine_part:uint32 = ValidatorComplaint;
+complaint_status#2d complaint:^ValidatorComplaint voters:(HashmapE 16 True) vset_id:uint256 weight_remaining:int64 = ValidatorComplaintStatus;
+
+//
+//  TVM REFLECTION
+//
+vm_stk_null#00 = VmStackValue;
+vm_stk_tinyint#01 value:int64 = VmStackValue;
+vm_stk_int#0201_ value:int257 = VmStackValue;
+vm_stk_nan#02ff = VmStackValue;
+vm_stk_cell#03 cell:^Cell = VmStackValue;
+_ cell:^Cell st_bits:(## 10) end_bits:(## 10) { st_bits <= end_bits }
+  st_ref:(#<= 4) end_ref:(#<= 4) { st_ref <= end_ref } = VmCellSlice;
+vm_stk_slice#04 _:VmCellSlice = VmStackValue;
+vm_stk_builder#05 cell:^Cell = VmStackValue;
+vm_stk_cont#06 cont:VmCont = VmStackValue;
+vm_tupref_nil$_ = VmTupleRef 0;
+vm_tupref_single$_ entry:^VmStackValue = VmTupleRef 1;
+vm_tupref_any$_ {n:#} ref:^(VmTuple (n + 2)) = VmTupleRef (n + 2);
+vm_tuple_nil$_ = VmTuple 0;
+vm_tuple_tcons$_ {n:#} head:(VmTupleRef n) tail:^VmStackValue = VmTuple (n + 1);
+vm_stk_tuple#07 len:(## 16) data:(VmTuple len) = VmStackValue;
+
+vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack;
+vm_stk_cons#_ {n:#} rest:^(VmStackList n) tos:VmStackValue = VmStackList (n + 1);
+vm_stk_nil#_ = VmStackList 0;
+
+_ cregs:(HashmapE 4 VmStackValue) = VmSaveList;
+gas_limits#_ remaining:int64 _:^[ max_limit:int64 cur_limit:int64 credit:int64 ]
+  = VmGasLimits;
+_ libraries:(HashmapE 256 ^Cell) = VmLibraries;
+
+vm_ctl_data$_ nargs:(Maybe uint13) stack:(Maybe VmStack) save:VmSaveList
+cp:(Maybe int16) = VmControlData;
+vmc_std$00 cdata:VmControlData code:VmCellSlice = VmCont;
+vmc_envelope$01 cdata:VmControlData next:^VmCont = VmCont;
+vmc_quit$1000 exit_code:int32 = VmCont;
+vmc_quit_exc$1001 = VmCont;
+vmc_repeat$10100 count:uint63 body:^VmCont after:^VmCont = VmCont; 
+vmc_until$110000 body:^VmCont after:^VmCont = VmCont;
+vmc_again$110001 body:^VmCont = VmCont;
+vmc_while_cond$110010 cond:^VmCont body:^VmCont
+after:^VmCont = VmCont;
+vmc_while_body$110011 cond:^VmCont body:^VmCont
+after:^VmCont = VmCont;
+vmc_pushint$1111 value:int32 next:^VmCont = VmCont;
+
+//
+//  DNS RECORDS
+//
+_ (HashmapE 256 DNSRecord) = DNS_RecordSet;
+
+chunk_ref$_ {n:#} ref:^(TextChunks (n + 1)) = TextChunkRef (n + 1);
+chunk_ref_empty$_ = TextChunkRef 0;
+text_chunk$_ {n:#} len:(## 8) data:(bits (len * 8)) next:(TextChunkRef n) = TextChunks (n + 1);
+text_chunk_empty$_ = TextChunks 0;
+text$_ chunks:(## 8) rest:(TextChunks chunks) = Text;
+dns_text#1eda _:Text = DNSRecord;
+
+dns_next_resolver#ba93 resolver:MsgAddressInt = DNSRecord;  // usually in record #-1
+
+dns_adnl_address#ad01 adnl_addr:bits256 flags:(## 8) { flags <= 1 }
+  proto_list:flags . 0?ProtoList = DNSRecord;  // often in record #2
+proto_list_nil$0 = ProtoList;
+proto_list_next$1 head:Protocol tail:ProtoList = ProtoList;
+proto_http#4854 = Protocol;
+
+dns_smc_address#9fd3 smc_addr:MsgAddressInt flags:(## 8) { flags <= 1 }
+  cap_list:flags . 0?SmcCapList = DNSRecord;   // often in record #1
+cap_list_nil$0 = SmcCapList;
+cap_list_next$1 head:SmcCapability tail:SmcCapList = SmcCapList;
+cap_method_seqno#5371 = SmcCapability;
+cap_method_pubkey#71f4 = SmcCapability;
+cap_is_wallet#2177 = SmcCapability;
+cap_name#ff name:Text = SmcCapability;
+
+//
+// PAYMENT CHANNELS
+//
+
+chan_config$_  init_timeout:uint32 close_timeout:uint32 a_key:bits256 b_key:bits256 
+  a_addr:^MsgAddressInt b_addr:^MsgAddressInt channel_id:uint64 min_A_extra:Grams = ChanConfig;
+
+chan_state_init$000  signed_A:Bool signed_B:Bool min_A:Grams min_B:Grams expire_at:uint32 A:Grams B:Grams = ChanState;
+chan_state_close$001 signed_A:Bool signed_B:Bool promise_A:Grams promise_B:Grams expire_at:uint32 A:Grams B:Grams = ChanState;
+chan_state_payout$010 A:Grams B:Grams = ChanState;
+
+chan_promise$_ channel_id:uint64 promise_A:Grams promise_B:Grams = ChanPromise;
+chan_signed_promise#_ sig:(Maybe ^bits512) promise:ChanPromise = ChanSignedPromise;
+
+chan_msg_init#27317822 inc_A:Grams inc_B:Grams min_A:Grams min_B:Grams channel_id:uint64 = ChanMsg;
+chan_msg_close#f28ae183 extra_A:Grams extra_B:Grams promise:ChanSignedPromise  = ChanMsg;
+chan_msg_timeout#43278a28 = ChanMsg;
+chan_msg_payout#37fe7810 = ChanMsg;
+
+chan_signed_msg$_ sig_A:(Maybe ^bits512) sig_B:(Maybe ^bits512) msg:ChanMsg = ChanSignedMsg;
+
+chan_op_cmd#912838d1 msg:ChanSignedMsg = ChanOp;
+
+
+chan_data$_ config:^ChanConfig state:^ChanState = ChanData;
+
diff --git a/tests/examplefiles/tlb/block.tlb.output b/tests/examplefiles/tlb/block.tlb.output
new file mode 100644
index 0000000000..c36da60d96
--- /dev/null
+++ b/tests/examplefiles/tlb/block.tlb.output
@@ -0,0 +1,9295 @@
+'unit'        Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Unit'        Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'true'        Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'True'        Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'// EMPTY False;' Comment.Singleline
+'\n'          Text.Whitespace
+
+'bool_false'  Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Bool'        Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'bool_true'   Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Bool'        Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'bool_false'  Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BoolFalse'   Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'bool_true'   Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BoolTrue'    Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'nothing'     Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Maybe'       Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'just'        Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Maybe'       Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'left'        Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Either'      Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'right'       Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'Y'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Either'      Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'pair'        Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'first'       Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'second'      Name
+':'           Punctuation
+'Y'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Both'        Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'bit'         Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Bit'         Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'/*'          Comment.Multiline
+'\n '         Comment.Multiline
+'*'           Comment.Multiline
+'\n '         Comment.Multiline
+'*'           Comment.Multiline
+'   FROM hashmap.tlb\n ' Comment.Multiline
+'*'           Comment.Multiline
+'\n '         Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'// ordinary Hashmap / HashmapE, with fixed length keys' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'hm_edge'     Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'l'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'m'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'label'       Name
+':'           Punctuation
+'('           Punctuation
+'HmLabel'     Name
+' '           Text.Whitespace
+'~'           Operator
+'l'           Name
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' \n          ' Text.Whitespace
+'{'           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'('           Punctuation
+'~'           Operator
+'m'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'l'           Name
+'}'           Punctuation
+' '           Text.Whitespace
+'node'        Name
+':'           Punctuation
+'('           Punctuation
+'HashmapNode' Name
+' '           Text.Whitespace
+'m'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Hashmap'     Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'hmn_leaf'    Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HashmapNode' Name
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'hmn_fork'    Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'left'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n           ' Text.Whitespace
+'right'       Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HashmapNode' Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'hml_short'   Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'m'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'len'         Name
+':'           Punctuation
+'('           Punctuation
+'Unary'       Name
+' '           Text.Whitespace
+'~'           Operator
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'m'           Name
+'}'           Punctuation
+' '           Text.Whitespace
+'s'           Name
+':'           Punctuation
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'Bit'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HmLabel'     Name
+' '           Text.Whitespace
+'~'           Operator
+'n'           Name
+' '           Text.Whitespace
+'m'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'hml_long'    Name
+'$10'         Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'m'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'n'           Name
+':'           Punctuation
+'('           Punctuation
+'#<='         Name.Tag
+' '           Text.Whitespace
+'m'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'s'           Name
+':'           Punctuation
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'Bit'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HmLabel'     Name
+' '           Text.Whitespace
+'~'           Operator
+'n'           Name
+' '           Text.Whitespace
+'m'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'hml_same'    Name
+'$11'         Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'m'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'v'           Name
+':'           Punctuation
+'Bit'         Name
+' '           Text.Whitespace
+'n'           Name
+':'           Punctuation
+'('           Punctuation
+'#<='         Name.Tag
+' '           Text.Whitespace
+'m'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HmLabel'     Name
+' '           Text.Whitespace
+'~'           Operator
+'n'           Name
+' '           Text.Whitespace
+'m'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'unary_zero'  Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Unary'       Name
+' '           Text.Whitespace
+'~'           Operator
+'0'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'unary_succ'  Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'x'           Name
+':'           Punctuation
+'('           Punctuation
+'Unary'       Name
+' '           Text.Whitespace
+'~'           Operator
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Unary'       Name
+' '           Text.Whitespace
+'~'           Operator
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'hme_empty'   Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HashmapE'    Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'hme_root'    Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'root'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HashmapE'    Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'// true#_ = True;' Comment.Singleline
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'_'           Name
+':'           Punctuation
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'True'        Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BitstringSet' Name
+' '           Text.Whitespace
+'n'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//  HashmapAug, hashmap with an extra value ' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//   (augmentation) of type Y at every node' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'ahm_edge'    Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'l'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'m'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' \n  '       Text.Whitespace
+'label'       Name
+':'           Punctuation
+'('           Punctuation
+'HmLabel'     Name
+' '           Text.Whitespace
+'~'           Operator
+'l'           Name
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'('           Punctuation
+'~'           Operator
+'m'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'l'           Name
+'}'           Punctuation
+' \n  '       Text.Whitespace
+'node'        Name
+':'           Punctuation
+'('           Punctuation
+'HashmapAugNode' Name
+' '           Text.Whitespace
+'m'           Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HashmapAug'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'ahmn_leaf'   Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'extra'       Name
+':'           Punctuation
+'Y'           Name
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HashmapAugNode' Name
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'ahmn_fork'   Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'left'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'HashmapAug'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'right'       Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'HashmapAug'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'extra'       Name
+':'           Punctuation
+'Y'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HashmapAugNode' Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'ahme_empty'  Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'extra'       Name
+':'           Punctuation
+'Y'           Name
+' \n          ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HashmapAugE' Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'ahme_root'   Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'root'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'HashmapAug'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+')'           Punctuation
+' \n  '       Text.Whitespace
+'extra'       Name
+':'           Punctuation
+'Y'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HashmapAugE' Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'// VarHashmap / VarHashmapE, with variable-length keys' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'vhm_edge'    Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'l'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'m'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'label'       Name
+':'           Punctuation
+'('           Punctuation
+'HmLabel'     Name
+' '           Text.Whitespace
+'~'           Operator
+'l'           Name
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' \n           ' Text.Whitespace
+'{'           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'('           Punctuation
+'~'           Operator
+'m'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'l'           Name
+'}'           Punctuation
+' '           Text.Whitespace
+'node'        Name
+':'           Punctuation
+'('           Punctuation
+'VarHashmapNode' Name
+' '           Text.Whitespace
+'m'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n           ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VarHashmap'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vhmn_leaf'   Name
+'$00'         Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VarHashmapNode' Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vhmn_fork'   Name
+'$01'         Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'left'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'VarHashmap'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n             ' Text.Whitespace
+'right'       Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'VarHashmap'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n             ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VarHashmapNode' Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vhmn_cont'   Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'branch'      Name
+':'           Punctuation
+'Bit'         Name
+' '           Text.Whitespace
+'child'       Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'VarHashmap'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n            ' Text.Whitespace
+'value'       Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VarHashmapNode' Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'// nothing$0 {X:Type} = Maybe X;' Comment.Singleline
+'\n'          Text.Whitespace
+
+'// just$1 {X:Type} value:X = Maybe X;' Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'vhme_empty'  Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VarHashmapE' Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vhme_root'   Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'root'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'VarHashmap'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n            ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VarHashmapE' Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'// PfxHashmap / PfxHashmapE, with variable-length keys' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//                           constituting a prefix code' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'phm_edge'    Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'l'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'m'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'label'       Name
+':'           Punctuation
+'('           Punctuation
+'HmLabel'     Name
+' '           Text.Whitespace
+'~'           Operator
+'l'           Name
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' \n           ' Text.Whitespace
+'{'           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'('           Punctuation
+'~'           Operator
+'m'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'l'           Name
+'}'           Punctuation
+' '           Text.Whitespace
+'node'        Name
+':'           Punctuation
+'('           Punctuation
+'PfxHashmapNode' Name
+' '           Text.Whitespace
+'m'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n           ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'PfxHashmap'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'phmn_leaf'   Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'PfxHashmapNode' Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'phmn_fork'   Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'left'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'PfxHashmap'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n            ' Text.Whitespace
+'right'       Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'PfxHashmap'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'PfxHashmapNode' Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'phme_empty'  Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'PfxHashmapE' Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'phme_root'   Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'root'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'PfxHashmap'  Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n            ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'PfxHashmapE' Name
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'/*'          Comment.Multiline
+'\n '         Comment.Multiline
+'*'           Comment.Multiline
+'\n '         Comment.Multiline
+'*'           Comment.Multiline
+'  END hashmap.tlb\n ' Comment.Multiline
+'*'           Comment.Multiline
+'\n '         Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'// TON BLOCK LAYOUT' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'addr_none'   Name
+'$00'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MsgAddressExt' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'addr_extern' Name
+'$01'         Name.Tag
+' '           Text.Whitespace
+'len'         Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'9'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'external_address' Name
+':'           Punctuation
+'('           Punctuation
+'bits'        Name
+' '           Text.Whitespace
+'len'         Name
+')'           Punctuation
+' \n             ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MsgAddressExt' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'anycast_info' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'depth'       Name
+':'           Punctuation
+'('           Punctuation
+'#<='         Name.Tag
+' '           Text.Whitespace
+'30'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'depth'       Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n   '       Text.Whitespace
+'rewrite_pfx' Name
+':'           Punctuation
+'('           Punctuation
+'bits'        Name
+' '           Text.Whitespace
+'depth'       Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Anycast'     Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'addr_std'    Name
+'$10'         Name.Tag
+' '           Text.Whitespace
+'anycast'     Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'Anycast'     Name
+')'           Punctuation
+' \n   '      Text.Whitespace
+'workchain_id' Name
+':'           Punctuation
+'int8'        Name
+' '           Text.Whitespace
+'address'     Name
+':'           Punctuation
+'bits256'     Name
+'  '          Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MsgAddressInt' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'addr_var'    Name
+'$11'         Name.Tag
+' '           Text.Whitespace
+'anycast'     Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'Anycast'     Name
+')'           Punctuation
+' '           Text.Whitespace
+'addr_len'    Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'9'           Literal.Number
+')'           Punctuation
+' \n   '      Text.Whitespace
+'workchain_id' Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'address'     Name
+':'           Punctuation
+'('           Punctuation
+'bits'        Name
+' '           Text.Whitespace
+'addr_len'    Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MsgAddressInt' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'_'           Name
+':'           Punctuation
+'MsgAddressInt' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MsgAddress'  Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'_'           Name
+':'           Punctuation
+'MsgAddressExt' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MsgAddress'  Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'var_uint'    Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'len'         Name
+':'           Punctuation
+'('           Punctuation
+'#<'          Name.Tag
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'('           Punctuation
+'uint'        Name
+' '           Text.Whitespace
+'('           Punctuation
+'len'         Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+')'           Punctuation
+'\n         ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VarUInteger' Name
+' '           Text.Whitespace
+'n'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'var_int'     Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'len'         Name
+':'           Punctuation
+'('           Punctuation
+'#<'          Name.Tag
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'('           Punctuation
+'int'         Name
+' '           Text.Whitespace
+'('           Punctuation
+'len'         Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+')'           Punctuation
+' \n        ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VarInteger'  Name
+' '           Text.Whitespace
+'n'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'nanograms'   Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'amount'      Name
+':'           Punctuation
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Grams'       Name
+';'           Punctuation
+'  \n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'extra_currencies' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'dict'        Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'32'          Literal.Number
+' '           Text.Whitespace
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'32'          Literal.Number
+')'           Punctuation
+')'           Punctuation
+' \n                 ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ExtraCurrencyCollection' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'currencies'  Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'grams'       Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'other'       Name
+':'           Punctuation
+'ExtraCurrencyCollection' Name
+' \n           ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CurrencyCollection' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'int_msg_info' Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'ihr_disabled' Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'bounce'      Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'bounced'     Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'src'         Name
+':'           Punctuation
+'MsgAddressInt' Name
+' '           Text.Whitespace
+'dest'        Name
+':'           Punctuation
+'MsgAddressInt' Name
+' \n  '       Text.Whitespace
+'value'       Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'ihr_fee'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'fwd_fee'     Name
+':'           Punctuation
+'Grams'       Name
+'\n  '        Text.Whitespace
+'created_lt'  Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'created_at'  Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CommonMsgInfo' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'ext_in_msg_info' Name
+'$10'         Name.Tag
+' '           Text.Whitespace
+'src'         Name
+':'           Punctuation
+'MsgAddressExt' Name
+' '           Text.Whitespace
+'dest'        Name
+':'           Punctuation
+'MsgAddressInt' Name
+' \n  '       Text.Whitespace
+'import_fee'  Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CommonMsgInfo' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'ext_out_msg_info' Name
+'$11'         Name.Tag
+' '           Text.Whitespace
+'src'         Name
+':'           Punctuation
+'MsgAddressInt' Name
+' '           Text.Whitespace
+'dest'        Name
+':'           Punctuation
+'MsgAddressExt' Name
+'\n  '        Text.Whitespace
+'created_lt'  Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'created_at'  Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CommonMsgInfo' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'int_msg_info' Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'ihr_disabled' Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'bounce'      Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'bounced'     Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'src'         Name
+':'           Punctuation
+'MsgAddress'  Name
+' '           Text.Whitespace
+'dest'        Name
+':'           Punctuation
+'MsgAddressInt' Name
+' \n  '       Text.Whitespace
+'value'       Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'ihr_fee'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'fwd_fee'     Name
+':'           Punctuation
+'Grams'       Name
+'\n  '        Text.Whitespace
+'created_lt'  Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'created_at'  Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CommonMsgInfoRelaxed' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'ext_out_msg_info' Name
+'$11'         Name.Tag
+' '           Text.Whitespace
+'src'         Name
+':'           Punctuation
+'MsgAddress'  Name
+' '           Text.Whitespace
+'dest'        Name
+':'           Punctuation
+'MsgAddressExt' Name
+'\n  '        Text.Whitespace
+'created_lt'  Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'created_at'  Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CommonMsgInfoRelaxed' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'tick_tock'   Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'tick'        Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'tock'        Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TickTock'    Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'split_depth' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'5'           Literal.Number
+')'           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'special'     Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'TickTock'    Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'code'        Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'Cell'        Name
+')'           Punctuation
+' '           Text.Whitespace
+'data'        Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'Cell'        Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'library'     Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'SimpleLib'   Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'StateInit'   Name
+';'           Punctuation
+'\n  \n'      Text.Whitespace
+
+'simple_lib'  Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'public'      Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'root'        Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SimpleLib'   Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'message'     Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'info'        Name
+':'           Punctuation
+'CommonMsgInfo' Name
+'\n  '        Text.Whitespace
+'init'        Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'('           Punctuation
+'Either'      Name
+' '           Text.Whitespace
+'StateInit'   Name
+' '           Text.Whitespace
+'^'           Operator
+'StateInit'   Name
+')'           Punctuation
+')'           Punctuation
+'\n  '        Text.Whitespace
+'body'        Name
+':'           Punctuation
+'('           Punctuation
+'Either'      Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'^'           Operator
+'X'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Message'     Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'message'     Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'info'        Name
+':'           Punctuation
+'CommonMsgInfoRelaxed' Name
+'\n  '        Text.Whitespace
+'init'        Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'('           Punctuation
+'Either'      Name
+' '           Text.Whitespace
+'StateInit'   Name
+' '           Text.Whitespace
+'^'           Operator
+'StateInit'   Name
+')'           Punctuation
+')'           Punctuation
+'\n  '        Text.Whitespace
+'body'        Name
+':'           Punctuation
+'('           Punctuation
+'Either'      Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'^'           Operator
+'X'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MessageRelaxed' Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n  \n'      Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'Message'     Name
+' '           Text.Whitespace
+'Any'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MessageAny'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'interm_addr_regular' Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'use_dest_bits' Name
+':'           Punctuation
+'('           Punctuation
+'#<='         Name.Tag
+' '           Text.Whitespace
+'96'          Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'IntermediateAddress' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'interm_addr_simple' Name
+'$10'         Name.Tag
+' '           Text.Whitespace
+'workchain_id' Name
+':'           Punctuation
+'int8'        Name
+' '           Text.Whitespace
+'addr_pfx'    Name
+':'           Punctuation
+'uint64'      Name
+' \n  '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'IntermediateAddress' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'interm_addr_ext' Name
+'$11'         Name.Tag
+' '           Text.Whitespace
+'workchain_id' Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'addr_pfx'    Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'IntermediateAddress' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_envelope' Name
+'#4'          Name.Tag
+' '           Text.Whitespace
+'cur_addr'    Name
+':'           Punctuation
+'IntermediateAddress' Name
+' \n  '       Text.Whitespace
+'next_addr'   Name
+':'           Punctuation
+'IntermediateAddress' Name
+' '           Text.Whitespace
+'fwd_fee_remaining' Name
+':'           Punctuation
+'Grams'       Name
+' \n  '       Text.Whitespace
+'msg'         Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'Message'     Name
+' '           Text.Whitespace
+'Any'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MsgEnvelope' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'msg_import_ext' Name
+'$000'        Name.Tag
+' '           Text.Whitespace
+'msg'         Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'Message'     Name
+' '           Text.Whitespace
+'Any'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'transaction' Name
+':'           Punctuation
+'^'           Operator
+'Transaction' Name
+' \n              ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'InMsg'       Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_import_ihr' Name
+'$010'        Name.Tag
+' '           Text.Whitespace
+'msg'         Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'Message'     Name
+' '           Text.Whitespace
+'Any'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'transaction' Name
+':'           Punctuation
+'^'           Operator
+'Transaction' Name
+' \n    '     Text.Whitespace
+'ihr_fee'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'proof_created' Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'InMsg'       Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_import_imm' Name
+'$011'        Name.Tag
+' '           Text.Whitespace
+'in_msg'      Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+'\n    '      Text.Whitespace
+'transaction' Name
+':'           Punctuation
+'^'           Operator
+'Transaction' Name
+' '           Text.Whitespace
+'fwd_fee'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'InMsg'       Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_import_fin' Name
+'$100'        Name.Tag
+' '           Text.Whitespace
+'in_msg'      Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' \n    '     Text.Whitespace
+'transaction' Name
+':'           Punctuation
+'^'           Operator
+'Transaction' Name
+' '           Text.Whitespace
+'fwd_fee'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'InMsg'       Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_import_tr' Name
+'$101'        Name.Tag
+'  '          Text.Whitespace
+'in_msg'      Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' '           Text.Whitespace
+'out_msg'     Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' \n    '     Text.Whitespace
+'transit_fee' Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'InMsg'       Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_discard_fin' Name
+'$110'        Name.Tag
+' '           Text.Whitespace
+'in_msg'      Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' '           Text.Whitespace
+'transaction_id' Name
+':'           Punctuation
+'uint64'      Name
+' \n    '     Text.Whitespace
+'fwd_fee'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'InMsg'       Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_discard_tr' Name
+'$111'        Name.Tag
+' '           Text.Whitespace
+'in_msg'      Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' '           Text.Whitespace
+'transaction_id' Name
+':'           Punctuation
+'uint64'      Name
+' \n    '     Text.Whitespace
+'fwd_fee'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'proof_delivered' Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'InMsg'       Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'import_fees' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'fees_collected' Name
+':'           Punctuation
+'Grams'       Name
+' \n  '       Text.Whitespace
+'value_imported' Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ImportFees'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapAugE' Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'InMsg'       Name
+' '           Text.Whitespace
+'ImportFees'  Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'InMsgDescr'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'msg_export_ext' Name
+'$000'        Name.Tag
+' '           Text.Whitespace
+'msg'         Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'Message'     Name
+' '           Text.Whitespace
+'Any'         Name
+')'           Punctuation
+'\n    '      Text.Whitespace
+'transaction' Name
+':'           Punctuation
+'^'           Operator
+'Transaction' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsg'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_export_imm' Name
+'$010'        Name.Tag
+' '           Text.Whitespace
+'out_msg'     Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' \n    '     Text.Whitespace
+'transaction' Name
+':'           Punctuation
+'^'           Operator
+'Transaction' Name
+' '           Text.Whitespace
+'reimport'    Name
+':'           Punctuation
+'^'           Operator
+'InMsg'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsg'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_export_new' Name
+'$001'        Name.Tag
+' '           Text.Whitespace
+'out_msg'     Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' \n    '     Text.Whitespace
+'transaction' Name
+':'           Punctuation
+'^'           Operator
+'Transaction' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsg'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_export_tr' Name
+'$011'        Name.Tag
+'  '          Text.Whitespace
+'out_msg'     Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' \n    '     Text.Whitespace
+'imported'    Name
+':'           Punctuation
+'^'           Operator
+'InMsg'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsg'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_export_deq' Name
+'$1100'       Name.Tag
+' '           Text.Whitespace
+'out_msg'     Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+'\n    '      Text.Whitespace
+'import_block_lt' Name
+':'           Punctuation
+'uint63'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsg'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_export_deq_short' Name
+'$1101'       Name.Tag
+' '           Text.Whitespace
+'msg_env_hash' Name
+':'           Punctuation
+'bits256'     Name
+'\n    '      Text.Whitespace
+'next_workchain' Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'next_addr_pfx' Name
+':'           Punctuation
+'uint64'      Name
+'\n    '      Text.Whitespace
+'import_block_lt' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsg'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_export_tr_req' Name
+'$111'        Name.Tag
+' '           Text.Whitespace
+'out_msg'     Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' \n    '     Text.Whitespace
+'imported'    Name
+':'           Punctuation
+'^'           Operator
+'InMsg'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsg'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'msg_export_deq_imm' Name
+'$100'        Name.Tag
+' '           Text.Whitespace
+'out_msg'     Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' \n    '     Text.Whitespace
+'reimport'    Name
+':'           Punctuation
+'^'           Operator
+'InMsg'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsg'      Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'enqueued_lt' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'out_msg'     Name
+':'           Punctuation
+'^'           Operator
+'MsgEnvelope' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'EnqueuedMsg' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapAugE' Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'OutMsg'      Name
+' '           Text.Whitespace
+'CurrencyCollection' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsgDescr' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapAugE' Name
+' '           Text.Whitespace
+'352'         Literal.Number
+' '           Text.Whitespace
+'EnqueuedMsg' Name
+' '           Text.Whitespace
+'uint64'      Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsgQueue' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'processed_upto' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'last_msg_lt' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'last_msg_hash' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ProcessedUpto' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'// key is [ shard:uint64 mc_seqno:uint32 ]  ' Comment.Singleline
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'96'          Literal.Number
+' '           Text.Whitespace
+'ProcessedUpto' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ProcessedInfo' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'ihr_pending' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'import_lt'   Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'IhrPendingSince' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'320'         Literal.Number
+' '           Text.Whitespace
+'IhrPendingSince' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'IhrPendingInfo' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'out_queue'   Name
+':'           Punctuation
+'OutMsgQueue' Name
+' '           Text.Whitespace
+'proc_info'   Name
+':'           Punctuation
+'ProcessedInfo' Name
+'\n  '        Text.Whitespace
+'ihr_pending' Name
+':'           Punctuation
+'IhrPendingInfo' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutMsgQueueInfo' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'storage_used' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'cells'       Name
+':'           Punctuation
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'bits'        Name
+':'           Punctuation
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'public_cells' Name
+':'           Punctuation
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'StorageUsed' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'storage_used_short' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'cells'       Name
+':'           Punctuation
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'bits'        Name
+':'           Punctuation
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'StorageUsedShort' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'storage_info' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'used'        Name
+':'           Punctuation
+'StorageUsed' Name
+' '           Text.Whitespace
+'last_paid'   Name
+':'           Punctuation
+'uint32'      Name
+'\n              ' Text.Whitespace
+'due_payment' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'Grams'       Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'StorageInfo' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'account_none' Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Account'     Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'account'     Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'addr'        Name
+':'           Punctuation
+'MsgAddressInt' Name
+' '           Text.Whitespace
+'storage_stat' Name
+':'           Punctuation
+'StorageInfo' Name
+'\n          ' Text.Whitespace
+'storage'     Name
+':'           Punctuation
+'AccountStorage' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Account'     Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'account_storage' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'last_trans_lt' Name
+':'           Punctuation
+'uint64'      Name
+'\n    '      Text.Whitespace
+'balance'     Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'state'       Name
+':'           Punctuation
+'AccountState' Name
+' \n  '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccountStorage' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'account_uninit' Name
+'$00'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccountState' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'account_active' Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'_'           Name
+':'           Punctuation
+'StateInit'   Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccountState' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'account_frozen' Name
+'$01'         Name.Tag
+' '           Text.Whitespace
+'state_hash'  Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccountState' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'acc_state_uninit' Name
+'$00'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccountStatus' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'acc_state_frozen' Name
+'$01'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccountStatus' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'acc_state_active' Name
+'$10'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccountStatus' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'acc_state_nonexist' Name
+'$11'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccountStatus' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' duplicates\ntick_tock$_ tick:Bool tock:Bool = TickTock;\n\n_ split_depth:(Maybe (## 5)) special:(Maybe TickTock)\n  code:(Maybe ^Cell) data:(Maybe ^Cell)\n  library:(Maybe ^Cell) = StateInit;\n' Comment.Multiline
+
+'*/'          Comment.Multiline
+'\n\n'        Text.Whitespace
+
+'account_descr' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'account'     Name
+':'           Punctuation
+'^'           Operator
+'Account'     Name
+' '           Text.Whitespace
+'last_trans_hash' Name
+':'           Punctuation
+'bits256'     Name
+' \n  '       Text.Whitespace
+'last_trans_lt' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardAccount' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'depth_balance' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'split_depth' Name
+':'           Punctuation
+'('           Punctuation
+'#<='         Name.Tag
+' '           Text.Whitespace
+'30'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'balance'     Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'DepthBalanceInfo' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapAugE' Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'ShardAccount' Name
+' '           Text.Whitespace
+'DepthBalanceInfo' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardAccounts' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'transaction' Name
+'$0111'       Name.Tag
+' '           Text.Whitespace
+'account_addr' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'lt'          Name
+':'           Punctuation
+'uint64'      Name
+' \n  '       Text.Whitespace
+'prev_trans_hash' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'prev_trans_lt' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'now'         Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'outmsg_cnt'  Name
+':'           Punctuation
+'uint15'      Name
+'\n  '        Text.Whitespace
+'orig_status' Name
+':'           Punctuation
+'AccountStatus' Name
+' '           Text.Whitespace
+'end_status'  Name
+':'           Punctuation
+'AccountStatus' Name
+'\n  '        Text.Whitespace
+'^'           Operator
+'['           Punctuation
+' '           Text.Whitespace
+'in_msg'      Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'('           Punctuation
+'Message'     Name
+' '           Text.Whitespace
+'Any'         Name
+')'           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'out_msgs'    Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'15'          Literal.Number
+' '           Text.Whitespace
+'^'           Operator
+'('           Punctuation
+'Message'     Name
+' '           Text.Whitespace
+'Any'         Name
+')'           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+']'           Punctuation
+'\n  '        Text.Whitespace
+'total_fees'  Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'state_update' Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'HASH_UPDATE' Name
+' '           Text.Whitespace
+'Account'     Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'description' Name
+':'           Punctuation
+'^'           Operator
+'TransactionDescr' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Transaction' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'merkle_update' Name
+'#02'         Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'old_hash'    Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'new_hash'    Name
+':'           Punctuation
+'bits256'     Name
+'\n  '        Text.Whitespace
+'old'         Name
+':'           Punctuation
+'^'           Operator
+'X'           Name
+' '           Text.Whitespace
+'new'         Name
+':'           Punctuation
+'^'           Operator
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MERKLE_UPDATE' Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'update_hashes' Name
+'#72'         Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'old_hash'    Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'new_hash'    Name
+':'           Punctuation
+'bits256'     Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'HASH_UPDATE' Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'merkle_proof' Name
+'#03'         Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'virtual_hash' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'depth'       Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'virtual_root' Name
+':'           Punctuation
+'^'           Operator
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MERKLE_PROOF' Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'acc_trans'   Name
+'#5'          Name.Tag
+' '           Text.Whitespace
+'account_addr' Name
+':'           Punctuation
+'bits256'     Name
+'\n            ' Text.Whitespace
+'transactions' Name
+':'           Punctuation
+'('           Punctuation
+'HashmapAug'  Name
+' '           Text.Whitespace
+'64'          Literal.Number
+' '           Text.Whitespace
+'^'           Operator
+'Transaction' Name
+' '           Text.Whitespace
+'CurrencyCollection' Name
+')'           Punctuation
+'\n            ' Text.Whitespace
+'state_update' Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'HASH_UPDATE' Name
+' '           Text.Whitespace
+'Account'     Name
+')'           Punctuation
+'\n          ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccountBlock' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapAugE' Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'AccountBlock' Name
+' '           Text.Whitespace
+'CurrencyCollection' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardAccountBlocks' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'tr_phase_storage' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'storage_fees_collected' Name
+':'           Punctuation
+'Grams'       Name
+' \n  '       Text.Whitespace
+'storage_fees_due' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'Grams'       Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'status_change' Name
+':'           Punctuation
+'AccStatusChange' Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TrStoragePhase' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'acst_unchanged' Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccStatusChange' Name
+';'           Punctuation
+'  '          Text.Whitespace
+'// x -> x'   Comment.Singleline
+'\n'          Text.Whitespace
+
+'acst_frozen' Name
+'$10'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccStatusChange' Name
+';'           Punctuation
+'    '        Text.Whitespace
+'// init -> frozen' Comment.Singleline
+'\n'          Text.Whitespace
+
+'acst_deleted' Name
+'$11'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'AccStatusChange' Name
+';'           Punctuation
+'   '         Text.Whitespace
+'// frozen -> deleted' Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'tr_phase_credit' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'due_fees_collected' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'Grams'       Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'credit'      Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TrCreditPhase' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'tr_phase_compute_skipped' Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'reason'      Name
+':'           Punctuation
+'ComputeSkipReason' Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TrComputePhase' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'tr_phase_compute_vm' Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'success'     Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'msg_state_used' Name
+':'           Punctuation
+'Bool'        Name
+' \n  '       Text.Whitespace
+'account_activated' Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'gas_fees'    Name
+':'           Punctuation
+'Grams'       Name
+'\n  '        Text.Whitespace
+'^'           Operator
+'['           Punctuation
+' '           Text.Whitespace
+'gas_used'    Name
+':'           Punctuation
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+'\n  '        Text.Whitespace
+'gas_limit'   Name
+':'           Punctuation
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'gas_credit'  Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'('           Punctuation
+'VarUInteger' Name
+' '           Text.Whitespace
+'3'           Literal.Number
+')'           Punctuation
+')'           Punctuation
+'\n  '        Text.Whitespace
+'mode'        Name
+':'           Punctuation
+'int8'        Name
+' '           Text.Whitespace
+'exit_code'   Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'exit_arg'    Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'int32'       Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'vm_steps'    Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'vm_init_state_hash' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'vm_final_state_hash' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+']'           Punctuation
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TrComputePhase' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cskip_no_state' Name
+'$00'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ComputeSkipReason' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cskip_bad_state' Name
+'$01'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ComputeSkipReason' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cskip_no_gas' Name
+'$10'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ComputeSkipReason' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'tr_phase_action' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'success'     Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'valid'       Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'no_funds'    Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'status_change' Name
+':'           Punctuation
+'AccStatusChange' Name
+'\n  '        Text.Whitespace
+'total_fwd_fees' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'Grams'       Name
+')'           Punctuation
+' '           Text.Whitespace
+'total_action_fees' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'Grams'       Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'result_code' Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'result_arg'  Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'int32'       Name
+')'           Punctuation
+' '           Text.Whitespace
+'tot_actions' Name
+':'           Punctuation
+'uint16'      Name
+'\n  '        Text.Whitespace
+'spec_actions' Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'skipped_actions' Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'msgs_created' Name
+':'           Punctuation
+'uint16'      Name
+' \n  '       Text.Whitespace
+'action_list_hash' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'tot_msg_size' Name
+':'           Punctuation
+'StorageUsedShort' Name
+' \n  '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TrActionPhase' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'tr_phase_bounce_negfunds' Name
+'$00'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TrBouncePhase' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'tr_phase_bounce_nofunds' Name
+'$01'         Name.Tag
+' '           Text.Whitespace
+'msg_size'    Name
+':'           Punctuation
+'StorageUsedShort' Name
+'\n  '        Text.Whitespace
+'req_fwd_fees' Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TrBouncePhase' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'tr_phase_bounce_ok' Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'msg_size'    Name
+':'           Punctuation
+'StorageUsedShort' Name
+' \n  '       Text.Whitespace
+'msg_fees'    Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'fwd_fees'    Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TrBouncePhase' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'trans_ord'   Name
+'$0000'       Name.Tag
+' '           Text.Whitespace
+'credit_first' Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'storage_ph'  Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'TrStoragePhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'credit_ph'   Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'TrCreditPhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'compute_ph'  Name
+':'           Punctuation
+'TrComputePhase' Name
+' '           Text.Whitespace
+'action'      Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'TrActionPhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'aborted'     Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'bounce'      Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'TrBouncePhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'destroyed'   Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TransactionDescr' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'trans_storage' Name
+'$0001'       Name.Tag
+' '           Text.Whitespace
+'storage_ph'  Name
+':'           Punctuation
+'TrStoragePhase' Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TransactionDescr' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'trans_tick_tock' Name
+'$001'        Name.Tag
+' '           Text.Whitespace
+'is_tock'     Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'storage_ph'  Name
+':'           Punctuation
+'TrStoragePhase' Name
+'\n  '        Text.Whitespace
+'compute_ph'  Name
+':'           Punctuation
+'TrComputePhase' Name
+' '           Text.Whitespace
+'action'      Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'TrActionPhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'aborted'     Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'destroyed'   Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TransactionDescr' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'split_merge_info' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'cur_shard_pfx_len' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'6'           Literal.Number
+')'           Punctuation
+'\n  '        Text.Whitespace
+'acc_split_depth' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'6'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'this_addr'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'sibling_addr' Name
+':'           Punctuation
+'bits256'     Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SplitMergeInfo' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'trans_split_prepare' Name
+'$0100'       Name.Tag
+' '           Text.Whitespace
+'split_info'  Name
+':'           Punctuation
+'SplitMergeInfo' Name
+'\n  '        Text.Whitespace
+'storage_ph'  Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'TrStoragePhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'compute_ph'  Name
+':'           Punctuation
+'TrComputePhase' Name
+' '           Text.Whitespace
+'action'      Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'TrActionPhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'aborted'     Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'destroyed'   Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TransactionDescr' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'trans_split_install' Name
+'$0101'       Name.Tag
+' '           Text.Whitespace
+'split_info'  Name
+':'           Punctuation
+'SplitMergeInfo' Name
+'\n  '        Text.Whitespace
+'prepare_transaction' Name
+':'           Punctuation
+'^'           Operator
+'Transaction' Name
+'\n  '        Text.Whitespace
+'installed'   Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TransactionDescr' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'trans_merge_prepare' Name
+'$0110'       Name.Tag
+' '           Text.Whitespace
+'split_info'  Name
+':'           Punctuation
+'SplitMergeInfo' Name
+'\n  '        Text.Whitespace
+'storage_ph'  Name
+':'           Punctuation
+'TrStoragePhase' Name
+' '           Text.Whitespace
+'aborted'     Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TransactionDescr' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'trans_merge_install' Name
+'$0111'       Name.Tag
+' '           Text.Whitespace
+'split_info'  Name
+':'           Punctuation
+'SplitMergeInfo' Name
+'\n  '        Text.Whitespace
+'prepare_transaction' Name
+':'           Punctuation
+'^'           Operator
+'Transaction' Name
+'\n  '        Text.Whitespace
+'storage_ph'  Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'TrStoragePhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'credit_ph'   Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'TrCreditPhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'compute_ph'  Name
+':'           Punctuation
+'TrComputePhase' Name
+' '           Text.Whitespace
+'action'      Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'TrActionPhase' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'aborted'     Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'destroyed'   Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TransactionDescr' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'smc_info'    Name
+'#076ef1ea'   Name.Tag
+' '           Text.Whitespace
+'actions'     Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'msgs_sent'   Name
+':'           Punctuation
+'uint16'      Name
+'\n  '        Text.Whitespace
+'unixtime'    Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'block_lt'    Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'trans_lt'    Name
+':'           Punctuation
+'uint64'      Name
+' \n  '       Text.Whitespace
+'rand_seed'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'balance_remaining' Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'myself'      Name
+':'           Punctuation
+'MsgAddressInt' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SmartContractInfo' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'out_list_empty' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutList'     Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'out_list'    Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'prev'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'OutList'     Name
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'action'      Name
+':'           Punctuation
+'OutAction'   Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutList'     Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'action_send_msg' Name
+'#0ec3c86d'   Name.Tag
+' '           Text.Whitespace
+'mode'        Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'out_msg'     Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'MessageRelaxed' Name
+' '           Text.Whitespace
+'Any'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutAction'   Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'action_set_code' Name
+'#ad4de08e'   Name.Tag
+' '           Text.Whitespace
+'new_code'    Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutAction'   Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'action_reserve_currency' Name
+'#36e6b809'   Name.Tag
+' '           Text.Whitespace
+'mode'        Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+'\n  '        Text.Whitespace
+'currency'    Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutAction'   Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'libref_hash' Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'lib_hash'    Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'LibRef'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'libref_ref'  Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'library'     Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'LibRef'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'action_change_library' Name
+'#26fa1dd4'   Name.Tag
+' '           Text.Whitespace
+'mode'        Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'mode'        Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'2'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'libref'      Name
+':'           Punctuation
+'LibRef'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutAction'   Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'out_list_node' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'prev'        Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'action'      Name
+':'           Punctuation
+'OutAction'   Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OutListNode' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'shard_ident' Name
+'$00'         Name.Tag
+' '           Text.Whitespace
+'shard_pfx_bits' Name
+':'           Punctuation
+'('           Punctuation
+'#<='         Name.Tag
+' '           Text.Whitespace
+'60'          Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'workchain_id' Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'shard_prefix' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardIdent'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'ext_blk_ref' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'end_lt'      Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'seq_no'      Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'root_hash'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'file_hash'   Name
+':'           Punctuation
+'bits256'     Name
+' \n  '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ExtBlkRef'   Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'block_id_ext' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'shard_id'    Name
+':'           Punctuation
+'ShardIdent'  Name
+' '           Text.Whitespace
+'seq_no'      Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'root_hash'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'file_hash'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockIdExt'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'master_info' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'master'      Name
+':'           Punctuation
+'ExtBlkRef'   Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlkMasterInfo' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'shard_state' Name
+'#9023afe2'   Name.Tag
+' '           Text.Whitespace
+'global_id'   Name
+':'           Punctuation
+'int32'       Name
+'\n  '        Text.Whitespace
+'shard_id'    Name
+':'           Punctuation
+'ShardIdent'  Name
+' \n  '       Text.Whitespace
+'seq_no'      Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'vert_seq_no' Name
+':'           Punctuation
+'#'           Name.Tag
+'\n  '        Text.Whitespace
+'gen_utime'   Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'gen_lt'      Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'min_ref_mc_seqno' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'out_msg_queue_info' Name
+':'           Punctuation
+'^'           Operator
+'OutMsgQueueInfo' Name
+'\n  '        Text.Whitespace
+'before_split' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+'\n  '        Text.Whitespace
+'accounts'    Name
+':'           Punctuation
+'^'           Operator
+'ShardAccounts' Name
+'\n  '        Text.Whitespace
+'^'           Operator
+'['           Punctuation
+' '           Text.Whitespace
+'overload_history' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'underload_history' Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'total_balance' Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'total_validator_fees' Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'libraries'   Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'LibDescr'    Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'master_ref'  Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'BlkMasterInfo' Name
+')'           Punctuation
+' '           Text.Whitespace
+']'           Punctuation
+'\n  '        Text.Whitespace
+'custom'      Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'McStateExtra' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardStateUnsplit' Name
+';'           Punctuation
+'\n  \n'      Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'ShardStateUnsplit' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardState'  Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'split_state' Name
+'#5f327da5'   Name.Tag
+' '           Text.Whitespace
+'left'        Name
+':'           Punctuation
+'^'           Operator
+'ShardStateUnsplit' Name
+' '           Text.Whitespace
+'right'       Name
+':'           Punctuation
+'^'           Operator
+'ShardStateUnsplit' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardState'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'shared_lib_descr' Name
+'$00'         Name.Tag
+' '           Text.Whitespace
+'lib'         Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'publishers'  Name
+':'           Punctuation
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'True'        Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'LibDescr'    Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'block_info'  Name
+'#9bc7a987'   Name.Tag
+' '           Text.Whitespace
+'version'     Name
+':'           Punctuation
+'uint32'      Name
+' \n  '       Text.Whitespace
+'not_master'  Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'after_merge' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'before_split' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'after_split' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'want_split'  Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'want_merge'  Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'key_block'   Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'vert_seqno_incr' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+'\n  '        Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'seq_no'      Name
+':'           Punctuation
+'#'           Name.Tag
+' '           Text.Whitespace
+'vert_seq_no' Name
+':'           Punctuation
+'#'           Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'vert_seq_no' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'vert_seqno_incr' Name
+' '           Text.Whitespace
+'}'           Punctuation
+' \n  '       Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'prev_seq_no' Name
+':'           Punctuation
+'#'           Name.Tag
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'~'           Operator
+'prev_seq_no' Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'seq_no'      Name
+' '           Text.Whitespace
+'}'           Punctuation
+' \n  '       Text.Whitespace
+'shard'       Name
+':'           Punctuation
+'ShardIdent'  Name
+' '           Text.Whitespace
+'gen_utime'   Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'start_lt'    Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'end_lt'      Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'gen_validator_list_hash_short' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'gen_catchain_seqno' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'min_ref_mc_seqno' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'prev_key_block_seqno' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'gen_software' Name
+':'           Punctuation
+'flags'       Name
+' '           Text.Whitespace
+'.'           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+'?'           Operator
+'GlobalVersion' Name
+'\n  '        Text.Whitespace
+'master_ref'  Name
+':'           Punctuation
+'not_master'  Name
+'?'           Operator
+'^'           Operator
+'BlkMasterInfo' Name
+' \n  '       Text.Whitespace
+'prev_ref'    Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'BlkPrevInfo' Name
+' '           Text.Whitespace
+'after_merge' Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'prev_vert_ref' Name
+':'           Punctuation
+'vert_seqno_incr' Name
+'?'           Operator
+'^'           Operator
+'('           Punctuation
+'BlkPrevInfo' Name
+' '           Text.Whitespace
+'0'           Literal.Number
+')'           Punctuation
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockInfo'   Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'prev_blk_info' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'prev'        Name
+':'           Punctuation
+'ExtBlkRef'   Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlkPrevInfo' Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'prev_blks_info' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'prev1'       Name
+':'           Punctuation
+'^'           Operator
+'ExtBlkRef'   Name
+' '           Text.Whitespace
+'prev2'       Name
+':'           Punctuation
+'^'           Operator
+'ExtBlkRef'   Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlkPrevInfo' Name
+' '           Text.Whitespace
+'1'           Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'block'       Name
+'#11ef55aa'   Name.Tag
+' '           Text.Whitespace
+'global_id'   Name
+':'           Punctuation
+'int32'       Name
+'\n  '        Text.Whitespace
+'info'        Name
+':'           Punctuation
+'^'           Operator
+'BlockInfo'   Name
+' '           Text.Whitespace
+'value_flow'  Name
+':'           Punctuation
+'^'           Operator
+'ValueFlow'   Name
+'\n  '        Text.Whitespace
+'state_update' Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'MERKLE_UPDATE' Name
+' '           Text.Whitespace
+'ShardState'  Name
+')'           Punctuation
+' \n  '       Text.Whitespace
+'extra'       Name
+':'           Punctuation
+'^'           Operator
+'BlockExtra'  Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Block'       Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'block_extra' Name
+' '           Text.Whitespace
+'in_msg_descr' Name
+':'           Punctuation
+'^'           Operator
+'InMsgDescr'  Name
+'\n  '        Text.Whitespace
+'out_msg_descr' Name
+':'           Punctuation
+'^'           Operator
+'OutMsgDescr' Name
+'\n  '        Text.Whitespace
+'account_blocks' Name
+':'           Punctuation
+'^'           Operator
+'ShardAccountBlocks' Name
+'\n  '        Text.Whitespace
+'rand_seed'   Name
+':'           Punctuation
+'bits256'     Name
+'\n  '        Text.Whitespace
+'created_by'  Name
+':'           Punctuation
+'bits256'     Name
+'\n  '        Text.Whitespace
+'custom'      Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'McBlockExtra' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockExtra'  Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'value_flow'  Name
+' '           Text.Whitespace
+'^'           Operator
+'['           Punctuation
+' '           Text.Whitespace
+'from_prev_blk' Name
+':'           Punctuation
+'CurrencyCollection' Name
+' \n  '       Text.Whitespace
+'to_next_blk' Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'imported'    Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'exported'    Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+']'           Punctuation
+'\n  '        Text.Whitespace
+'fees_collected' Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'^'           Operator
+'['           Punctuation
+'\n  '        Text.Whitespace
+'fees_imported' Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'recovered'   Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'created'     Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'minted'      Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+']'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ValueFlow'   Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'bt_leaf'     Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'leaf'        Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BinTree'     Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'bt_fork'     Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'left'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'BinTree'     Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'right'       Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'BinTree'     Name
+' '           Text.Whitespace
+'X'           Name
+')'           Punctuation
+' \n          ' Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BinTree'     Name
+' '           Text.Whitespace
+'X'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'fsm_none'    Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'FutureSplitMerge' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'fsm_split'   Name
+'$10'         Name.Tag
+' '           Text.Whitespace
+'split_utime' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'interval'    Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'FutureSplitMerge' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'fsm_merge'   Name
+'$11'         Name.Tag
+' '           Text.Whitespace
+'merge_utime' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'interval'    Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'FutureSplitMerge' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'shard_descr' Name
+'#b'          Name.Tag
+' '           Text.Whitespace
+'seq_no'      Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'reg_mc_seqno' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'start_lt'    Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'end_lt'      Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'root_hash'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'file_hash'   Name
+':'           Punctuation
+'bits256'     Name
+' \n  '       Text.Whitespace
+'before_split' Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'before_merge' Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'want_split'  Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'want_merge'  Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'nx_cc_updated' Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'3'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'next_catchain_seqno' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'next_validator_shard' Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'min_ref_mc_seqno' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'gen_utime'   Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'split_merge_at' Name
+':'           Punctuation
+'FutureSplitMerge' Name
+'\n  '        Text.Whitespace
+'fees_collected' Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n  '        Text.Whitespace
+'funds_created' Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardDescr'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'shard_descr_new' Name
+'#a'          Name.Tag
+' '           Text.Whitespace
+'seq_no'      Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'reg_mc_seqno' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'start_lt'    Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'end_lt'      Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'root_hash'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'file_hash'   Name
+':'           Punctuation
+'bits256'     Name
+' \n  '       Text.Whitespace
+'before_split' Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'before_merge' Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'want_split'  Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'want_merge'  Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'nx_cc_updated' Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'3'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'next_catchain_seqno' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'next_validator_shard' Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'min_ref_mc_seqno' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'gen_utime'   Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'split_merge_at' Name
+':'           Punctuation
+'FutureSplitMerge' Name
+'\n  '        Text.Whitespace
+'^'           Operator
+'['           Punctuation
+' '           Text.Whitespace
+'fees_collected' Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n     '     Text.Whitespace
+'funds_created' Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+']'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardDescr'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'32'          Literal.Number
+' '           Text.Whitespace
+'^'           Operator
+'('           Punctuation
+'BinTree'     Name
+' '           Text.Whitespace
+'ShardDescr'  Name
+')'           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardHashes' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'bta_leaf'    Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'extra'       Name
+':'           Punctuation
+'Y'           Name
+' '           Text.Whitespace
+'leaf'        Name
+':'           Punctuation
+'X'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BinTreeAug'  Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'bta_fork'    Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'X'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'Y'           Name
+':'           Punctuation
+'Type'        Name
+'}'           Punctuation
+' '           Text.Whitespace
+'left'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'BinTreeAug'  Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+')'           Punctuation
+' \n           ' Text.Whitespace
+'right'       Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'BinTreeAug'  Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'extra'       Name
+':'           Punctuation
+'Y'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BinTreeAug'  Name
+' '           Text.Whitespace
+'X'           Name
+' '           Text.Whitespace
+'Y'           Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'fees'        Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'create'      Name
+':'           Punctuation
+'CurrencyCollection' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardFeeCreated' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapAugE' Name
+' '           Text.Whitespace
+'96'          Literal.Number
+' '           Text.Whitespace
+'ShardFeeCreated' Name
+' '           Text.Whitespace
+'ShardFeeCreated' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ShardFees'   Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'config_addr' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'config'      Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'32'          Literal.Number
+' '           Text.Whitespace
+'^'           Operator
+'Cell'        Name
+')'           Punctuation
+' \n  '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParams' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'validator_info' Name
+'$_'          Name.Tag
+'\n  '        Text.Whitespace
+'validator_list_hash_short' Name
+':'           Punctuation
+'uint32'      Name
+' \n  '       Text.Whitespace
+'catchain_seqno' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'nx_cc_updated' Name
+':'           Punctuation
+'Bool'        Name
+'\n'          Text.Whitespace
+
+'='           Operator
+' '           Text.Whitespace
+'ValidatorInfo' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'validator_base_info' Name
+'$_'          Name.Tag
+'\n  '        Text.Whitespace
+'validator_list_hash_short' Name
+':'           Punctuation
+'uint32'      Name
+' \n  '       Text.Whitespace
+'catchain_seqno' Name
+':'           Punctuation
+'uint32'      Name
+'\n'          Text.Whitespace
+
+'='           Operator
+' '           Text.Whitespace
+'ValidatorBaseInfo' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'key'         Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'max_end_lt'  Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'KeyMaxLt'    Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'key'         Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'blk_ref'     Name
+':'           Punctuation
+'ExtBlkRef'   Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'KeyExtBlkRef' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapAugE' Name
+' '           Text.Whitespace
+'32'          Literal.Number
+' '           Text.Whitespace
+'KeyExtBlkRef' Name
+' '           Text.Whitespace
+'KeyMaxLt'    Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OldMcBlocksInfo' Name
+';'           Punctuation
+'\n\n\n'      Text.Whitespace
+
+'counters'    Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'last_updated' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'total'       Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'cnt2048'     Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'cnt65536'    Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Counters'    Name
+';'           Punctuation
+' \n'         Text.Whitespace
+
+'creator_info' Name
+'#4'          Name.Tag
+' '           Text.Whitespace
+'mc_blocks'   Name
+':'           Punctuation
+'Counters'    Name
+' '           Text.Whitespace
+'shard_blocks' Name
+':'           Punctuation
+'Counters'    Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CreatorStats' Name
+';'           Punctuation
+' \n'         Text.Whitespace
+
+'block_create_stats' Name
+'#17'         Name.Tag
+' '           Text.Whitespace
+'counters'    Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'CreatorStats' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockCreateStats' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'block_create_stats_ext' Name
+'#34'         Name.Tag
+' '           Text.Whitespace
+'counters'    Name
+':'           Punctuation
+'('           Punctuation
+'HashmapAugE' Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'CreatorStats' Name
+' '           Text.Whitespace
+'uint32'      Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockCreateStats' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'masterchain_state_extra' Name
+'#cc26'       Name.Tag
+'\n  '        Text.Whitespace
+'shard_hashes' Name
+':'           Punctuation
+'ShardHashes' Name
+'\n  '        Text.Whitespace
+'config'      Name
+':'           Punctuation
+'ConfigParams' Name
+'\n  '        Text.Whitespace
+'^'           Operator
+'['           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n     '     Text.Whitespace
+'validator_info' Name
+':'           Punctuation
+'ValidatorInfo' Name
+'\n     '     Text.Whitespace
+'prev_blocks' Name
+':'           Punctuation
+'OldMcBlocksInfo' Name
+'\n     '     Text.Whitespace
+'after_key_block' Name
+':'           Punctuation
+'Bool'        Name
+'\n     '     Text.Whitespace
+'last_key_block' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'ExtBlkRef'   Name
+')'           Punctuation
+'\n     '     Text.Whitespace
+'block_create_stats' Name
+':'           Punctuation
+'('           Punctuation
+'flags'       Name
+' '           Text.Whitespace
+'.'           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+')'           Punctuation
+'?'           Operator
+'BlockCreateStats' Name
+' '           Text.Whitespace
+']'           Punctuation
+'\n  '        Text.Whitespace
+'global_balance' Name
+':'           Punctuation
+'CurrencyCollection' Name
+'\n'          Text.Whitespace
+
+'='           Operator
+' '           Text.Whitespace
+'McStateExtra' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'ed25519_pubkey' Name
+'#8e81278a'   Name.Tag
+' '           Text.Whitespace
+'pubkey'      Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SigPubKey'   Name
+';'           Punctuation
+'  '          Text.Whitespace
+'// 288 bits' Comment.Singleline
+'\n'          Text.Whitespace
+
+'ed25519_signature' Name
+'#5'          Name.Tag
+' '           Text.Whitespace
+'R'           Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'s'           Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CryptoSignatureSimple' Name
+';'           Punctuation
+'  '          Text.Whitespace
+'// 516 bits' Comment.Singleline
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'CryptoSignatureSimple' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CryptoSignature' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'sig_pair'    Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'node_id_short' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'sign'        Name
+':'           Punctuation
+'CryptoSignature' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CryptoSignaturePair' Name
+';'           Punctuation
+'  '          Text.Whitespace
+'// 256+x ~ 772 bits' Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'certificate' Name
+'#4'          Name.Tag
+' '           Text.Whitespace
+'temp_key'    Name
+':'           Punctuation
+'SigPubKey'   Name
+' '           Text.Whitespace
+'valid_since' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'valid_until' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Certificate' Name
+';'           Punctuation
+'  '          Text.Whitespace
+'// 356 bits' Comment.Singleline
+'\n'          Text.Whitespace
+
+'certificate_env' Name
+'#a419b7d'    Name.Tag
+' '           Text.Whitespace
+'certificate' Name
+':'           Punctuation
+'Certificate' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CertificateEnv' Name
+';'           Punctuation
+'  '          Text.Whitespace
+'// 384 bits' Comment.Singleline
+'\n'          Text.Whitespace
+
+'signed_certificate' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'certificate' Name
+':'           Punctuation
+'Certificate' Name
+' '           Text.Whitespace
+'certificate_signature' Name
+':'           Punctuation
+'CryptoSignature' Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SignedCertificate' Name
+';'           Punctuation
+'  '          Text.Whitespace
+'// 356+516 = 872 bits' Comment.Singleline
+'\n'          Text.Whitespace
+
+'// certificate_signature is the signature of CertificateEnv (with embedded certificate) with persistent key' Comment.Singleline
+'\n'          Text.Whitespace
+
+'chained_signature' Name
+'#f'          Name.Tag
+' '           Text.Whitespace
+'signed_cert' Name
+':'           Punctuation
+'^'           Operator
+'SignedCertificate' Name
+' '           Text.Whitespace
+'temp_key_signature' Name
+':'           Punctuation
+'CryptoSignatureSimple' Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CryptoSignature' Name
+';'           Punctuation
+'   '         Text.Whitespace
+'// 4+(356+516)+516 = 520 bits+ref (1392 bits total)' Comment.Singleline
+'\n'          Text.Whitespace
+
+'// temp_key_signature is the signature of whatever was originally intended to be signed with temp_key from certificate' Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'masterchain_block_extra' Name
+'#cca5'       Name.Tag
+'\n  '        Text.Whitespace
+'key_block'   Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+'\n  '        Text.Whitespace
+'shard_hashes' Name
+':'           Punctuation
+'ShardHashes' Name
+'\n  '        Text.Whitespace
+'shard_fees'  Name
+':'           Punctuation
+'ShardFees'   Name
+'\n  '        Text.Whitespace
+'^'           Operator
+'['           Punctuation
+' '           Text.Whitespace
+'prev_blk_signatures' Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'16'          Literal.Number
+' '           Text.Whitespace
+'CryptoSignaturePair' Name
+')'           Punctuation
+'\n     '     Text.Whitespace
+'recover_create_msg' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'InMsg'       Name
+')'           Punctuation
+'\n     '     Text.Whitespace
+'mint_msg'    Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'InMsg'       Name
+')'           Punctuation
+' '           Text.Whitespace
+']'           Punctuation
+'\n  '        Text.Whitespace
+'config'      Name
+':'           Punctuation
+'key_block'   Name
+'?'           Operator
+'ConfigParams' Name
+'\n'          Text.Whitespace
+
+'='           Operator
+' '           Text.Whitespace
+'McBlockExtra' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'//  CONFIGURATION PARAMETERS' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'validator'   Name
+'#53'         Name.Tag
+' '           Text.Whitespace
+'public_key'  Name
+':'           Punctuation
+'SigPubKey'   Name
+' '           Text.Whitespace
+'weight'      Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ValidatorDescr' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'validator_addr' Name
+'#73'         Name.Tag
+' '           Text.Whitespace
+'public_key'  Name
+':'           Punctuation
+'SigPubKey'   Name
+' '           Text.Whitespace
+'weight'      Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'adnl_addr'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ValidatorDescr' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'validators'  Name
+'#11'         Name.Tag
+' '           Text.Whitespace
+'utime_since' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'utime_until' Name
+':'           Punctuation
+'uint32'      Name
+' \n  '       Text.Whitespace
+'total'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'main'        Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'main'        Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'total'       Name
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'main'        Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' \n  '       Text.Whitespace
+'list'        Name
+':'           Punctuation
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'16'          Literal.Number
+' '           Text.Whitespace
+'ValidatorDescr' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ValidatorSet' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'validators_ext' Name
+'#12'         Name.Tag
+' '           Text.Whitespace
+'utime_since' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'utime_until' Name
+':'           Punctuation
+'uint32'      Name
+' \n  '       Text.Whitespace
+'total'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'main'        Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'main'        Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'total'       Name
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'main'        Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' \n  '       Text.Whitespace
+'total_weight' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'list'        Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'16'          Literal.Number
+' '           Text.Whitespace
+'ValidatorDescr' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ValidatorSet' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'config_addr' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'elector_addr' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'1'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'minter_addr' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'2'           Literal.Number
+';'           Punctuation
+'  '          Text.Whitespace
+'// ConfigParam 0 is used if absent' Comment.Singleline
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'fee_collector_addr' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'3'           Literal.Number
+';'           Punctuation
+'  '          Text.Whitespace
+'// ConfigParam 1 is used if absent' Comment.Singleline
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'dns_root_addr' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'4'           Literal.Number
+';'           Punctuation
+'  '          Text.Whitespace
+'// root TON DNS resolver' Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'mint_new_price' Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'mint_add_price' Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'6'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'to_mint'     Name
+':'           Punctuation
+'ExtraCurrencyCollection' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'7'           Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'capabilities' Name
+'#c4'         Name.Tag
+' '           Text.Whitespace
+'version'     Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'capabilities' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'GlobalVersion' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'GlobalVersion' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'8'           Literal.Number
+';'           Punctuation
+'  '          Text.Whitespace
+'// all zero if absent' Comment.Singleline
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'mandatory_params' Name
+':'           Punctuation
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'32'          Literal.Number
+' '           Text.Whitespace
+'True'        Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'9'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'critical_params' Name
+':'           Punctuation
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'32'          Literal.Number
+' '           Text.Whitespace
+'True'        Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'10'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'cfg_vote_cfg' Name
+'#36'         Name.Tag
+' '           Text.Whitespace
+'min_tot_rounds' Name
+':'           Punctuation
+'uint8'       Name
+' '           Text.Whitespace
+'max_tot_rounds' Name
+':'           Punctuation
+'uint8'       Name
+' '           Text.Whitespace
+'min_wins'    Name
+':'           Punctuation
+'uint8'       Name
+' '           Text.Whitespace
+'max_losses'  Name
+':'           Punctuation
+'uint8'       Name
+' '           Text.Whitespace
+'min_store_sec' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'max_store_sec' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'bit_price'   Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'cell_price'  Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigProposalSetup' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cfg_vote_setup' Name
+'#91'         Name.Tag
+' '           Text.Whitespace
+'normal_params' Name
+':'           Punctuation
+'^'           Operator
+'ConfigProposalSetup' Name
+' '           Text.Whitespace
+'critical_params' Name
+':'           Punctuation
+'^'           Operator
+'ConfigProposalSetup' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigVotingSetup' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'ConfigVotingSetup' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'11'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'cfg_proposal' Name
+'#f3'         Name.Tag
+' '           Text.Whitespace
+'param_id'    Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'param_value' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'Cell'        Name
+')'           Punctuation
+' '           Text.Whitespace
+'if_hash_equal' Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'uint256'     Name
+')'           Punctuation
+' \n  '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigProposal' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cfg_proposal_status' Name
+'#ce'         Name.Tag
+' '           Text.Whitespace
+'expires'     Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'proposal'    Name
+':'           Punctuation
+'^'           Operator
+'ConfigProposal' Name
+' '           Text.Whitespace
+'is_critical' Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'voters'      Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'16'          Literal.Number
+' '           Text.Whitespace
+'True'        Name
+')'           Punctuation
+' '           Text.Whitespace
+'remaining_weight' Name
+':'           Punctuation
+'int64'       Name
+' '           Text.Whitespace
+'validator_set_id' Name
+':'           Punctuation
+'uint256'     Name
+' \n  '       Text.Whitespace
+'rounds_remaining' Name
+':'           Punctuation
+'uint8'       Name
+' '           Text.Whitespace
+'wins'        Name
+':'           Punctuation
+'uint8'       Name
+' '           Text.Whitespace
+'losses'      Name
+':'           Punctuation
+'uint8'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigProposalStatus' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'wfmt_basic'  Name
+'#1'          Name.Tag
+' '           Text.Whitespace
+'vm_version'  Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'vm_mode'     Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'WorkchainFormat' Name
+' '           Text.Whitespace
+'1'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'wfmt_ext'    Name
+'#0'          Name.Tag
+' '           Text.Whitespace
+'min_addr_len' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'12'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'max_addr_len' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'12'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'addr_len_step' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'12'          Literal.Number
+')'           Punctuation
+'\n  '        Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'min_addr_len' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'64'          Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'min_addr_len' Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'max_addr_len' Name
+' '           Text.Whitespace
+'}'           Punctuation
+' \n  '       Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'max_addr_len' Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'1023'        Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'addr_len_step' Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'1023'        Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'workchain_type_id' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'32'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'workchain_type_id' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'WorkchainFormat' Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'workchain'   Name
+'#a6'         Name.Tag
+' '           Text.Whitespace
+'enabled_since' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'actual_min_split' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'min_split'   Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'max_split'   Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'actual_min_split' Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'min_split'   Name
+' '           Text.Whitespace
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'//workchain#a5 enabled_since:uint32 min_split:(## 8) max_split:(## 8)' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//  { min_split <= max_split } { max_split <= 60 }' Comment.Singleline
+'\n  '        Text.Whitespace
+'basic'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'active'      Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'accept_msgs' Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'13'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'zerostate_root_hash' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'zerostate_file_hash' Name
+':'           Punctuation
+'bits256'     Name
+'\n  '        Text.Whitespace
+'version'     Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'format'      Name
+':'           Punctuation
+'('           Punctuation
+'WorkchainFormat' Name
+' '           Text.Whitespace
+'basic'       Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'WorkchainDescr' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'workchains'  Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'32'          Literal.Number
+' '           Text.Whitespace
+'WorkchainDescr' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'12'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'complaint_prices' Name
+'#1a'         Name.Tag
+' '           Text.Whitespace
+'deposit'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'bit_price'   Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'cell_price'  Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ComplaintPricing' Name
+';'           Punctuation
+' \n'         Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'ComplaintPricing' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'13'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'block_grams_created' Name
+'#6b'         Name.Tag
+' '           Text.Whitespace
+'masterchain_block_fee' Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'basechain_block_fee' Name
+':'           Punctuation
+'Grams'       Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockCreateFees' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'BlockCreateFees' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'14'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'validators_elected_for' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'elections_start_before' Name
+':'           Punctuation
+'uint32'      Name
+' \n  '       Text.Whitespace
+'elections_end_before' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'stake_held_for' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'15'          Literal.Number
+';'           Punctuation
+'\n  \n'      Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'max_validators' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'max_main_validators' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'min_validators' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' \n  '       Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'max_validators' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'max_main_validators' Name
+' '           Text.Whitespace
+'}'           Punctuation
+' \n  '       Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'max_main_validators' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'min_validators' Name
+' '           Text.Whitespace
+'}'           Punctuation
+' \n  '       Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'min_validators' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'16'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'min_stake'   Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'max_stake'   Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'min_total_stake' Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'max_stake_factor' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'17'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+'#cc'         Name.Tag
+' '           Text.Whitespace
+'utime_since' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'bit_price_ps' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'cell_price_ps' Name
+':'           Punctuation
+'uint64'      Name
+' \n  '       Text.Whitespace
+'mc_bit_price_ps' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'mc_cell_price_ps' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'StoragePrices' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'Hashmap'     Name
+' '           Text.Whitespace
+'32'          Literal.Number
+' '           Text.Whitespace
+'StoragePrices' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'18'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'gas_prices'  Name
+'#dd'         Name.Tag
+' '           Text.Whitespace
+'gas_price'   Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'gas_limit'   Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'gas_credit'  Name
+':'           Punctuation
+'uint64'      Name
+' \n  '       Text.Whitespace
+'block_gas_limit' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'freeze_due_limit' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'delete_due_limit' Name
+':'           Punctuation
+'uint64'      Name
+' \n  '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'GasLimitsPrices' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'gas_prices_ext' Name
+'#de'         Name.Tag
+' '           Text.Whitespace
+'gas_price'   Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'gas_limit'   Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'special_gas_limit' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'gas_credit'  Name
+':'           Punctuation
+'uint64'      Name
+' \n  '       Text.Whitespace
+'block_gas_limit' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'freeze_due_limit' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'delete_due_limit' Name
+':'           Punctuation
+'uint64'      Name
+' \n  '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'GasLimitsPrices' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'gas_flat_pfx' Name
+'#d1'         Name.Tag
+' '           Text.Whitespace
+'flat_gas_limit' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'flat_gas_price' Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'other'       Name
+':'           Punctuation
+'GasLimitsPrices' Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'GasLimitsPrices' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'config_mc_gas_prices' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'GasLimitsPrices' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'20'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'config_gas_prices' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'GasLimitsPrices' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'21'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'param_limits' Name
+'#c3'         Name.Tag
+' '           Text.Whitespace
+'underload'   Name
+':'           Punctuation
+'#'           Name.Tag
+' '           Text.Whitespace
+'soft_limit'  Name
+':'           Punctuation
+'#'           Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'underload'   Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'soft_limit'  Name
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'hard_limit'  Name
+':'           Punctuation
+'#'           Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'soft_limit'  Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'hard_limit'  Name
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ParamLimits' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'block_limits' Name
+'#5d'         Name.Tag
+' '           Text.Whitespace
+'bytes'       Name
+':'           Punctuation
+'ParamLimits' Name
+' '           Text.Whitespace
+'gas'         Name
+':'           Punctuation
+'ParamLimits' Name
+' '           Text.Whitespace
+'lt_delta'    Name
+':'           Punctuation
+'ParamLimits' Name
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockLimits' Name
+';'           Punctuation
+'\n  \n'      Text.Whitespace
+
+'config_mc_block_limits' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'BlockLimits' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'22'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'config_block_limits' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'BlockLimits' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'23'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'// msg_fwd_fees = (lump_price + ceil((bit_price * msg.bits + cell_price * msg.cells)/2^16)) nanograms' Comment.Singleline
+'\n'          Text.Whitespace
+
+'// ihr_fwd_fees = ceil((msg_fwd_fees * ihr_price_factor)/2^16) nanograms' Comment.Singleline
+'\n'          Text.Whitespace
+
+'// bits in the root cell of a message are not included in msg.bits (lump_price pays for them)' Comment.Singleline
+'\n'          Text.Whitespace
+
+'msg_forward_prices' Name
+'#ea'         Name.Tag
+' '           Text.Whitespace
+'lump_price'  Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'bit_price'   Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'cell_price'  Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'ihr_price_factor' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'first_frac'  Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'next_frac'   Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MsgForwardPrices' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'// used for messages to/from masterchain' Comment.Singleline
+'\n'          Text.Whitespace
+
+'config_mc_fwd_prices' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'MsgForwardPrices' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'24'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'// used for all other messages' Comment.Singleline
+'\n'          Text.Whitespace
+
+'config_fwd_prices' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'MsgForwardPrices' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'25'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'catchain_config' Name
+'#c1'         Name.Tag
+' '           Text.Whitespace
+'mc_catchain_lifetime' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'shard_catchain_lifetime' Name
+':'           Punctuation
+'uint32'      Name
+' \n  '       Text.Whitespace
+'shard_validators_lifetime' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'shard_validators_num' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CatchainConfig' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'catchain_config_new' Name
+'#c2'         Name.Tag
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'shuffle_mc_validators' Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'mc_catchain_lifetime' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'shard_catchain_lifetime' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'shard_validators_lifetime' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'shard_validators_num' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'CatchainConfig' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'consensus_config' Name
+'#d6'         Name.Tag
+' '           Text.Whitespace
+'round_candidates' Name
+':'           Punctuation
+'#'           Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'round_candidates' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'next_candidate_delay_ms' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'consensus_timeout_ms' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'fast_attempts' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'attempt_duration' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'catchain_max_deps' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'max_block_bytes' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'max_collated_bytes' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConsensusConfig' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'consensus_config_new' Name
+'#d7'         Name.Tag
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'new_catchain_ids' Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'round_candidates' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'round_candidates' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'next_candidate_delay_ms' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'consensus_timeout_ms' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'fast_attempts' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'attempt_duration' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'catchain_max_deps' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'max_block_bytes' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'max_collated_bytes' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConsensusConfig' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'consensus_config_v3' Name
+'#d8'         Name.Tag
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'new_catchain_ids' Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'round_candidates' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'round_candidates' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'next_candidate_delay_ms' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'consensus_timeout_ms' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'fast_attempts' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'attempt_duration' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'catchain_max_deps' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'max_block_bytes' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'max_collated_bytes' Name
+':'           Punctuation
+'uint32'      Name
+' \n  '       Text.Whitespace
+'proto_version' Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConsensusConfig' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'consensus_config_v4' Name
+'#d9'         Name.Tag
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'7'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'new_catchain_ids' Name
+':'           Punctuation
+'Bool'        Name
+'\n  '        Text.Whitespace
+'round_candidates' Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'round_candidates' Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'next_candidate_delay_ms' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'consensus_timeout_ms' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'fast_attempts' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'attempt_duration' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'catchain_max_deps' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'max_block_bytes' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'max_collated_bytes' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'proto_version' Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'catchain_max_blocks_coeff' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConsensusConfig' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'CatchainConfig' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'28'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'ConsensusConfig' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'29'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'fundamental_smc_addr' Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'True'        Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'31'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'prev_validators' Name
+':'           Punctuation
+'ValidatorSet' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'32'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'prev_temp_validators' Name
+':'           Punctuation
+'ValidatorSet' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'33'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'cur_validators' Name
+':'           Punctuation
+'ValidatorSet' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'34'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'cur_temp_validators' Name
+':'           Punctuation
+'ValidatorSet' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'35'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'next_validators' Name
+':'           Punctuation
+'ValidatorSet' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'36'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'next_temp_validators' Name
+':'           Punctuation
+'ValidatorSet' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'37'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'validator_temp_key' Name
+'#3'          Name.Tag
+' '           Text.Whitespace
+'adnl_addr'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'temp_public_key' Name
+':'           Punctuation
+'SigPubKey'   Name
+' '           Text.Whitespace
+'seqno'       Name
+':'           Punctuation
+'#'           Name.Tag
+' '           Text.Whitespace
+'valid_until' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ValidatorTempKey' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'signed_temp_key' Name
+'#4'          Name.Tag
+' '           Text.Whitespace
+'key'         Name
+':'           Punctuation
+'^'           Operator
+'ValidatorTempKey' Name
+' '           Text.Whitespace
+'signature'   Name
+':'           Punctuation
+'CryptoSignature' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ValidatorSignedTempKey' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'ValidatorSignedTempKey' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'39'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'misbehaviour_punishment_config_v1' Name
+'#01'         Name.Tag
+' \n  '       Text.Whitespace
+'default_flat_fine' Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'default_proportional_fine' Name
+':'           Punctuation
+'uint32'      Name
+'\n  '        Text.Whitespace
+'severity_flat_mult' Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'severity_proportional_mult' Name
+':'           Punctuation
+'uint16'      Name
+'\n  '        Text.Whitespace
+'unpunishable_interval' Name
+':'           Punctuation
+'uint16'      Name
+'\n  '        Text.Whitespace
+'long_interval' Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'long_flat_mult' Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'long_proportional_mult' Name
+':'           Punctuation
+'uint16'      Name
+'\n  '        Text.Whitespace
+'medium_interval' Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'medium_flat_mult' Name
+':'           Punctuation
+'uint16'      Name
+' '           Text.Whitespace
+'medium_proportional_mult' Name
+':'           Punctuation
+'uint16'      Name
+'\n   '       Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'MisbehaviourPunishmentConfig' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'MisbehaviourPunishmentConfig' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'40'          Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'oracle_bridge_params' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'bridge_address' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'oracle_mutlisig_address' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'oracles'     Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'uint256'     Name
+')'           Punctuation
+' '           Text.Whitespace
+'external_chain_address' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'OracleBridgeParams' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'OracleBridgeParams' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'71'          Literal.Number
+';'           Punctuation
+' '           Text.Whitespace
+'// Ethereum bridge' Comment.Singleline
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'OracleBridgeParams' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'72'          Literal.Number
+';'           Punctuation
+' '           Text.Whitespace
+'// Binance Smart Chain bridge' Comment.Singleline
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'OracleBridgeParams' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ConfigParam' Name
+' '           Text.Whitespace
+'73'          Literal.Number
+';'           Punctuation
+' '           Text.Whitespace
+'// Polygon bridge' Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'//  PROOFS'  Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'block_signatures_pure' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'sig_count'   Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'sig_weight'  Name
+':'           Punctuation
+'uint64'      Name
+'\n  '        Text.Whitespace
+'signatures'  Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'16'          Literal.Number
+' '           Text.Whitespace
+'CryptoSignaturePair' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockSignaturesPure' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'block_signatures' Name
+'#11'         Name.Tag
+' '           Text.Whitespace
+'validator_info' Name
+':'           Punctuation
+'ValidatorBaseInfo' Name
+' '           Text.Whitespace
+'pure_signatures' Name
+':'           Punctuation
+'BlockSignaturesPure' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockSignatures' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'block_proof' Name
+'#c3'         Name.Tag
+' '           Text.Whitespace
+'proof_for'   Name
+':'           Punctuation
+'BlockIdExt'  Name
+' '           Text.Whitespace
+'root'        Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'signatures'  Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'BlockSignatures' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'BlockProof'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'chain_empty' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ProofChain'  Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'chain_link'  Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'root'        Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'prev'        Name
+':'           Punctuation
+'n'           Name
+'?'           Operator
+'^'           Operator
+'('           Punctuation
+'ProofChain'  Name
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ProofChain'  Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'top_block_descr' Name
+'#d5'         Name.Tag
+' '           Text.Whitespace
+'proof_for'   Name
+':'           Punctuation
+'BlockIdExt'  Name
+' '           Text.Whitespace
+'signatures'  Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'BlockSignatures' Name
+')'           Punctuation
+' \n  '       Text.Whitespace
+'len'         Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'len'         Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'len'         Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'8'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'chain'       Name
+':'           Punctuation
+'('           Punctuation
+'ProofChain'  Name
+' '           Text.Whitespace
+'len'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TopBlockDescr' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'//  COLLATED DATA' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'top_block_descr_set' Name
+'#4ac789f3'   Name.Tag
+' '           Text.Whitespace
+'collection'  Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'96'          Literal.Number
+' '           Text.Whitespace
+'^'           Operator
+'TopBlockDescr' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TopBlockDescrSet' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'//  VALIDATOR MISBEHAVIOR COMPLAINTS' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'prod_info'   Name
+'#34'         Name.Tag
+' '           Text.Whitespace
+'utime'       Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'mc_blk_ref'  Name
+':'           Punctuation
+'ExtBlkRef'   Name
+' '           Text.Whitespace
+'state_proof' Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'MERKLE_PROOF' Name
+' '           Text.Whitespace
+'Block'       Name
+')'           Punctuation
+'\n  '        Text.Whitespace
+'prod_proof'  Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'MERKLE_PROOF' Name
+' '           Text.Whitespace
+'ShardState'  Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ProducerInfo' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'no_blk_gen'  Name
+' '           Text.Whitespace
+'from_utime'  Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'prod_info'   Name
+':'           Punctuation
+'^'           Operator
+'ProducerInfo' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ComplaintDescr' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'no_blk_gen_diff' Name
+' '           Text.Whitespace
+'prod_info_old' Name
+':'           Punctuation
+'^'           Operator
+'ProducerInfo' Name
+' '           Text.Whitespace
+'prod_info_new' Name
+':'           Punctuation
+'^'           Operator
+'ProducerInfo' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ComplaintDescr' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'validator_complaint' Name
+'#bc'         Name.Tag
+' '           Text.Whitespace
+'validator_pubkey' Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'description' Name
+':'           Punctuation
+'^'           Operator
+'ComplaintDescr' Name
+' '           Text.Whitespace
+'created_at'  Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'severity'    Name
+':'           Punctuation
+'uint8'       Name
+' '           Text.Whitespace
+'reward_addr' Name
+':'           Punctuation
+'uint256'     Name
+' '           Text.Whitespace
+'paid'        Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'suggested_fine' Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'suggested_fine_part' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ValidatorComplaint' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'complaint_status' Name
+'#2d'         Name.Tag
+' '           Text.Whitespace
+'complaint'   Name
+':'           Punctuation
+'^'           Operator
+'ValidatorComplaint' Name
+' '           Text.Whitespace
+'voters'      Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'16'          Literal.Number
+' '           Text.Whitespace
+'True'        Name
+')'           Punctuation
+' '           Text.Whitespace
+'vset_id'     Name
+':'           Punctuation
+'uint256'     Name
+' '           Text.Whitespace
+'weight_remaining' Name
+':'           Punctuation
+'int64'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ValidatorComplaintStatus' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'//  TVM REFLECTION' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'vm_stk_null' Name
+'#00'         Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackValue' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_tinyint' Name
+'#01'         Name.Tag
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'int64'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackValue' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_int'  Name
+'#0201_'      Name.Tag
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'int257'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackValue' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_nan'  Name
+'#02ff'       Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackValue' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_cell' Name
+'#03'         Name.Tag
+' '           Text.Whitespace
+'cell'        Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackValue' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'cell'        Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'st_bits'     Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'10'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'end_bits'    Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'10'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'st_bits'     Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'end_bits'    Name
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'st_ref'      Name
+':'           Punctuation
+'('           Punctuation
+'#<='         Name.Tag
+' '           Text.Whitespace
+'4'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'end_ref'     Name
+':'           Punctuation
+'('           Punctuation
+'#<='         Name.Tag
+' '           Text.Whitespace
+'4'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'st_ref'      Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'end_ref'     Name
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCellSlice' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_slice' Name
+'#04'         Name.Tag
+' '           Text.Whitespace
+'_'           Name
+':'           Punctuation
+'VmCellSlice' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackValue' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_builder' Name
+'#05'         Name.Tag
+' '           Text.Whitespace
+'cell'        Name
+':'           Punctuation
+'^'           Operator
+'Cell'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackValue' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_cont' Name
+'#06'         Name.Tag
+' '           Text.Whitespace
+'cont'        Name
+':'           Punctuation
+'VmCont'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackValue' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_tupref_nil' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmTupleRef'  Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_tupref_single' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'entry'       Name
+':'           Punctuation
+'^'           Operator
+'VmStackValue' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmTupleRef'  Name
+' '           Text.Whitespace
+'1'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_tupref_any' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'ref'         Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'VmTuple'     Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'2'           Literal.Number
+')'           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmTupleRef'  Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'2'           Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_tuple_nil' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmTuple'     Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_tuple_tcons' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'head'        Name
+':'           Punctuation
+'('           Punctuation
+'VmTupleRef'  Name
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'tail'        Name
+':'           Punctuation
+'^'           Operator
+'VmStackValue' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmTuple'     Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_tuple' Name
+'#07'         Name.Tag
+' '           Text.Whitespace
+'len'         Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'16'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'data'        Name
+':'           Punctuation
+'('           Punctuation
+'VmTuple'     Name
+' '           Text.Whitespace
+'len'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackValue' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'vm_stack'    Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'depth'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'24'          Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'stack'       Name
+':'           Punctuation
+'('           Punctuation
+'VmStackList' Name
+' '           Text.Whitespace
+'depth'       Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStack'     Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_cons' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'rest'        Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'VmStackList' Name
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'tos'         Name
+':'           Punctuation
+'VmStackValue' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackList' Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vm_stk_nil'  Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmStackList' Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'cregs'       Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'4'           Literal.Number
+' '           Text.Whitespace
+'VmStackValue' Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmSaveList'  Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'gas_limits'  Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'remaining'   Name
+':'           Punctuation
+'int64'       Name
+' '           Text.Whitespace
+'_'           Name
+':'           Punctuation
+'^'           Operator
+'['           Punctuation
+' '           Text.Whitespace
+'max_limit'   Name
+':'           Punctuation
+'int64'       Name
+' '           Text.Whitespace
+'cur_limit'   Name
+':'           Punctuation
+'int64'       Name
+' '           Text.Whitespace
+'credit'      Name
+':'           Punctuation
+'int64'       Name
+' '           Text.Whitespace
+']'           Punctuation
+'\n  '        Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmGasLimits' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'libraries'   Name
+':'           Punctuation
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'^'           Operator
+'Cell'        Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmLibraries' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'vm_ctl_data' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'nargs'       Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'uint13'      Name
+')'           Punctuation
+' '           Text.Whitespace
+'stack'       Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'VmStack'     Name
+')'           Punctuation
+' '           Text.Whitespace
+'save'        Name
+':'           Punctuation
+'VmSaveList'  Name
+'\n'          Text.Whitespace
+
+'cp'          Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'int16'       Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmControlData' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vmc_std'     Name
+'$00'         Name.Tag
+' '           Text.Whitespace
+'cdata'       Name
+':'           Punctuation
+'VmControlData' Name
+' '           Text.Whitespace
+'code'        Name
+':'           Punctuation
+'VmCellSlice' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vmc_envelope' Name
+'$01'         Name.Tag
+' '           Text.Whitespace
+'cdata'       Name
+':'           Punctuation
+'VmControlData' Name
+' '           Text.Whitespace
+'next'        Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vmc_quit'    Name
+'$1000'       Name.Tag
+' '           Text.Whitespace
+'exit_code'   Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vmc_quit_exc' Name
+'$1001'       Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vmc_repeat'  Name
+'$10100'      Name.Tag
+' '           Text.Whitespace
+'count'       Name
+':'           Punctuation
+'uint63'      Name
+' '           Text.Whitespace
+'body'        Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'after'       Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+' \n'         Text.Whitespace
+
+'vmc_until'   Name
+'$110000'     Name.Tag
+' '           Text.Whitespace
+'body'        Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'after'       Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vmc_again'   Name
+'$110001'     Name.Tag
+' '           Text.Whitespace
+'body'        Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vmc_while_cond' Name
+'$110010'     Name.Tag
+' '           Text.Whitespace
+'cond'        Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'body'        Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+'\n'          Text.Whitespace
+
+'after'       Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vmc_while_body' Name
+'$110011'     Name.Tag
+' '           Text.Whitespace
+'cond'        Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'body'        Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+'\n'          Text.Whitespace
+
+'after'       Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'vmc_pushint' Name
+'$1111'       Name.Tag
+' '           Text.Whitespace
+'value'       Name
+':'           Punctuation
+'int32'       Name
+' '           Text.Whitespace
+'next'        Name
+':'           Punctuation
+'^'           Operator
+'VmCont'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'VmCont'      Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'//  DNS RECORDS' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'_'           Name
+' '           Text.Whitespace
+'('           Punctuation
+'HashmapE'    Name
+' '           Text.Whitespace
+'256'         Literal.Number
+' '           Text.Whitespace
+'DNSRecord'   Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'DNS_RecordSet' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'chunk_ref'   Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'ref'         Name
+':'           Punctuation
+'^'           Operator
+'('           Punctuation
+'TextChunks'  Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TextChunkRef' Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'chunk_ref_empty' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TextChunkRef' Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'text_chunk'  Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'{'           Punctuation
+'n'           Name
+':'           Punctuation
+'#'           Name.Tag
+'}'           Punctuation
+' '           Text.Whitespace
+'len'         Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'data'        Name
+':'           Punctuation
+'('           Punctuation
+'bits'        Name
+' '           Text.Whitespace
+'('           Punctuation
+'len'         Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'next'        Name
+':'           Punctuation
+'('           Punctuation
+'TextChunkRef' Name
+' '           Text.Whitespace
+'n'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TextChunks'  Name
+' '           Text.Whitespace
+'('           Punctuation
+'n'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'text_chunk_empty' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'TextChunks'  Name
+' '           Text.Whitespace
+'0'           Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'text'        Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'chunks'      Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'rest'        Name
+':'           Punctuation
+'('           Punctuation
+'TextChunks'  Name
+' '           Text.Whitespace
+'chunks'      Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Text'        Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'dns_text'    Name
+'#1eda'       Name.Tag
+' '           Text.Whitespace
+'_'           Name
+':'           Punctuation
+'Text'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'DNSRecord'   Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'dns_next_resolver' Name
+'#ba93'       Name.Tag
+' '           Text.Whitespace
+'resolver'    Name
+':'           Punctuation
+'MsgAddressInt' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'DNSRecord'   Name
+';'           Punctuation
+'  '          Text.Whitespace
+'// usually in record #-1' Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'dns_adnl_address' Name
+'#ad01'       Name.Tag
+' '           Text.Whitespace
+'adnl_addr'   Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'proto_list'  Name
+':'           Punctuation
+'flags'       Name
+' '           Text.Whitespace
+'.'           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+'?'           Operator
+'ProtoList'   Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'DNSRecord'   Name
+';'           Punctuation
+'  '          Text.Whitespace
+'// often in record #2' Comment.Singleline
+'\n'          Text.Whitespace
+
+'proto_list_nil' Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ProtoList'   Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'proto_list_next' Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'head'        Name
+':'           Punctuation
+'Protocol'    Name
+' '           Text.Whitespace
+'tail'        Name
+':'           Punctuation
+'ProtoList'   Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ProtoList'   Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'proto_http'  Name
+'#4854'       Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Protocol'    Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'dns_smc_address' Name
+'#9fd3'       Name.Tag
+' '           Text.Whitespace
+'smc_addr'    Name
+':'           Punctuation
+'MsgAddressInt' Name
+' '           Text.Whitespace
+'flags'       Name
+':'           Punctuation
+'('           Punctuation
+'##'          Name.Tag
+' '           Text.Whitespace
+'8'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'flags'       Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+'\n  '        Text.Whitespace
+'cap_list'    Name
+':'           Punctuation
+'flags'       Name
+' '           Text.Whitespace
+'.'           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+'?'           Operator
+'SmcCapList'  Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'DNSRecord'   Name
+';'           Punctuation
+'   '         Text.Whitespace
+'// often in record #1' Comment.Singleline
+'\n'          Text.Whitespace
+
+'cap_list_nil' Name
+'$0'          Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SmcCapList'  Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cap_list_next' Name
+'$1'          Name.Tag
+' '           Text.Whitespace
+'head'        Name
+':'           Punctuation
+'SmcCapability' Name
+' '           Text.Whitespace
+'tail'        Name
+':'           Punctuation
+'SmcCapList'  Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SmcCapList'  Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cap_method_seqno' Name
+'#5371'       Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SmcCapability' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cap_method_pubkey' Name
+'#71f4'       Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SmcCapability' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cap_is_wallet' Name
+'#2177'       Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SmcCapability' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'cap_name'    Name
+'#ff'         Name.Tag
+' '           Text.Whitespace
+'name'        Name
+':'           Punctuation
+'Text'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'SmcCapability' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'//'          Comment.Singleline
+'\n'          Text.Whitespace
+
+'// PAYMENT CHANNELS' Comment.Singleline
+'\n'          Text.Whitespace
+
+'//'          Comment.Singleline
+'\n\n'        Text.Whitespace
+
+'chan_config' Name
+'$_'          Name.Tag
+'  '          Text.Whitespace
+'init_timeout' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'close_timeout' Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'a_key'       Name
+':'           Punctuation
+'bits256'     Name
+' '           Text.Whitespace
+'b_key'       Name
+':'           Punctuation
+'bits256'     Name
+' \n  '       Text.Whitespace
+'a_addr'      Name
+':'           Punctuation
+'^'           Operator
+'MsgAddressInt' Name
+' '           Text.Whitespace
+'b_addr'      Name
+':'           Punctuation
+'^'           Operator
+'MsgAddressInt' Name
+' '           Text.Whitespace
+'channel_id'  Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'min_A_extra' Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanConfig'  Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'chan_state_init' Name
+'$000'        Name.Tag
+'  '          Text.Whitespace
+'signed_A'    Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'signed_B'    Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'min_A'       Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'min_B'       Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'expire_at'   Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'A'           Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'B'           Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanState'   Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'chan_state_close' Name
+'$001'        Name.Tag
+' '           Text.Whitespace
+'signed_A'    Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'signed_B'    Name
+':'           Punctuation
+'Bool'        Name
+' '           Text.Whitespace
+'promise_A'   Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'promise_B'   Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'expire_at'   Name
+':'           Punctuation
+'uint32'      Name
+' '           Text.Whitespace
+'A'           Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'B'           Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanState'   Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'chan_state_payout' Name
+'$010'        Name.Tag
+' '           Text.Whitespace
+'A'           Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'B'           Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanState'   Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'chan_promise' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'channel_id'  Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'promise_A'   Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'promise_B'   Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanPromise' Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'chan_signed_promise' Name
+'#_'          Name.Tag
+' '           Text.Whitespace
+'sig'         Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'bits512'     Name
+')'           Punctuation
+' '           Text.Whitespace
+'promise'     Name
+':'           Punctuation
+'ChanPromise' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanSignedPromise' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'chan_msg_init' Name
+'#27317822'   Name.Tag
+' '           Text.Whitespace
+'inc_A'       Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'inc_B'       Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'min_A'       Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'min_B'       Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'channel_id'  Name
+':'           Punctuation
+'uint64'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanMsg'     Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'chan_msg_close' Name
+'#f28ae183'   Name.Tag
+' '           Text.Whitespace
+'extra_A'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'extra_B'     Name
+':'           Punctuation
+'Grams'       Name
+' '           Text.Whitespace
+'promise'     Name
+':'           Punctuation
+'ChanSignedPromise' Name
+'  '          Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanMsg'     Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'chan_msg_timeout' Name
+'#43278a28'   Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanMsg'     Name
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'chan_msg_payout' Name
+'#37fe7810'   Name.Tag
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanMsg'     Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'chan_signed_msg' Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'sig_A'       Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'bits512'     Name
+')'           Punctuation
+' '           Text.Whitespace
+'sig_B'       Name
+':'           Punctuation
+'('           Punctuation
+'Maybe'       Name
+' '           Text.Whitespace
+'^'           Operator
+'bits512'     Name
+')'           Punctuation
+' '           Text.Whitespace
+'msg'         Name
+':'           Punctuation
+'ChanMsg'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanSignedMsg' Name
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'chan_op_cmd' Name
+'#912838d1'   Name.Tag
+' '           Text.Whitespace
+'msg'         Name
+':'           Punctuation
+'ChanSignedMsg' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanOp'      Name
+';'           Punctuation
+'\n\n\n'      Text.Whitespace
+
+'chan_data'   Name
+'$_'          Name.Tag
+' '           Text.Whitespace
+'config'      Name
+':'           Punctuation
+'^'           Operator
+'ChanConfig'  Name
+' '           Text.Whitespace
+'state'       Name
+':'           Punctuation
+'^'           Operator
+'ChanState'   Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'ChanData'    Name
+';'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/treetop/metagrammar.treetop.output b/tests/examplefiles/treetop/metagrammar.treetop.output
index 7fee358c41..bb8725a37d 100644
--- a/tests/examplefiles/treetop/metagrammar.treetop.output
+++ b/tests/examplefiles/treetop/metagrammar.treetop.output
@@ -37,35 +37,35 @@
 '?'           Operator
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'requires'    Name
 '.'           Operator
 'text_value'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'prefix'      Name
 '.'           Operator
 'text_value'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'module_or_grammar' Name
 '.'           Operator
 'compile'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'suffix'      Name
 '.'           Operator
 'text_value'  Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -155,33 +155,33 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'prefix'      Name
 '.'           Operator
 'text_value'  Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'module_contents' Name
 '.'           Operator
 'compile'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'suffix'      Name
 '.'           Operator
 'text_value'  Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n\t  '    Text
+'\n\n\t  '    Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'parser_name' Name.Function
-'\n\t    '    Text
+'\n\t    '    Text.Whitespace
 'prefix'      Name
 '.'           Operator
 'name'        Name
@@ -195,9 +195,9 @@
 'module_contents' Name
 '.'           Operator
 'parser_name' Name
-'\n\t  '      Text
+'\n\t  '      Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -269,45 +269,45 @@
 '>'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'declarations' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 '['           Operator
 'head'        Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'tail'        Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'tail'        Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'super'       Keyword
 '.'           Operator
 'elements'    Name
 '.'           Operator
 'map'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'elt'         Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'elt'         Name
 '.'           Operator
 'declaration' Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -315,16 +315,16 @@
 "''"          Literal.String.Single
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'builder'     Name
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -361,22 +361,22 @@
 '*'           Operator
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'builder'     Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'builder'     Name
-' '           Text
+' '           Text.Whitespace
 '<<'          Operator
-' '           Text
+' '           Text.Whitespace
 'text_value'  Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -456,68 +456,68 @@
 '>'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'alternatives' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 '['           Operator
 'head'        Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'tail'        Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'tail'        Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'super'       Keyword
 '.'           Operator
 'elements'    Name
 '.'           Operator
 'map'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '|'           Operator
 'elt'         Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'elt'         Name
 '.'           Operator
 'alternative' Name
 '}'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 '('           Punctuation
 'alternatives' Name
 '.'           Operator
 'map'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '|'           Operator
 'alt'         Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'alt'         Name
 '.'           Operator
 'inline_modules' Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
 ')'           Punctuation
 '.'           Operator
 'flatten'     Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -546,58 +546,58 @@
 '>'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'sequence_elements' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 '['           Operator
 'head'        Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'tail'        Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'tail'        Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'super'       Keyword
 '.'           Operator
 'elements'    Name
 '.'           Operator
 'map'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '|'           Operator
 'elt'         Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'elt'         Name
 '.'           Operator
 'labeled_sequence_primary' Name
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 '('           Punctuation
 'sequence_elements' Name
 '.'           Operator
 'map'         Name
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '|'           Operator
 'elt'         Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'elt'         Name
 '.'           Operator
 'inline_modules' Name
@@ -605,31 +605,31 @@
 ')'           Punctuation
 '.'           Operator
 'flatten'     Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 '['           Operator
 'sequence_element_accessor_module' Name
 ']'           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-'\n            ' Text
+'\n            ' Text.Whitespace
 'node_class_declarations' Name
 '.'           Operator
 'inline_modules' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'node_class_declarations' Name
 '.'           Operator
 'inline_module_name' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -655,63 +655,63 @@
 'atomic'      Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'parent_expression' Name
 '='           Operator
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'prefix'      Name
 '.'           Operator
 'compile'     Name
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'prefixed_expression' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'atomic'      Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'atomic'      Name
 '.'           Operator
 'inline_modules' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -724,54 +724,54 @@
 'predicate_block' Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'parent_expression' Name
 '='           Operator
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'prefix'      Name
 '.'           Operator
 'compile'     Name
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'prefixed_expression' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'predicate_block' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -783,81 +783,81 @@
 'node_class_declarations' Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'parent_expression' Name
 '='           Operator
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'suffix'      Name
 '.'           Operator
 'compile'     Name
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'optional_expression' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'atomic'      Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'node_class_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'node_class_declarations' Name
 '.'           Operator
 'node_class_name' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'atomic'      Name
 '.'           Operator
 'inline_modules' Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'node_class_declarations' Name
 '.'           Operator
 'inline_modules' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'node_class_declarations' Name
 '.'           Operator
 'inline_module_name' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -867,73 +867,73 @@
 'node_class_declarations' Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'parent_expression' Name
 '='           Operator
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'atomic'      Name
 '.'           Operator
 'compile'     Name
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'node_class_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'node_class_declarations' Name
 '.'           Operator
 'node_class_name' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'atomic'      Name
 '.'           Operator
 'inline_modules' Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'node_class_declarations' Name
 '.'           Operator
 'inline_modules' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'node_class_declarations' Name
 '.'           Operator
 'inline_module_name' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -947,74 +947,74 @@
 'sequence_primary' Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'lexical_address' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'sequence_primary' Name
 '.'           Operator
 'compile'     Name
 '('           Punctuation
 'lexical_address' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'sequence_primary' Name
 '.'           Operator
 'inline_modules' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'label_name'  Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'label'       Name
 '.'           Operator
 'name'        Name
-'\n              ' Text
+'\n              ' Text.Whitespace
 'label'       Name
 '.'           Operator
 'name'        Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'elsif'       Keyword
-' '           Text
+' '           Text.Whitespace
 'sequence_primary' Name
 '.'           Operator
 'instance_of?' Name
 '('           Punctuation
 'Nonterminal' Name.Constant
 ')'           Punctuation
-'\n              ' Text
+'\n              ' Text.Whitespace
 'sequence_primary' Name
 '.'           Operator
 'text_value'  Name
-'\n            ' Text
+'\n            ' Text.Whitespace
 'else'        Keyword
-'\n              ' Text
+'\n              ' Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n            ' Text
+'\n            ' Text.Whitespace
 'end'         Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -1033,20 +1033,20 @@
 "':'"         Literal.String.Single
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'name'        Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'elements'    Name
 '['           Operator
 '0'           Literal.Number.Integer
 ']'           Operator
 '.'           Operator
 'text_value'  Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -1054,15 +1054,15 @@
 "''"          Literal.String.Single
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'name'        Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -1076,61 +1076,61 @@
 'atomic'      Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'lexical_address' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'prefix'      Name
 '.'           Operator
 'compile'     Name
 '('           Punctuation
 'lexical_address' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'prefixed_expression' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'elements'    Name
 '['           Operator
 '1'           Literal.Number.Integer
 ']'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'atomic'      Name
 '.'           Operator
 'inline_modules' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -1143,54 +1143,54 @@
 'predicate_block' Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'parent_expression' Name
 '='           Operator
 'nil'         Keyword.Pseudo
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'prefix'      Name
 '.'           Operator
 'compile'     Name
 '('           Punctuation
 'address'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'prefixed_expression' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'predicate_block' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -1200,58 +1200,58 @@
 'suffix'      Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'compile'     Name.Function
 '('           Punctuation
 'lexical_address' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ')'           Punctuation
-'\n            ' Text
+'\n            ' Text.Whitespace
 'suffix'      Name
 '.'           Operator
 'compile'     Name
 '('           Punctuation
 'lexical_address' Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'builder'     Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'self'        Name.Builtin
 ')'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'node_class_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'atomic'      Name
 '.'           Operator
 'inline_modules' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -1293,51 +1293,51 @@
 'trailing_inline_module' Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'node_class_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'node_class_expression' Name
 '.'           Operator
 'node_class_name' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'trailing_inline_module' Name
 '.'           Operator
 'inline_modules' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'trailing_inline_module' Name
 '.'           Operator
 'inline_module' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'inline_module' Name
 '.'           Operator
 'module_name' Name
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -1460,17 +1460,17 @@
 '>'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'parsing_expression' Name
 '.'           Operator
 'inline_modules' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -1524,17 +1524,17 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'string'      Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'super'       Keyword
 '.'           Operator
 'text_value'  Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -1645,17 +1645,17 @@
 '>'           Punctuation
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'characters'  Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'super'       Keyword
 '.'           Operator
 'text_value'  Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -1758,20 +1758,20 @@
 "'>'"         Literal.String.Single
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'node_class_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'elements'    Name
 '['           Operator
 '2'           Literal.Number.Integer
 ']'           Operator
 '.'           Operator
 'text_value'  Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -1779,15 +1779,15 @@
 "''"          Literal.String.Single
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'node_class_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
@@ -1801,27 +1801,27 @@
 'inline_module' Name
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 '['           Operator
 'inline_module' Name
 ']'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'inline_module' Name
 '.'           Operator
 'module_name' Name
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n        '  Text.Whitespace
 '/'           Operator
@@ -1829,32 +1829,32 @@
 "''"          Literal.String.Single
 ' '           Text.Whitespace
 '{'           Punctuation
-'\n          ' Text
+'\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_modules' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 '['           Operator
 ']'           Operator
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n\n          ' Text
+'\n\n          ' Text.Whitespace
 'def'         Keyword
-' '           Text
+' '           Text.Whitespace
 'inline_module_name' Name.Function
-'\n            ' Text
+'\n            ' Text.Whitespace
 'nil'         Keyword.Pseudo
-'\n          ' Text
+'\n          ' Text.Whitespace
 'end'         Keyword
-'\n        '  Text
+'\n        '  Text.Whitespace
 '}'           Punctuation
 '\n      '    Text.Whitespace
 'end'         Keyword
diff --git a/tests/examplefiles/ucode/example.u1.output b/tests/examplefiles/ucode/example.u1.output
index c857bbdf60..ea3c3a8ea2 100644
--- a/tests/examplefiles/ucode/example.u1.output
+++ b/tests/examplefiles/ucode/example.u1.output
@@ -432,4 +432,4 @@
 'pfail'       Keyword.Declaration
 '\n        '  Text
 'end'         Name.Function
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/vcl/varnish.vcl.output b/tests/examplefiles/vcl/varnish.vcl.output
index 7c8d2540b4..dfae36b8ab 100644
--- a/tests/examplefiles/vcl/varnish.vcl.output
+++ b/tests/examplefiles/vcl/varnish.vcl.output
@@ -1,214 +1,214 @@
 '# This is the VCL configuration Varnish will automatically append to your VCL' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# file during compilation/loading. See the vcl(7) man page for details on syntax' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# and semantics.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# New users is recommended to use the example.vcl file as a starting point.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'vcl '        Keyword.Reserved
 '4.0'         Name.Constant
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'backend'     Keyword
 ' foo'        Name.Variable.Global
 ' {'          Punctuation
-' '           Text
+' '           Text.Whitespace
 '.host'       Name.Attribute
 ' = '         Operator
 '"'           Literal.String
 '192.168.1.1' Literal.String
 '"'           Literal.String
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'probe '      Keyword
 'blatti '     Name.Variable.Global
 '{'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '.url'        Name.Attribute
 ' = '         Operator
 '"'           Literal.String
 'foo'         Literal.String
 '"'           Literal.String
 ';'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'probe '      Keyword
 'fooy '       Name.Variable.Global
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '.url'        Name.Attribute
 ' = '         Operator
 '"'           Literal.String
 'beh'         Literal.String
 '"'           Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'acl '        Keyword
 'foo '        Name.Variable.Global
 '{'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '"'           Literal.String
 '192.168.1.1' Literal.String
 '"'           Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '"'           Literal.String
 '192.168.0.0' Literal.String
 '"'           Literal.String
 '/'           Operator
 '24'          Literal.Number
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '!'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '192.168.0.1' Literal.String
 '"'           Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'include'     Keyword
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'foo.vcl'     Literal.String
 '"'           Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword
-' '           Text
+' '           Text.Whitespace
 'std'         Name
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_init'    Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'new'         Keyword
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'director'    Name.Function
 '.'           Punctuation
 'foo'         Name.Function
 '('           Punctuation
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_recv'    Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'ban'         Keyword
 '('           Punctuation
 'req.url'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'foo'         Literal.String
 '"'           Literal.String
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'rollback'    Keyword
 '('           Punctuation
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_recv'    Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'PRI'         Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 '/*'          Comment.Multiline
 ' We do not support SPDY or HTTP' Comment.Multiline
 '/'           Comment.Multiline
 '2.0 '        Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\t'          Text
+'\t'          Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'synth'       Name.Constant
 '('           Punctuation
@@ -216,547 +216,547 @@
 ')'           Punctuation
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'GET'         Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'HEAD'        Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'PUT'         Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'POST'        Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'TRACE'       Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'OPTIONS'     Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'DELETE'      Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 '/*'          Comment.Multiline
 ' Non-RFC2616 or CONNECT which is weird. ' Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'pipe'        Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'GET'         Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-' '           Text
+' '           Text.Whitespace
 'req.method'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '!='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'HEAD'        Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 '/*'          Comment.Multiline
 ' We only deal with GET and HEAD by default ' Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'pass'        Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'req.http.Authorization' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-' '           Text
+' '           Text.Whitespace
 'req.http.Cookie' Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 '/*'          Comment.Multiline
 ' Not cacheable by default ' Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'pass'        Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'hash'        Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_pipe'    Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '# By default Connection: close is set on all piped requests, to stop' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '# connection reuse from sending future requests directly to the' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '# (potentially) wrong backend. If you do want this to happen, you can undo' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '# it here.'  Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '# unset bereq.http.connection;' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'pipe'        Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_pass'    Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'fetch'       Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_hash'    Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'hash_data'   Keyword
 '('           Punctuation
 'req.url'     Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'req.http.host' Name.Variable
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'hash_data'   Keyword
 '('           Punctuation
 'req.http.host' Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '}'           Operator
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'hash_data'   Keyword
 '('           Punctuation
 'server.ip'   Name.Variable
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'lookup'      Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_purge'   Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'synth'       Name.Constant
 '('           Punctuation
 '200'         Literal.Number
 ','           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'Purged'      Literal.String
 '"'           Literal.String
 ')'           Punctuation
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_hit'     Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'obj.ttl'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '>='          Operator
-' '           Text
+' '           Text.Whitespace
 '0s'          Literal.Date
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 '// A pure unadultered hit, deliver it' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'deliver'     Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'obj.ttl'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'obj.grace'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '0s'          Literal.Date
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 '// Object is in grace, deliver it' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 '// Automatically triggers a background fetch' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'deliver'     Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '// fetch & deliver once we get the result' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'miss'        Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_miss'    Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'fetch'       Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_deliver' Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'set'         Keyword
-' '           Text
+' '           Text.Whitespace
 'resp.http.x-storage' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'storage.s0.free' Name.Variable
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'deliver'     Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '/*'          Comment.Multiline
 '\n '         Comment.Multiline
 '*'           Comment.Multiline
 ' We can come here "invisibly" with the following errors: 413, 417 & 503\n ' Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_synth'   Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'set'         Keyword
-' '           Text
+' '           Text.Whitespace
 'resp.http.Content-Type' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'text/html; charset=utf-8' Literal.String
 '"'           Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'set'         Keyword
-' '           Text
+' '           Text.Whitespace
 'resp.http.Retry-After' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '5'           Literal.String
 '"'           Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'synthetic'   Keyword
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '!'           Literal.String
@@ -805,23 +805,23 @@
 'e'           Literal.String
 '>'           Literal.String
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'resp.status' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'resp.reason' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '/'           Literal.String
@@ -869,23 +869,23 @@
 'r'           Literal.String
 ' '           Literal.String
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'resp.status' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'resp.reason' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '/'           Literal.String
@@ -902,13 +902,13 @@
 'p'           Literal.String
 '>'           Literal.String
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'resp.reason' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '/'           Literal.String
@@ -960,13 +960,13 @@
 ':'           Literal.String
 ' '           Literal.String
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'req.xid'     Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '/'           Literal.String
@@ -1038,205 +1038,205 @@
 '\n'          Literal.String
 
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'deliver'     Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#######################################################################' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Backend Fetch' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_backend_fetch' Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'fetch'       Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_backend_response' Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'beresp.ttl'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '<='          Operator
-' '           Text
+' '           Text.Whitespace
 '0s'          Literal.Date
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 'beresp.http.Set-Cookie' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 'beresp.http.Surrogate-control' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'no-store'    Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 '('           Punctuation
 '!'           Operator
 'beresp.http.Surrogate-Control' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '&&'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'beresp.http.Cache-Control' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'no-cache|no-store|private' Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '||'          Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'      '      Text
+'      '      Text.Whitespace
 'beresp.http.Vary' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '*'           Literal.String
 '"'           Literal.String
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 '/*'          Comment.Multiline
 '\n        '  Comment.Multiline
 '*'           Comment.Multiline
 ' Mark as "Hit-For-Pass" for the next 2 minutes\n        ' Comment.Multiline
 '*/'          Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'set'         Keyword
-' '           Text
+' '           Text.Whitespace
 'beresp.ttl'  Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '120s'        Literal.Date
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'        '    Text
+'        '    Text.Whitespace
 'set'         Keyword
-' '           Text
+' '           Text.Whitespace
 'beresp.uncacheable' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'true'        Name.Builtin
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'deliver'     Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_backend_error' Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'set'         Keyword
-' '           Text
+' '           Text.Whitespace
 'beresp.http.Content-Type' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'text/html; charset=utf-8' Literal.String
 '"'           Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'set'         Keyword
-' '           Text
+' '           Text.Whitespace
 'beresp.http.Retry-After' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 '5'           Literal.String
 '"'           Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'synthetic'   Keyword
 '('           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '!'           Literal.String
@@ -1285,23 +1285,23 @@
 'e'           Literal.String
 '>'           Literal.String
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'beresp.status' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'beresp.reason' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '/'           Literal.String
@@ -1349,23 +1349,23 @@
 'r'           Literal.String
 ' '           Literal.String
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'beresp.status' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'beresp.reason' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '/'           Literal.String
@@ -1382,13 +1382,13 @@
 'p'           Literal.String
 '>'           Literal.String
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'beresp.reason' Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '/'           Literal.String
@@ -1440,13 +1440,13 @@
 ':'           Literal.String
 ' '           Literal.String
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'bereq.xid'   Name.Variable
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '{"'          Literal.String
 '<'           Literal.String
 '/'           Literal.String
@@ -1518,56 +1518,56 @@
 '\n'          Literal.String
 
 '"}'          Literal.String
-' '           Text
+' '           Text.Whitespace
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'deliver'     Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#######################################################################' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '# Housekeeping' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_init'    Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'sub '        Keyword
 'vcl_fini'    Name.Function
 ' {'          Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'    '        Text
+'    '        Text.Whitespace
 'return'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'ok'          Name.Constant
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/vim/phpcomplete.vim.output b/tests/examplefiles/vim/phpcomplete.vim.output
index 7457f04561..7c95593634 100644
--- a/tests/examplefiles/vim/phpcomplete.vim.output
+++ b/tests/examplefiles/vim/phpcomplete.vim.output
@@ -1,49 +1,49 @@
 '" Vim completion script' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Language:\tPHP' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Maintainer:\tMikolaj Machowski ( mikmach AT wp DOT pl )' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" Last Change:\t2006 May 9' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"'           Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"   TODO:'   Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"   - Class aware completion:' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"      a) caching?' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"   - Switching to HTML (XML?) completion (SQL) inside of phpStrings' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"   - allow also for XML completion <- better do html_flavor for HTML' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"     completion' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"   - outside of <?php?> getting parent tag may cause problems. Heh, even in' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"     perfect conditions GetLastOpenTag doesn\'t cooperate... Inside of' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"     phpStrings this can be even a bonus but outside of <?php?> it is not the' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '"     best situation' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'function'    Keyword
 '!'           Punctuation
@@ -57,7 +57,7 @@
 ' '           Text
 'base'        Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'if'          Keyword
@@ -65,7 +65,7 @@
 'a'           Keyword
 ':'           Text
 'findstart'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'unlet'       Text
@@ -74,10 +74,10 @@
 'b'           Keyword
 ':'           Text
 'php_menu'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Check if we are inside of PHP markup' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -90,7 +90,7 @@
 '('           Punctuation
 "'.'"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -112,14 +112,14 @@
 ' '           Text
 "'bWn'"       Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 '\\'          Text
 ' '           Text
 '\'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"\'' Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -141,16 +141,16 @@
 ' '           Text
 "'Wn'"        Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 '\\'          Text
 ' '           Text
 '\'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"\'' Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -179,10 +179,10 @@
 ','           Punctuation
 '0'           Literal.Number
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t" We are outside of any PHP markup. Complete HTML' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -200,7 +200,7 @@
 ' '           Text
 "''"          Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -213,7 +213,7 @@
 '['           Text
 '2'           Literal.Number
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -233,7 +233,7 @@
 ' '           Text
 'cursor_col'  Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -253,20 +253,20 @@
 ' '           Text
 'base'        Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'return'      Keyword
 ' '           Text
 'htmlbegin'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t" locate the start of the word' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -279,7 +279,7 @@
 '('           Punctuation
 "'.'"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -296,7 +296,7 @@
 '-'           Punctuation
 ' '           Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -309,7 +309,7 @@
 '('           Punctuation
 "'.'"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -326,7 +326,7 @@
 '-'           Punctuation
 ' '           Text
 '2'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'while'       Keyword
@@ -354,7 +354,7 @@
 '~'           Punctuation
 ' '           Text
 "'[a-zA-Z_0-9\\x7f-\\xff$]'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -365,11 +365,11 @@
 '='           Punctuation
 ' '           Text
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endwhile'    Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -389,35 +389,35 @@
 ':'           Text
 'compl_begin' Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'return'      Keyword
 ' '           Text
 'start'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t\t" We can be also inside of phpString with HTML tags. Deal with' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t" it later (time, not lines).' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t" If exists b:php_menu it means completion was already constructed we' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t" don\'t need to do anything more' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'if'          Keyword
@@ -426,7 +426,7 @@
 '('           Punctuation
 '"b:php_menu"' Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'return'      Keyword
@@ -434,14 +434,14 @@
 'b'           Keyword
 ':'           Text
 'php_menu'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t" Initialize base return lists' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'let'         Keyword
@@ -452,7 +452,7 @@
 ' '           Text
 '['           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'let'         Keyword
@@ -463,10 +463,10 @@
 ' '           Text
 '['           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t" a:base is very short - we need context' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'if'          Keyword
@@ -475,7 +475,7 @@
 '('           Punctuation
 '"b:compl_context"' Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -487,7 +487,7 @@
 'b'           Keyword
 ':'           Text
 'compl_context' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'unlet'       Text
@@ -496,13 +496,13 @@
 'b'           Keyword
 ':'           Text
 'compl_context' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'if'          Keyword
@@ -512,7 +512,7 @@
 '('           Punctuation
 "'g:php_builtin_functions'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -522,13 +522,13 @@
 'LoadData'    Text
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'let'         Keyword
@@ -550,9 +550,9 @@
 ' '           Text
 "''"          Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'if'          Keyword
@@ -563,13 +563,13 @@
 '~'           Punctuation
 ' '           Text
 "'\\(=\\s*new\\|extends\\)\\s\\+$'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Complete class name' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Internal solution for finding classes in current file.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -585,7 +585,7 @@
 ' '           Text
 "'$'"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -594,14 +594,14 @@
 '('           Punctuation
 'file'        Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 '\\'          Text
 ' '           Text
 '\'v:val =~ "class\\\\s\\\\+[a-zA-Z_\\\\x7f-\\\\xff][a-zA-Z_0-9\\\\x7f-\\\\xff]*\\\\s*("\'' Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -622,7 +622,7 @@
 '\'escape(v:val, " \\\\#%")\'' Literal.String.Single
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -638,7 +638,7 @@
 ' '           Text
 "' '"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -654,7 +654,7 @@
 ' '           Text
 "'class\\s\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -665,7 +665,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -675,7 +675,7 @@
 'in'          Keyword
 ' '           Text
 'int_values'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -691,7 +691,7 @@
 ' '           Text
 "'^[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -702,7 +702,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -715,18 +715,18 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Prepare list of classes from tags file' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -737,7 +737,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -758,7 +758,7 @@
 '\'escape(v:val, " \\\\#%")\'' Literal.String.Single
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -769,7 +769,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'exe'         Text
@@ -783,7 +783,7 @@
 "'.*\\tc\\(\\t\\|$\\)/j '" Literal.String.Single
 '.'           Text
 'fnames'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -795,7 +795,7 @@
 'getqflist'   Text
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -808,7 +808,7 @@
 '>'           Punctuation
 ' '           Text
 '0'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -818,16 +818,16 @@
 'in'          Keyword
 ' '           Text
 'qflist'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t" [:space:] thing: we don\'t have to be so strict when' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t" dealing with tags files - entries there were already' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t" checked by ctags.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -846,7 +846,7 @@
 ' '           Text
 "'^[^[:space:]]\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -859,22 +859,22 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Prepare list of built in classes from g:php_builtin_functions' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -884,7 +884,7 @@
 '('           Punctuation
 '"g:php_omni_bi_classes"' Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -897,7 +897,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'for'         Keyword
@@ -912,7 +912,7 @@
 ':'           Text
 'php_builtin_object_functions' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -939,17 +939,17 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -965,7 +965,7 @@
 'int_classes' Text
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -982,7 +982,7 @@
 'ext_classes' Text
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -1001,9 +1001,9 @@
 'php_omni_bi_classes' Text
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -1013,7 +1013,7 @@
 'in'          Keyword
 ' '           Text
 'classes'     Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -1028,7 +1028,7 @@
 'a'           Keyword
 ':'           Text
 'base'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'call'        Keyword
@@ -1040,17 +1040,17 @@
 ' '           Text
 'm'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -1061,7 +1061,7 @@
 ' '           Text
 '['           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -1071,7 +1071,7 @@
 'in'          Keyword
 ' '           Text
 'res'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -1093,21 +1093,21 @@
 "'c'"         Literal.String.Single
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'return'      Keyword
 ' '           Text
 'final_menu'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'elseif'      Keyword
@@ -1118,24 +1118,24 @@
 '~'           Punctuation
 ' '           Text
 "'\\(->\\|::\\)$'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Complete user functions and variables' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Internal solution for current file.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" That seems as unnecessary repeating of functions but there are' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" few not so subtle differences as not appending of $ and addition' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" of \'kind\' tag (not necessary in regular completion)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -1156,10 +1156,10 @@
 '~'           Punctuation
 ' '           Text
 "'\\$this->$'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t\t" Get name of the class' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -1174,16 +1174,16 @@
 '('           Punctuation
 'scontext'    Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t\t" Get location of class definition, we have to iterate through all' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t" tags files separately because we need relative path from current' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t" file to the exact file (tags file can be in different dir)' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -1194,7 +1194,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1209,11 +1209,11 @@
 '('           Punctuation
 'classname'   Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1223,13 +1223,13 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -1240,9 +1240,9 @@
 '='           Punctuation
 ' '           Text
 "'VIMPHP_BUILTINOBJECT'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -1257,7 +1257,7 @@
 ':'           Text
 'php_builtin_object_functions' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'if'          Keyword
@@ -1270,7 +1270,7 @@
 "'^'"         Literal.String.Single
 '.'           Text
 'classname'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -1298,7 +1298,7 @@
 "''"          Literal.String.Single
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t   \t' Text
 '\\'          Text
@@ -1314,31 +1314,31 @@
 ']'           Text
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'return'      Keyword
 ' '           Text
 'res'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -1347,7 +1347,7 @@
 '('           Punctuation
 'classlocation' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1360,7 +1360,7 @@
 '('           Punctuation
 'classlocation' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1370,7 +1370,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1391,7 +1391,7 @@
 ' '           Text
 'classname'   Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1407,34 +1407,34 @@
 ' '           Text
 '"\\n"'       Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t\t\t" YES, YES, YES! - we have whole content including extends!' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" Now we need to get two elements: public functions and public' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" vars' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" NO, NO, NO! - third separate filtering looking for content' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" :(, but all of them have differences. To squeeze them into' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" one implementation would require many additional arguments' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" and ifs. No good solution' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" Functions declared with public keyword or without any' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" keyword are public' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1450,14 +1450,14 @@
 'sccontent'   Text
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 '\'v:val =~ "^\\\\s*\\\\(static\\\\s\\\\+\\\\|public\\\\s\\\\+\\\\)*function"\'' Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1473,7 +1473,7 @@
 ' '           Text
 "' '"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1489,7 +1489,7 @@
 ' '           Text
 "'function\\s\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1500,7 +1500,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -1510,7 +1510,7 @@
 'in'          Keyword
 ' '           Text
 'sfuncs'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -1523,14 +1523,14 @@
 '('           Punctuation
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 "'^&\\?\\zs[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\ze'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -1543,14 +1543,14 @@
 '('           Punctuation
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 "'^&\\?[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*(\\zs.\\{-}\\ze)\\_s*{'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'if'          Keyword
@@ -1561,7 +1561,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -1576,21 +1576,21 @@
 '='           Punctuation
 ' '           Text
 'f_args'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" Variables declared with var or with public keyword are' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t" public' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1606,14 +1606,14 @@
 'sccontent'   Text
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 '\'v:val =~ "^\\\\s*\\\\(public\\\\|var\\\\)\\\\s\\\\+\\\\$"\'' Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1629,7 +1629,7 @@
 ' '           Text
 "' '"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1645,7 +1645,7 @@
 ' '           Text
 "'\\$'"       Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1656,7 +1656,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -1666,7 +1666,7 @@
 'in'          Keyword
 ' '           Text
 'svars'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -1679,14 +1679,14 @@
 '('           Punctuation
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 "'^\\zs[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\ze'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'if'          Keyword
@@ -1697,7 +1697,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -1710,17 +1710,17 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1731,7 +1731,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'call'        Keyword
@@ -1743,7 +1743,7 @@
 ' '           Text
 'c_functions' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'call'        Keyword
@@ -1755,9 +1755,9 @@
 ' '           Text
 'c_variables' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -1773,7 +1773,7 @@
 'all_values'  Text
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'if'          Keyword
@@ -1798,7 +1798,7 @@
 '~'           Punctuation
 ' '           Text
 "'::'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'call'        Keyword
@@ -1810,7 +1810,7 @@
 ' '           Text
 'm'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'elseif'      Keyword
@@ -1825,7 +1825,7 @@
 'a'           Keyword
 ':'           Text
 'base'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'call'        Keyword
@@ -1837,17 +1837,17 @@
 ' '           Text
 'm'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1861,9 +1861,9 @@
 '+'           Punctuation
 ' '           Text
 'res2'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -1874,7 +1874,7 @@
 ' '           Text
 '['           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -1884,7 +1884,7 @@
 'in'          Keyword
 ' '           Text
 'start_list'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'if'          Keyword
@@ -1896,7 +1896,7 @@
 ' '           Text
 'i'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -1906,7 +1906,7 @@
 '='           Punctuation
 ' '           Text
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'if'          Keyword
@@ -1920,7 +1920,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -1932,11 +1932,11 @@
 'i'           Keyword
 '.'           Text
 "' class '"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -1945,7 +1945,7 @@
 ' '           Text
 '+'           Punctuation
 '='           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -1956,7 +1956,7 @@
 ':'           Text
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -1970,7 +1970,7 @@
 'i'           Keyword
 ']'           Text
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -1980,11 +1980,11 @@
 "'v'"         Literal.String.Single
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -1993,7 +1993,7 @@
 ' '           Text
 '+'           Punctuation
 '='           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -2016,7 +2016,7 @@
 "''"          Literal.String.Single
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -2032,7 +2032,7 @@
 '.'           Text
 "')'"         Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -2042,37 +2042,37 @@
 "'f'"         Literal.String.Single
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'return'      Keyword
 ' '           Text
 'final_list'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -2085,7 +2085,7 @@
 '~'           Punctuation
 ' '           Text
 "'^\\$'"      Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -2095,11 +2095,11 @@
 '='           Punctuation
 ' '           Text
 "'$'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -2109,11 +2109,11 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2129,7 +2129,7 @@
 ' '           Text
 "'$'"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2145,7 +2145,7 @@
 ' '           Text
 "' '"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2161,7 +2161,7 @@
 ' '           Text
 "'\\$'"       Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2172,7 +2172,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -2182,7 +2182,7 @@
 'in'          Keyword
 ' '           Text
 'sfile'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -2193,7 +2193,7 @@
 '~'           Punctuation
 ' '           Text
 "'^\\$[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*=\\s*new'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -2211,11 +2211,11 @@
 ')'           Punctuation
 '.'           Text
 "'->'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -2231,11 +2231,11 @@
 ' '           Text
 "'^[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -2246,7 +2246,7 @@
 '~'           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -2261,21 +2261,21 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" ctags has good support for PHP, use tags file for external' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" variables' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2296,7 +2296,7 @@
 '\'escape(v:val, " \\\\#%")\'' Literal.String.Single
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2307,7 +2307,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -2318,7 +2318,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -2342,7 +2342,7 @@
 ' '           Text
 "''"          Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'exe'         Text
@@ -2354,7 +2354,7 @@
 "'.*\\tv\\(\\t\\|$\\)/j '" Literal.String.Single
 '.'           Text
 'fnames'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -2366,7 +2366,7 @@
 'getqflist'   Text
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -2379,7 +2379,7 @@
 '>'           Punctuation
 ' '           Text
 '0'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -2389,7 +2389,7 @@
 'in'          Keyword
 ' '           Text
 'qflist'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -2408,10 +2408,10 @@
 ' '           Text
 "'^[^[:space:]]\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t" Add -> if it is possible object declaration' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -2421,7 +2421,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'if'          Keyword
@@ -2437,7 +2437,7 @@
 'item'        Text
 '.'           Text
 "'\\s*=\\s*new\\s\\+'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -2449,7 +2449,7 @@
 'item'        Text
 '.'           Text
 "'->'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -2465,18 +2465,18 @@
 "'text'"      Literal.String.Single
 ']'           Text
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 "'=\\s*new\\s\\+\\zs[a-zA-Z_0-9\\x7f-\\xff]\\+\\ze'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -2491,22 +2491,22 @@
 '='           Punctuation
 ' '           Text
 'classname'   Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Now we have all variables in int_vars dictionary' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -2518,10 +2518,10 @@
 ' '           Text
 'ext_vars'    Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Internal solution for finding functions in current file.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2537,7 +2537,7 @@
 ' '           Text
 "'$'"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -2546,14 +2546,14 @@
 '('           Punctuation
 'file'        Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 '\\'          Text
 ' '           Text
 '\'v:val =~ "function\\\\s\\\\+&\\\\?[a-zA-Z_\\\\x7f-\\\\xff][a-zA-Z_0-9\\\\x7f-\\\\xff]*\\\\s*("\'' Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2574,7 +2574,7 @@
 '\'escape(v:val, " \\\\#%")\'' Literal.String.Single
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2590,7 +2590,7 @@
 ' '           Text
 "' '"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2606,7 +2606,7 @@
 ' '           Text
 "'function\\s\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2617,7 +2617,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -2627,7 +2627,7 @@
 'in'          Keyword
 ' '           Text
 'int_values'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -2640,14 +2640,14 @@
 '('           Punctuation
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 '\\'          Text
 ' '           Text
 "'^&\\?\\zs[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\ze'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -2660,14 +2660,14 @@
 '('           Punctuation
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 '\\'          Text
 ' '           Text
 "'^&\\?[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*(\\zs.\\{-}\\ze)\\_s*{'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -2684,14 +2684,14 @@
 'f_args'      Text
 '.'           Text
 "')'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Prepare list of functions from tags file' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2702,7 +2702,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -2713,7 +2713,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'exe'         Text
@@ -2727,7 +2727,7 @@
 "'.*\\tf\\(\\t\\|$\\)/j '" Literal.String.Single
 '.'           Text
 'fnames'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -2739,7 +2739,7 @@
 'getqflist'   Text
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -2752,7 +2752,7 @@
 '>'           Punctuation
 ' '           Text
 '0'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -2762,10 +2762,10 @@
 'in'          Keyword
 ' '           Text
 'qflist'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t" File name' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -2784,7 +2784,7 @@
 ' '           Text
 "'^[^[:space:]]\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -2803,7 +2803,7 @@
 ' '           Text
 "'\\t\\zs\\f\\+\\ze'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -2819,14 +2819,14 @@
 "'text'"      Literal.String.Single
 ']'           Text
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 "'function\\s\\+&\\?[^[:space:]]\\+\\s*(\\s*\\zs.\\{-}\\ze\\s*)\\s*{\\?'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -2845,21 +2845,21 @@
 "') - '"      Literal.String.Single
 '.'           Text
 'fname'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2870,7 +2870,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -2882,7 +2882,7 @@
 ' '           Text
 'int_functions' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -2894,7 +2894,7 @@
 ' '           Text
 'ext_functions' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -2908,7 +2908,7 @@
 ')'           Punctuation
 ' '           Text
 '" external variables are already in' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -2922,9 +2922,9 @@
 ':'           Text
 'php_builtin_object_functions' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -2940,7 +2940,7 @@
 'all_values'  Text
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -2955,7 +2955,7 @@
 'a'           Keyword
 ':'           Text
 'base'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'call'        Keyword
@@ -2967,17 +2967,17 @@
 ' '           Text
 'm'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -2987,9 +2987,9 @@
 '='           Punctuation
 ' '           Text
 'res'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3000,7 +3000,7 @@
 ' '           Text
 '['           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -3010,7 +3010,7 @@
 'in'          Keyword
 ' '           Text
 'start_list'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -3022,7 +3022,7 @@
 ' '           Text
 'i'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -3032,7 +3032,7 @@
 '='           Punctuation
 ' '           Text
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'if'          Keyword
@@ -3046,7 +3046,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -3058,11 +3058,11 @@
 'i'           Keyword
 '.'           Text
 "' class '"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -3094,11 +3094,11 @@
 "'v'"         Literal.String.Single
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -3107,7 +3107,7 @@
 ' '           Text
 '+'           Punctuation
 '='           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3130,7 +3130,7 @@
 "''"          Literal.String.Single
 ')'           Punctuation
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3144,7 +3144,7 @@
 'i'           Keyword
 ']'           Text
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3154,29 +3154,29 @@
 "'f'"         Literal.String.Single
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'return'      Keyword
 ' '           Text
 'final_list'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'if'          Keyword
@@ -3189,13 +3189,13 @@
 '~'           Punctuation
 ' '           Text
 "'^\\$'"      Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Complete variables' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Built-in variables {{{' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3211,7 +3211,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3220,7 +3220,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3229,7 +3229,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3238,7 +3238,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3247,7 +3247,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3256,7 +3256,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3265,7 +3265,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3274,7 +3274,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3283,7 +3283,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3292,7 +3292,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3301,7 +3301,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3310,7 +3310,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3319,7 +3319,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3328,7 +3328,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3337,7 +3337,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3346,7 +3346,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3355,7 +3355,7 @@
 ':'           Text
 "''"          Literal.String.Single
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3363,19 +3363,19 @@
 "'$this'"     Literal.String.Single
 ':'           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" }}}'   Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Internal solution for current file.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3391,7 +3391,7 @@
 ' '           Text
 "'$'"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3407,7 +3407,7 @@
 ' '           Text
 "' '"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3423,7 +3423,7 @@
 ' '           Text
 "'\\ze\\$'"   Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3434,7 +3434,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -3444,7 +3444,7 @@
 'in'          Keyword
 ' '           Text
 'int_vals'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -3455,7 +3455,7 @@
 '~'           Punctuation
 ' '           Text
 "'^\\$[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*=\\s*new'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -3468,7 +3468,7 @@
 '('           Punctuation
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
@@ -3477,11 +3477,11 @@
 ')'           Punctuation
 '.'           Text
 "'->'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -3494,18 +3494,18 @@
 '('           Punctuation
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 "'^\\$[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -3516,7 +3516,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -3529,17 +3529,17 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -3552,10 +3552,10 @@
 ':'           Text
 'php_builtin_vars' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" ctags has support for PHP, use tags file for external variables' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3576,7 +3576,7 @@
 '\'escape(v:val, " \\\\#%")\'' Literal.String.Single
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3587,7 +3587,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -3598,7 +3598,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -3622,7 +3622,7 @@
 ' '           Text
 "''"          Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'exe'         Text
@@ -3634,7 +3634,7 @@
 "'.*\\tv\\(\\t\\|$\\)/j '" Literal.String.Single
 '.'           Text
 'fnames'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -3646,7 +3646,7 @@
 'getqflist'   Text
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -3659,7 +3659,7 @@
 '>'           Punctuation
 ' '           Text
 '0'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -3669,7 +3669,7 @@
 'in'          Keyword
 ' '           Text
 'qflist'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -3690,7 +3690,7 @@
 ' '           Text
 "'^[^[:space:]]\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -3700,10 +3700,10 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t" Add -> if it is possible object declaration' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'if'          Keyword
@@ -3719,7 +3719,7 @@
 'item'        Text
 '.'           Text
 "'\\s*=\\s*new\\s\\+'" Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -3731,7 +3731,7 @@
 'item'        Text
 '.'           Text
 "'->'"        Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 'let'         Keyword
@@ -3747,18 +3747,18 @@
 "'text'"      Literal.String.Single
 ']'           Text
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 "'=\\s*new\\s\\+\\zs[a-zA-Z_0-9\\x7f-\\xff]\\+\\ze'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -3771,21 +3771,21 @@
 '='           Punctuation
 ' '           Text
 'm_menu'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -3797,7 +3797,7 @@
 ' '           Text
 'ext_vars'    Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3812,9 +3812,9 @@
 '('           Punctuation
 'int_vars'    Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -3830,7 +3830,7 @@
 'int_vars'    Text
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -3845,7 +3845,7 @@
 'a'           Keyword
 ':'           Text
 'base'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'call'        Keyword
@@ -3857,17 +3857,17 @@
 ' '           Text
 'm'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3877,9 +3877,9 @@
 '='           Punctuation
 ' '           Text
 'res'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -3890,7 +3890,7 @@
 ' '           Text
 '['           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -3900,7 +3900,7 @@
 'in'          Keyword
 ' '           Text
 'int_list'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -3914,7 +3914,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -3924,7 +3924,7 @@
 '='           Punctuation
 ' '           Text
 "' '"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'if'          Keyword
@@ -3938,7 +3938,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -3950,11 +3950,11 @@
 'i'           Keyword
 '.'           Text
 "' class '"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -3986,11 +3986,11 @@
 "'v'"         Literal.String.Single
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -4012,53 +4012,53 @@
 "'v'"         Literal.String.Single
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'return'      Keyword
 ' '           Text
 'int_dict'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Complete everything else -' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t"  + functions,  DONE' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t"  + keywords of language DONE' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t"  + defines (constant definitions), DONE' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t"  + extend keywords for predefined constants, DONE' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t"  + classes (after new), DONE' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t"  + limit choice after -> and :: to funcs and vars DONE' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Internal solution for finding functions in current file.' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4074,7 +4074,7 @@
 ' '           Text
 "'$'"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -4083,14 +4083,14 @@
 '('           Punctuation
 'file'        Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 '\\'          Text
 ' '           Text
 '\'v:val =~ "function\\\\s\\\\+&\\\\?[a-zA-Z_\\\\x7f-\\\\xff][a-zA-Z_0-9\\\\x7f-\\\\xff]*\\\\s*("\'' Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4111,7 +4111,7 @@
 '\'escape(v:val, " \\\\#%")\'' Literal.String.Single
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4127,7 +4127,7 @@
 ' '           Text
 "' '"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4143,7 +4143,7 @@
 ' '           Text
 "'function\\s\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4154,7 +4154,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -4164,7 +4164,7 @@
 'in'          Keyword
 ' '           Text
 'int_values'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -4177,14 +4177,14 @@
 '('           Punctuation
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 '\\'          Text
 ' '           Text
 "'^&\\?\\zs[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\ze'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -4197,14 +4197,14 @@
 '('           Punctuation
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 '\\'          Text
 ' '           Text
 "'^&\\?[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*(\\s*\\zs.\\{-}\\ze\\s*)\\_s*{'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -4221,14 +4221,14 @@
 'f_args'      Text
 '.'           Text
 "')'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Prepare list of functions from tags file' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4239,7 +4239,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -4250,7 +4250,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'exe'         Text
@@ -4264,7 +4264,7 @@
 "'.*\\tf\\(\\t\\|$\\)/j '" Literal.String.Single
 '.'           Text
 'fnames'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -4276,7 +4276,7 @@
 'getqflist'   Text
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -4289,7 +4289,7 @@
 '>'           Punctuation
 ' '           Text
 '0'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -4299,10 +4299,10 @@
 'in'          Keyword
 ' '           Text
 'qflist'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t" File name' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -4321,7 +4321,7 @@
 ' '           Text
 "'^[^[:space:]]\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -4340,7 +4340,7 @@
 ' '           Text
 "'\\t\\zs\\f\\+\\ze'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -4356,14 +4356,14 @@
 "'text'"      Literal.String.Single
 ']'           Text
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t\t' Text
 '\\'          Text
 ' '           Text
 "'function\\s\\+&\\?[^[:space:]]\\+\\s*(\\s*\\zs.\\{-}\\ze\\s*)\\s*{\\?'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -4382,22 +4382,22 @@
 "') - '"      Literal.String.Single
 '.'           Text
 'fname'       Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" All functions' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -4409,7 +4409,7 @@
 ' '           Text
 'ext_functions' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -4423,10 +4423,10 @@
 ':'           Text
 'php_builtin_functions' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Internal solution for finding constants in current file' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4442,7 +4442,7 @@
 ' '           Text
 "'$'"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -4454,7 +4454,7 @@
 ' '           Text
 '\'v:val =~ "define\\\\s*("\'' Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4470,7 +4470,7 @@
 ' '           Text
 "' '"         Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4486,7 +4486,7 @@
 ' '           Text
 "'define\\s*(\\s*'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4497,7 +4497,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -4507,7 +4507,7 @@
 'in'          Keyword
 ' '           Text
 'int_values'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -4523,13 +4523,13 @@
 ' '           Text
 '\'\\(["\'\']\\)\\zs[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\ze\\1\'' Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t" let c_value = matchstr(i,' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t" \\ \'\\(["\'\']\\)[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\1\\s*,\\s*\\zs.\\{-}\\ze\\s*)\')' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -4540,7 +4540,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -4555,18 +4555,18 @@
 "''"          Literal.String.Single
 ' '           Text
 '" c_value'   Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Prepare list of constants from tags file' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4587,7 +4587,7 @@
 '\'escape(v:val, " \\\\#%")\'' Literal.String.Single
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4598,7 +4598,7 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'if'          Keyword
@@ -4609,7 +4609,7 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'exe'         Text
@@ -4623,7 +4623,7 @@
 "'.*\\td\\(\\t\\|$\\)/j '" Literal.String.Single
 '.'           Text
 'fnames'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'let'         Keyword
@@ -4635,7 +4635,7 @@
 'getqflist'   Text
 '('           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -4648,7 +4648,7 @@
 '>'           Punctuation
 ' '           Text
 '0'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'for'         Keyword
@@ -4658,7 +4658,7 @@
 'in'          Keyword
 ' '           Text
 'qflist'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -4677,7 +4677,7 @@
 ' '           Text
 "'^[^[:space:]]\\+'" Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t'  Text
 'let'         Keyword
@@ -4690,22 +4690,22 @@
 '='           Punctuation
 ' '           Text
 "''"          Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" All constants' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -4717,12 +4717,12 @@
 ' '           Text
 'ext_constants' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Treat keywords as constants' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4733,10 +4733,10 @@
 ' '           Text
 '{'           Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" One big dictionary of functions' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -4748,10 +4748,10 @@
 ' '           Text
 'int_functions' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n\t\t" Add constants' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -4763,10 +4763,10 @@
 ' '           Text
 'int_constants' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t" Add keywords' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'call'        Keyword
@@ -4780,9 +4780,9 @@
 ':'           Text
 'php_keywords' Text
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -4798,7 +4798,7 @@
 'all_values'  Text
 ')'           Punctuation
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -4813,7 +4813,7 @@
 'a'           Keyword
 ':'           Text
 'base'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'call'        Keyword
@@ -4825,17 +4825,17 @@
 ' '           Text
 'm'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4845,9 +4845,9 @@
 '='           Punctuation
 ' '           Text
 'res'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'let'         Keyword
@@ -4858,7 +4858,7 @@
 ' '           Text
 '['           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'for'         Keyword
@@ -4868,7 +4868,7 @@
 'in'          Keyword
 ' '           Text
 'int_list'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'if'          Keyword
@@ -4880,7 +4880,7 @@
 ' '           Text
 'i'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -4889,7 +4889,7 @@
 ' '           Text
 '+'           Punctuation
 '='           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
@@ -4900,7 +4900,7 @@
 ':'           Text
 'i'           Keyword
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
@@ -4914,7 +4914,7 @@
 'i'           Keyword
 ']'           Text
 ','           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t\t\t' Text
 '\\'          Text
@@ -4924,7 +4924,7 @@
 "'f'"         Literal.String.Single
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'elseif'      Keyword
@@ -4936,7 +4936,7 @@
 ' '           Text
 'i'           Keyword
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -4958,11 +4958,11 @@
 "'d'"         Literal.String.Single
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'else'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t\t'    Text
 'let'         Keyword
@@ -4979,34 +4979,34 @@
 'i'           Keyword
 '}'           Text
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t\t'      Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'endfor'      Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t\t'        Text
 'return'      Keyword
 ' '           Text
 'final_list'  Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'endif'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endfunction' Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '" vim:set foldmethod=marker:' Comment
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/vim/vimrc.output b/tests/examplefiles/vim/vimrc.output
index 52285b2c37..e295489b6b 100644
--- a/tests/examplefiles/vim/vimrc.output
+++ b/tests/examplefiles/vim/vimrc.output
@@ -1,7 +1,7 @@
 '" A comment' Comment
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 ':'           Punctuation
 'py'          Keyword
@@ -11,7 +11,7 @@
 '"'           Literal.String.Double
 'py'          Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 ':'           Punctuation
 ':'           Text
@@ -22,7 +22,7 @@
 "'"           Literal.String.Single
 'pyt'         Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'pyth'        Keyword
@@ -32,7 +32,7 @@
 "'''"         Literal.String.Single
 'pyth'        Literal.String.Single
 "'''"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 ':'           Text
@@ -44,7 +44,7 @@
 '"'           Literal.String.Double
 'pytho'       Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'python'      Keyword
 ' '           Text
@@ -53,9 +53,9 @@
 '"""'         Literal.String.Double
 'python'      Literal.String.Double
 '"""'         Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 ':'           Text
@@ -65,16 +65,16 @@
 'python'      Keyword
 '<<'          Operator
 'E OF'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'print'       Name.Builtin
 ' '           Text
 '"""'         Literal.String.Double
 'my script'   Literal.String.Double
 '"""'         Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'def'         Keyword
 ' '           Text
@@ -83,22 +83,22 @@
 'str'         Name.Builtin
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'  '          Text
+'  '          Text.Whitespace
 '""" My Function """' Literal.String.Doc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '  '          Text
 'print'       Name.Builtin
 ' '           Text
 'str'         Name.Builtin
-'\n'          Text
+'\n'          Text.Whitespace
 
 'E OF'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'let'         Keyword
 ' '           Text
@@ -107,14 +107,14 @@
 '='           Punctuation
 ' '           Text
 '42'          Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Text
 ' '           Text
 'py'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'let'         Keyword
 ' '           Text
@@ -123,9 +123,9 @@
 '='           Punctuation
 ' '           Text
 '42'          Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'echo'        Text
 ' '           Text
 'foo'         Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/wowtoc/comments.toc b/tests/examplefiles/wowtoc/comments.toc
new file mode 100644
index 0000000000..381fd8985b
--- /dev/null
+++ b/tests/examplefiles/wowtoc/comments.toc
@@ -0,0 +1,6 @@
+#
+#a
+# a comment
+# a comment with a # in it
+## no comma, thus a comment
+## has space: and is thus, a comment
\ No newline at end of file
diff --git a/tests/examplefiles/wowtoc/comments.toc.output b/tests/examplefiles/wowtoc/comments.toc.output
new file mode 100644
index 0000000000..7a6340112a
--- /dev/null
+++ b/tests/examplefiles/wowtoc/comments.toc.output
@@ -0,0 +1,17 @@
+'#'           Comment
+'\n'          Text.Whitespace
+
+'#a'          Comment
+'\n'          Text.Whitespace
+
+'# a comment' Comment
+'\n'          Text.Whitespace
+
+'# a comment with a # in it' Comment
+'\n'          Text.Whitespace
+
+'## no comma, thus a comment' Comment
+'\n'          Text.Whitespace
+
+'## has space: and is thus, a comment' Comment
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/wowtoc/files.toc b/tests/examplefiles/wowtoc/files.toc
new file mode 100644
index 0000000000..172cf1025e
--- /dev/null
+++ b/tests/examplefiles/wowtoc/files.toc
@@ -0,0 +1,3 @@
+a
+Foo.lua
+Spaces allowed.lua
\ No newline at end of file
diff --git a/tests/examplefiles/wowtoc/files.toc.output b/tests/examplefiles/wowtoc/files.toc.output
new file mode 100644
index 0000000000..af10989503
--- /dev/null
+++ b/tests/examplefiles/wowtoc/files.toc.output
@@ -0,0 +1,8 @@
+'a'           Name
+'\n'          Text.Whitespace
+
+'Foo.lua'     Name
+'\n'          Text.Whitespace
+
+'Spaces allowed.lua' Name
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/wowtoc/official_tags.toc b/tests/examplefiles/wowtoc/official_tags.toc
new file mode 100644
index 0000000000..e8c017e56f
--- /dev/null
+++ b/tests/examplefiles/wowtoc/official_tags.toc
@@ -0,0 +1,63 @@
+## TiTlE-ptBR: value
+## TiTlE-zhCN: value
+## TiTlE-enCN: value
+## TiTlE-frFR: value
+## TiTlE-deDE: value
+## TiTlE-itIT: value
+## TiTlE-esMX: value
+## TiTlE-ptPT: value
+## TiTlE-koKR: value
+## TiTlE-ruRU: value
+## TiTlE-esES: value
+## TiTlE-zhTW: value
+## TiTlE-enTW: value
+## TiTlE-enGB: value
+## TiTlE-enUS: value
+## NoTeS-ptBR: value
+## NoTeS-zhCN: value
+## NoTeS-enCN: value
+## NoTeS-frFR: value
+## NoTeS-deDE: value
+## NoTeS-itIT: value
+## NoTeS-esMX: value
+## NoTeS-ptPT: value
+## NoTeS-koKR: value
+## NoTeS-ruRU: value
+## NoTeS-esES: value
+## NoTeS-zhTW: value
+## NoTeS-enTW: value
+## NoTeS-enGB: value
+## NoTeS-enUS: value
+## Interface: value
+## interface: value
+## Title: value
+## title: value
+## Notes: value
+## notes: value
+## RequiredDeps: value
+## requireddeps: value
+## Dependencies: value
+## dependencies: value
+## OptionalDeps: value
+## optionaldeps: value
+## LoadOnDemand: value
+## loadondemand: value
+## LoadWith: value
+## loadwith: value
+## LoadManagers: value
+## loadmanagers: value
+## SavedVariablesPerCharacter: value
+## savedvariablespercharacter: value
+## SavedVariables: value
+## savedvariables: value
+## DefaultState: value
+## defaultstate: value
+## Secure: value
+## secure: value
+## Author: value
+## author: value
+## Version: value
+## version: value
+## Dep: value
+## dep: value
+## DepSomething: value
diff --git a/tests/examplefiles/wowtoc/official_tags.toc.output b/tests/examplefiles/wowtoc/official_tags.toc.output
new file mode 100644
index 0000000000..3524ef479d
--- /dev/null
+++ b/tests/examplefiles/wowtoc/official_tags.toc.output
@@ -0,0 +1,503 @@
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-ptBR'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-zhCN'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-enCN'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-frFR'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-deDE'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-itIT'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-esMX'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-ptPT'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-koKR'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-ruRU'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-esES'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-zhTW'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-enTW'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-enGB'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'TiTlE-enUS'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-ptBR'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-zhCN'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-enCN'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-frFR'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-deDE'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-itIT'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-esMX'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-ptPT'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-koKR'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-ruRU'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-esES'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-zhTW'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-enTW'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-enGB'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoTeS-enUS'  Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'Interface'   Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'interface'   Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'Title'       Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'title'       Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'Notes'       Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'notes'       Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'RequiredDeps' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'requireddeps' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'Dependencies' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'dependencies' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'OptionalDeps' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'optionaldeps' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'LoadOnDemand' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'loadondemand' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'LoadWith'    Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'loadwith'    Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'LoadManagers' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'loadmanagers' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'SavedVariablesPerCharacter' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'savedvariablespercharacter' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'SavedVariables' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'savedvariables' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'DefaultState' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'defaultstate' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'Secure'      Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'secure'      Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'Author'      Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'author'      Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'Version'     Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'version'     Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'Dep'         Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'dep'         Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'DepSomething' Name.Builtin
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.String
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/wowtoc/other_tags.toc b/tests/examplefiles/wowtoc/other_tags.toc
new file mode 100644
index 0000000000..30ed8478fd
--- /dev/null
+++ b/tests/examplefiles/wowtoc/other_tags.toc
@@ -0,0 +1,6 @@
+## X-Foo: Value
+## Non-Conforming: Value
+##no:whitespace
+##      plenty   :    of   whitespace   
+## NoValueOk:
+## other	intermediate	non-space	whitespace: is ok
diff --git a/tests/examplefiles/wowtoc/other_tags.toc.output b/tests/examplefiles/wowtoc/other_tags.toc.output
new file mode 100644
index 0000000000..11ef0c27e6
--- /dev/null
+++ b/tests/examplefiles/wowtoc/other_tags.toc.output
@@ -0,0 +1,45 @@
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'X-Foo'       Name.Variable
+':'           Punctuation
+' '           Text.Whitespace
+'Value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'Non-Conforming' Name.Other
+':'           Punctuation
+' '           Text.Whitespace
+'Value'       Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+'no'          Name.Other
+':'           Punctuation
+'whitespace'  Literal.String
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+'      '      Text.Whitespace
+'plenty'      Name.Other
+'   '         Text.Whitespace
+':'           Punctuation
+'    '        Text.Whitespace
+'of   whitespace' Literal.String
+'   '         Text.Whitespace
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'NoValueOk'   Name.Other
+':'           Punctuation
+'\n'          Text.Whitespace
+
+'##'          Keyword.Declaration
+' '           Text.Whitespace
+'other\tintermediate\tnon-space\twhitespace' Name.Other
+':'           Punctuation
+' '           Text.Whitespace
+'is ok'       Literal.String
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/wren/example.wren b/tests/examplefiles/wren/example.wren
new file mode 100644
index 0000000000..272d3cb94e
--- /dev/null
+++ b/tests/examplefiles/wren/example.wren
@@ -0,0 +1,122 @@
+#!/bin/wren
+
+/* IMPORTS */
+import "random" for Random as Rand
+
+/* COMMENTS */
+
+//  single line comment
+
+/*
+    multiline comment
+    /*
+        nested multiline comment
+    */
+*/
+
+/* CLASSES & ATTRIBUTES */
+
+#!type = "parent"
+class Parent {
+    #method
+    static setField (field) {
+        __field = field
+    }
+
+    construct new(parent) {
+        _parent = parent
+        return
+    }
+
+    parent { _parent }
+
+    foreign method()
+}
+
+#!type = "child"
+#group(
+    multiple,
+    lines = true
+)
+class Child is Parent {
+    construct new(parent, child) {
+        super(parent)
+        _child = child
+    }
+
+    child { _child }
+
+    toString { this.parent }
+}
+
+/* VARIABLES & STRINGS */
+
+var rand = Rand.new()
+var name = """David"""
+var fullName = "%(name) Smith"
+var firstChild = Child.new("Philip Smith", fullName)
+var age = 21
+var weight = 70.25
+var male = true
+var sex = male ? "M" : "F"
+var address = """
+    "House name" 12 Any Street
+    Some Town
+    \t %("Some Country") "
+"""
+
+/* LOOPS & CONDITIONALS */
+for (i in 1..5) {
+    if (i == 2) {
+        continue
+    } else if (i == 4) {
+        break
+    }
+    System.print(i)
+}
+var j = 6
+while (j <= 1e+1) {
+    if (j == 8) break
+    System.print(j)
+    j = j + 1
+}
+
+/* ARITHMETIC OPERATORS */
+var a = 1
+var b = 2
+var c = [-a, a + b, a - b, a * b, a / b, a % b]
+var add = c[1]
+
+/* BITWISE OPERATORS */
+var d = 3
+var e = 4
+var f = [~d, d & e, d | e, d ^ e, d << 2, e >> 1]
+
+/* COMPARISON OPERATORS */
+var g = 5
+var h = 6
+var i = [a == b, a != b, a < b, a <= b, a > b, a >= b]
+var k = firstChild is Parent
+
+/* FUNCTIONS */
+var func = Fn.new { |param|
+    var z = "this"
+    System.print(z + " " + param)
+}
+func.call("function")
+
+/* MISCELLANEOUS */
+
+var hex = 0x12ac
+var nul = null
+var l = false
+var m = true
+var n = l && m
+var o = l || m
+var esc = "\\ \% \" \0 \a \b \t \f \n \r \v \e \x01 \uabcd \Uabcdef01"
+var uni = "£ é 😀  ‎🎷"
+var map = {"a": 1, "b": 2}
+var iex = "%(map["a"] + map[("b")])"
+var odd = (1...h).where { |i| i % 2 == 1 }
+                 .toList
+var emp = ""
diff --git a/tests/examplefiles/wren/example.wren.output b/tests/examplefiles/wren/example.wren.output
new file mode 100644
index 0000000000..2b76dd6313
--- /dev/null
+++ b/tests/examplefiles/wren/example.wren.output
@@ -0,0 +1,925 @@
+'#!/bin/wren' Comment.Special
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' IMPORTS '   Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'import'      Keyword
+' '           Text.Whitespace
+'"'           Literal.String
+'random'      Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'for'         Keyword
+' '           Text.Whitespace
+'Random'      Name.Class
+' '           Text.Whitespace
+'as'          Keyword
+' '           Text.Whitespace
+'Rand'        Name.Class
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' COMMENTS '  Comment.Multiline
+'*/'          Comment.Multiline
+'\n\n'        Text.Whitespace
+
+'//  single line comment' Comment.Single
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+'\n    multiline comment\n    ' Comment.Multiline
+'/*'          Comment.Multiline
+'\n        nested multiline comment\n    ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Comment.Multiline
+
+'*/'          Comment.Multiline
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' CLASSES & ATTRIBUTES ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n\n'        Text.Whitespace
+
+'#!type = "parent"' Comment.Special
+'\n'          Text.Whitespace
+
+'class'       Keyword
+' '           Text.Whitespace
+'Parent'      Name.Class
+' '           Text.Whitespace
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'#method'     Comment.Special
+'\n    '      Text.Whitespace
+'static'      Keyword
+' '           Text.Whitespace
+'setField'    Name
+' '           Text.Whitespace
+'('           Punctuation
+'field'       Name
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'__field'     Name.Variable.Class
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'field'       Name
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n\n    '    Text.Whitespace
+'construct'   Keyword
+' '           Text.Whitespace
+'new'         Name
+'('           Punctuation
+'parent'      Name
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'_parent'     Name.Variable.Instance
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'parent'      Name
+'\n        '  Text.Whitespace
+'return'      Keyword
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n\n    '    Text.Whitespace
+'parent'      Name
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'_parent'     Name.Variable.Instance
+' '           Text.Whitespace
+'}'           Punctuation
+'\n\n    '    Text.Whitespace
+'foreign'     Keyword
+' '           Text.Whitespace
+'method'      Name
+'('           Punctuation
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n\n'        Text.Whitespace
+
+'#!type = "child"' Comment.Special
+'\n'          Text.Whitespace
+
+'#group(\n    multiple,\n    lines = true\n)' Comment.Special
+'\n'          Text.Whitespace
+
+'class'       Keyword
+' '           Text.Whitespace
+'Child'       Name.Class
+' '           Text.Whitespace
+'is'          Operator.Word
+' '           Text.Whitespace
+'Parent'      Name.Class
+' '           Text.Whitespace
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'construct'   Keyword
+' '           Text.Whitespace
+'new'         Name
+'('           Punctuation
+'parent'      Name
+','           Punctuation
+' '           Text.Whitespace
+'child'       Name
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'super'       Keyword
+'('           Punctuation
+'parent'      Name
+')'           Punctuation
+'\n        '  Text.Whitespace
+'_child'      Name.Variable.Instance
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'child'       Name
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n\n    '    Text.Whitespace
+'child'       Name
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'_child'      Name.Variable.Instance
+' '           Text.Whitespace
+'}'           Punctuation
+'\n\n    '    Text.Whitespace
+'toString'    Name
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'this'        Keyword
+'.'           Operator
+'parent'      Name
+' '           Text.Whitespace
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' VARIABLES & STRINGS ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n\n'        Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'rand'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Rand'        Name.Class
+'.'           Operator
+'new'         Name
+'('           Punctuation
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'name'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"""David"""' Literal.String
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'fullName'    Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'%('          Literal.String.Interpol
+'name'        Name
+')'           Literal.String.Interpol
+' Smith'      Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'firstChild'  Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Child'       Name.Class
+'.'           Operator
+'new'         Name
+'('           Punctuation
+'"'           Literal.String
+'Philip Smith' Literal.String
+'"'           Literal.String
+','           Punctuation
+' '           Text.Whitespace
+'fullName'    Name
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'age'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'21'          Literal.Number.Float
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'weight'      Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'70.25'       Literal.Number.Float
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'male'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'true'        Keyword.Constant
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'sex'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'male'        Name
+' '           Text.Whitespace
+'?'           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'M'           Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+':'           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'F'           Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'address'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"""\n    "House name" 12 Any Street\n    Some Town\n    \\t %("Some Country") "\n"""' Literal.String
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' LOOPS & CONDITIONALS ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'for'         Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'i'           Name
+' '           Text.Whitespace
+'in'          Operator.Word
+' '           Text.Whitespace
+'1'           Literal.Number.Float
+'..'          Operator
+'5'           Literal.Number.Float
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'if'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'i'           Name
+' '           Text.Whitespace
+'=='          Operator
+' '           Text.Whitespace
+'2'           Literal.Number.Float
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'continue'    Keyword
+'\n    '      Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'else'        Keyword
+' '           Text.Whitespace
+'if'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'i'           Name
+' '           Text.Whitespace
+'=='          Operator
+' '           Text.Whitespace
+'4'           Literal.Number.Float
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'break'       Keyword
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n    '      Text.Whitespace
+'System'      Name.Class
+'.'           Operator
+'print'       Name
+'('           Punctuation
+'i'           Name
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'j'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'6'           Literal.Number.Float
+'\n'          Text.Whitespace
+
+'while'       Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'j'           Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'1e+1'        Literal.Number.Float
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'if'          Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'j'           Name
+' '           Text.Whitespace
+'=='          Operator
+' '           Text.Whitespace
+'8'           Literal.Number.Float
+')'           Punctuation
+' '           Text.Whitespace
+'break'       Keyword
+'\n    '      Text.Whitespace
+'System'      Name.Class
+'.'           Operator
+'print'       Name
+'('           Punctuation
+'j'           Name
+')'           Punctuation
+'\n    '      Text.Whitespace
+'j'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'j'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Float
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' ARITHMETIC OPERATORS ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Float
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'b'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'2'           Literal.Number.Float
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'c'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'['           Punctuation
+'-'           Operator
+'a'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'b'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'b'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'b'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'b'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'%'           Operator
+' '           Text.Whitespace
+'b'           Name
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'add'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'c'           Name
+'['           Punctuation
+'1'           Literal.Number.Float
+']'           Punctuation
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' BITWISE OPERATORS ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'d'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'3'           Literal.Number.Float
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'e'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'4'           Literal.Number.Float
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'f'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'['           Punctuation
+'~'           Operator
+'d'           Name
+','           Punctuation
+' '           Text.Whitespace
+'d'           Name
+' '           Text.Whitespace
+'&'           Operator
+' '           Text.Whitespace
+'e'           Name
+','           Punctuation
+' '           Text.Whitespace
+'d'           Name
+' '           Text.Whitespace
+'|'           Operator
+' '           Text.Whitespace
+'e'           Name
+','           Punctuation
+' '           Text.Whitespace
+'d'           Name
+' '           Text.Whitespace
+'^'           Operator
+' '           Text.Whitespace
+'e'           Name
+','           Punctuation
+' '           Text.Whitespace
+'d'           Name
+' '           Text.Whitespace
+'<<'          Operator
+' '           Text.Whitespace
+'2'           Literal.Number.Float
+','           Punctuation
+' '           Text.Whitespace
+'e'           Name
+' '           Text.Whitespace
+'>>'          Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Float
+']'           Punctuation
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' COMPARISON OPERATORS ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'g'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'5'           Literal.Number.Float
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'h'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'6'           Literal.Number.Float
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'i'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'['           Punctuation
+'a'           Name
+' '           Text.Whitespace
+'=='          Operator
+' '           Text.Whitespace
+'b'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'!='          Operator
+' '           Text.Whitespace
+'b'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'<'           Operator
+' '           Text.Whitespace
+'b'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'<='          Operator
+' '           Text.Whitespace
+'b'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'b'           Name
+','           Punctuation
+' '           Text.Whitespace
+'a'           Name
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'b'           Name
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'k'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'firstChild'  Name
+' '           Text.Whitespace
+'is'          Operator.Word
+' '           Text.Whitespace
+'Parent'      Name.Class
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' FUNCTIONS ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'func'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'Fn'          Name.Class
+'.'           Operator
+'new'         Name
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'|'           Operator
+'param'       Name
+'|'           Operator
+'\n    '      Text.Whitespace
+'var'         Keyword
+' '           Text.Whitespace
+'z'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'this'        Literal.String
+'"'           Literal.String
+'\n    '      Text.Whitespace
+'System'      Name.Class
+'.'           Operator
+'print'       Name
+'('           Punctuation
+'z'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+' '           Literal.String
+'"'           Literal.String
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'param'       Name
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'func'        Name
+'.'           Operator
+'call'        Name
+'('           Punctuation
+'"'           Literal.String
+'function'    Literal.String
+'"'           Literal.String
+')'           Punctuation
+'\n\n'        Text.Whitespace
+
+'/*'          Comment.Multiline
+' MISCELLANEOUS ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n\n'        Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'hex'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'0x12ac'      Literal.Number.Hex
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'nul'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'null'        Keyword.Constant
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'l'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'false'       Keyword.Constant
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'m'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'true'        Keyword.Constant
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'n'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'l'           Name
+' '           Text.Whitespace
+'&&'          Operator
+' '           Text.Whitespace
+'m'           Name
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'o'           Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'l'           Name
+' '           Text.Whitespace
+'||'          Operator
+' '           Text.Whitespace
+'m'           Name
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'esc'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'\\\\'        Literal.String.Escape
+' '           Literal.String
+'\\%'         Literal.String.Escape
+' '           Literal.String
+'\\"'         Literal.String.Escape
+' '           Literal.String
+'\\0'         Literal.String.Escape
+' '           Literal.String
+'\\a'         Literal.String.Escape
+' '           Literal.String
+'\\b'         Literal.String.Escape
+' '           Literal.String
+'\\t'         Literal.String.Escape
+' '           Literal.String
+'\\f'         Literal.String.Escape
+' '           Literal.String
+'\\n'         Literal.String.Escape
+' '           Literal.String
+'\\r'         Literal.String.Escape
+' '           Literal.String
+'\\v'         Literal.String.Escape
+' '           Literal.String
+'\\e'         Literal.String.Escape
+' '           Literal.String
+'\\x01'       Literal.String.Escape
+' '           Literal.String
+'\\uabcd'     Literal.String.Escape
+' '           Literal.String
+'\\Uabcdef01' Literal.String.Escape
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'uni'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'£ é 😀  \u200e🎷' Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'map'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'{'           Punctuation
+'"'           Literal.String
+'a'           Literal.String
+'"'           Literal.String
+':'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Float
+','           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String
+'b'           Literal.String
+'"'           Literal.String
+':'           Operator
+' '           Text.Whitespace
+'2'           Literal.Number.Float
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'iex'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'%('          Literal.String.Interpol
+'map'         Name
+'['           Punctuation
+'"'           Literal.String
+'a'           Literal.String
+'"'           Literal.String
+']'           Punctuation
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'map'         Name
+'['           Punctuation
+'('           Punctuation
+'"'           Literal.String
+'b'           Literal.String
+'"'           Literal.String
+')'           Punctuation
+']'           Punctuation
+')'           Literal.String.Interpol
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'odd'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'('           Punctuation
+'1'           Literal.Number.Float
+'...'         Operator
+'h'           Name
+')'           Punctuation
+'.'           Operator
+'where'       Name
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'|'           Operator
+'i'           Name
+'|'           Operator
+' '           Text.Whitespace
+'i'           Name
+' '           Text.Whitespace
+'%'           Operator
+' '           Text.Whitespace
+'2'           Literal.Number.Float
+' '           Text.Whitespace
+'=='          Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Float
+' '           Text.Whitespace
+'}'           Punctuation
+'\n                 ' Text.Whitespace
+'.'           Operator
+'toList'      Name
+'\n'          Text.Whitespace
+
+'var'         Keyword
+' '           Text.Whitespace
+'emp'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/x10/example.x10.output b/tests/examplefiles/x10/example.x10.output
index 39887a3a5a..51fd8af11b 100644
--- a/tests/examplefiles/x10/example.x10.output
+++ b/tests/examplefiles/x10/example.x10.output
@@ -1,5 +1,5 @@
 '/** Example file for the X10 programming langauge (http://x10-lang.org).\n */' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 'class'       Keyword
 ' '           Text
@@ -12,9 +12,9 @@
 'e'           Text
 ' '           Text
 '{'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'public'      Keyword.Declaration
@@ -43,7 +43,7 @@
 ')'           Text
 ' '           Text
 '{'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\t'          Text
 'C'           Text
@@ -74,9 +74,9 @@
 
 '    '        Text
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '}'           Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/xml/xml_example.output b/tests/examplefiles/xml/xml_example.output
index df7af59cb1..4c0c64cde7 100644
--- a/tests/examplefiles/xml/xml_example.output
+++ b/tests/examplefiles/xml/xml_example.output
@@ -1,13475 +1,15311 @@
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language SYSTEM "language.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Ada"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"1.04"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'kateversion=' Name.Attribute
 '"2.1"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Sources"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'extensions=' Name.Attribute
 '"*.adb;*.ads;*.ada;*.a"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '"text/x-adasrc"' Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"keywords"'  Literal.String
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' abort '     Text
+' '           Text.Whitespace
+'abort'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' abs '       Text
+' '           Text.Whitespace
+'abs'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' abstract '  Text
+' '           Text.Whitespace
+'abstract'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' accept '    Text
+' '           Text.Whitespace
+'accept'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' access '    Text
+' '           Text.Whitespace
+'access'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' aliased '   Text
+' '           Text.Whitespace
+'aliased'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' all '       Text
+' '           Text.Whitespace
+'all'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' and '       Text
+' '           Text.Whitespace
+'and'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' array '     Text
+' '           Text.Whitespace
+'array'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' at '        Text
+' '           Text.Whitespace
+'at'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' begin '     Text
+' '           Text.Whitespace
+'begin'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' body '      Text
+' '           Text.Whitespace
+'body'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' constant '  Text
+' '           Text.Whitespace
+'constant'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' declare '   Text
+' '           Text.Whitespace
+'declare'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' delay '     Text
+' '           Text.Whitespace
+'delay'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' delta '     Text
+' '           Text.Whitespace
+'delta'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' digits '    Text
+' '           Text.Whitespace
+'digits'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' do '        Text
+' '           Text.Whitespace
+'do'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' else '      Text
+' '           Text.Whitespace
+'else'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' elsif '     Text
+' '           Text.Whitespace
+'elsif'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' end '       Text
+' '           Text.Whitespace
+'end'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' entry '     Text
+' '           Text.Whitespace
+'entry'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' exception ' Text
+' '           Text.Whitespace
+'exception'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' exit '      Text
+' '           Text.Whitespace
+'exit'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' for '       Text
+' '           Text.Whitespace
+'for'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' function '  Text
+' '           Text.Whitespace
+'function'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' generic '   Text
+' '           Text.Whitespace
+'generic'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' goto '      Text
+' '           Text.Whitespace
+'goto'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' in '        Text
+' '           Text.Whitespace
+'in'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' is '        Text
+' '           Text.Whitespace
+'is'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' limited '   Text
+' '           Text.Whitespace
+'limited'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' mod '       Text
+' '           Text.Whitespace
+'mod'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' new '       Text
+' '           Text.Whitespace
+'new'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' not '       Text
+' '           Text.Whitespace
+'not'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' null '      Text
+' '           Text.Whitespace
+'null'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' of '        Text
+' '           Text.Whitespace
+'of'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' or '        Text
+' '           Text.Whitespace
+'or'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' others '    Text
+' '           Text.Whitespace
+'others'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' out '       Text
+' '           Text.Whitespace
+'out'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' package '   Text
+' '           Text.Whitespace
+'package'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' pragma '    Text
+' '           Text.Whitespace
+'pragma'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' private '   Text
+' '           Text.Whitespace
+'private'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' procedure ' Text
+' '           Text.Whitespace
+'procedure'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' protected ' Text
+' '           Text.Whitespace
+'protected'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' raise '     Text
+' '           Text.Whitespace
+'raise'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' range '     Text
+' '           Text.Whitespace
+'range'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rem '       Text
+' '           Text.Whitespace
+'rem'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' record '    Text
+' '           Text.Whitespace
+'record'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' renames '   Text
+' '           Text.Whitespace
+'renames'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' requeue '   Text
+' '           Text.Whitespace
+'requeue'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' return '    Text
+' '           Text.Whitespace
+'return'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' reverse '   Text
+' '           Text.Whitespace
+'reverse'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' separate '  Text
+' '           Text.Whitespace
+'separate'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' subtype '   Text
+' '           Text.Whitespace
+'subtype'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tagged '    Text
+' '           Text.Whitespace
+'tagged'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' task '      Text
+' '           Text.Whitespace
+'task'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' terminate ' Text
+' '           Text.Whitespace
+'terminate'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' then '      Text
+' '           Text.Whitespace
+'then'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' type '      Text
+' '           Text.Whitespace
+'type'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' until '     Text
+' '           Text.Whitespace
+'until'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' use '       Text
+' '           Text.Whitespace
+'use'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' when '      Text
+' '           Text.Whitespace
+'when'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' while '     Text
+' '           Text.Whitespace
+'while'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' with '      Text
+' '           Text.Whitespace
+'with'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' xor '       Text
+' '           Text.Whitespace
+'xor'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</list>'     Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Default"'   Literal.String
 '>'           Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"^\\s*if "'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Region1"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"end if"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Region1"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"^\\s*case "' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Region2"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"end case"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Region2"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\sloop\\s+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Region3"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\sloop$"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Region3"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"end loop;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Region3"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\sselect\\s+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Region4"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\sselect$"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Region4"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"end select;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Region4"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"keywords"'  Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<Float'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Float"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<Int'        Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Char"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'.\'"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&quot;"'    Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"-"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"-"'         Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String"'    Literal.String
 '>'           Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&quot;"'    Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</contexts>' Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Keyword"'   Literal.String
-'     '       Text
+'     '       Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsKeyword"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Decimal"'   Literal.String
-'     '       Text
+'     '       Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDecVal"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Base-N"'    Literal.String
-'      '      Text
+'      '      Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsBaseN"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Float"'     Literal.String
-'       '     Text
+'       '     Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsFloat"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Char"'      Literal.String
-'        '    Text
+'        '    Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsChar"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String"'    Literal.String
-'      '      Text
+'      '      Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsString"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Comment"'   Literal.String
-'     '       Text
+'     '       Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsComment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '</highlighting>' Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<comments'   Name.Tag
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"singleLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"--"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</comments>' Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<keywords'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '</general>'  Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</language>' Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language SYSTEM "language.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Asm6502"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"1.03"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'kateversion=' Name.Attribute
 '"2.1"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Sources"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'extensions=' Name.Attribute
 '"*.asm"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '"text/x-asm6502"' Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"opcodes6502"' Literal.String
 '>'           Name.Tag
-'\n\n\n                ' Text
+'\n\n\n                ' Text.Whitespace
 '</list>'     Name.Tag
-'\n\n\n\n\n\n                ' Text
+'\n\n\n\n\n\n                ' Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Base"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\n\n\t\t\t\t' Text
+'\n\n\n\t\t\t\t' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#define.*$"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#include .*$"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '";.*$"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.byte"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.byt"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.word"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.asc"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.dsb"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.fopt"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.text"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.data"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.bss"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.zero"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\.align"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\$[A-Za-z0-9]*"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Hex"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '",x$"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '",y$"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"TAX"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"ADC"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t \t\t\t' Text
+'\n\t \t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"AND"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n \t\t\t\t' Text
+'\n \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"ASL"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BCC"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BCS"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BEQ"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BIT"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BMI"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BNE"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BPL"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BRK"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n \t\t\t\t' Text
+'\n \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BVC"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"BVS"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"CLC"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"CLD"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"CLI"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"CLV"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"CMP"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"CPX"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"CPY"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n \t\t\t\t' Text
+'\n \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"DEC"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"DEX"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t  \t\t\t' Text
+'\n\t  \t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"DEY"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"EOR"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n \t\t\t\t' Text
+'\n \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"INC"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"INX"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"INY"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"JMP"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"JSR"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"LDA"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"LDX"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n \t\t\t\t' Text
+'\n \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"LDY"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"LSR"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"NOP"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n     \t\t\t\t' Text
+'\n     \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"ORA"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"PHA"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"PHP"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"PLA"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"PLP"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"ROL"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"ROR"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"RTI"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"RTS"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n  \t\t\t\t' Text
+'\n  \t\t\t\t' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"SBC"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"SEC"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"SED"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"SEI"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"STA"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"STX"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"STY"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"TAY"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"TSX"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"TXA"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"TXS"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"TYA"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n\n\t\t\t\t' Text
+'\n\n\t\t\t\t' Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"opcodes6502"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\*="'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RangeDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1 ='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<AnyChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"-+&lt;&gt;=;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Operator"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Commentar 2"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\n\n\t\t\t' Text
+'\n\n\n\t\t\t' Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Commentar 2"' Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</contexts>' Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsKeyword"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDecVal"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Data Type"' Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDataType"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Hex"'       Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsBaseN"'   Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsString"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsComment"' Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n \t\t\t'   Text
+'\n \t\t\t'   Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Preprocessor"' Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Operator"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Command"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</highlighting>' Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<comments'   Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"singleLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '";"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"multiLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"/*"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'end='        Name.Attribute
 '"*/"'        Literal.String
 '/>'          Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</comments>' Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<keywords'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"1"'         Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</general>'  Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</language>' Name.Tag
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language SYSTEM "language.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"AWK"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"0.1"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'kateversion=' Name.Attribute
 '"2.1"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Scripts"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'extensions=' Name.Attribute
 '"*.awk"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '"text/x-awk"' Literal.String
 '>'           Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"keywords"'  Literal.String
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'BEGIN'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'END'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'if'          Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'else'        Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'while'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'do'          Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'for'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'in'          Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'continue'    Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'break'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'print'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'printf'      Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'getline'     Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'function'    Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'return'      Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'next'        Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'exit'        Text
 '</item>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</list>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"builtins"'  Literal.String
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'ARGC'        Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'ARGV'        Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'CONVFMT'     Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'ENVIRON'     Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'FILENAME'    Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'FNR'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'FS'          Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'NF'          Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'NR'          Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'OFMT'        Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'OFS'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'ORS'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'RS'          Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'RSTART'      Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'RLENGTH'     Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'SUBSEP'      Text
 '</item>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</list>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"functions"' Literal.String
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'gsub'        Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'index'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'length'      Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'match'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'split'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'sprintf'     Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'sub'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'substr'      Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'tolower'     Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'toupper'     Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'atan2'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'cos'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'exp'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'int'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'log'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'rand'        Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'sin'         Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'sqrt'        Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'srand'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'close'       Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'fflush'      Text
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
 'system'      Text
 '</item>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</list>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Base"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"keywords"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"builtins"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Builtin"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"functions"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Function"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<Int'        Name.Tag
-'   '         Text
+'   '         Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<Float'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Float"'     Literal.String
-'   '         Text
+'   '         Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\$[A-Za-z0-9_]+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Field"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'context='    Name.Attribute
 '"String"'    Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-'      '      Text
+'      '      Text.Whitespace
 'attribute='  Name.Attribute
 '"Pattern"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Pattern"'   Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"#.*$"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<HlCStringChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Pattern"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Pattern"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Pattern"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\\\."'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Pattern"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Field"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Field"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\$[A-Za-z0-9_]+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Field"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</contexts>' Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal"'    Literal.String
-'   '         Text
+'   '         Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Keyword"'   Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsKeyword"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Builtin"'   Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDataType"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Function"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsKeyword"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Decimal"'   Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDecVal"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Float"'     Literal.String
-'    '        Text
+'    '        Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsFloat"'   Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String"'    Literal.String
-'   '         Text
+'   '         Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsString"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Comment"'   Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsComment"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Pattern"'   Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsString"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Field"'     Literal.String
-'    '        Text
+'    '        Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '</highlighting>' Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<comments'   Name.Tag
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"singleLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"#"'         Literal.String
 '/>'          Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</comments>' Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<keywords'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '</general>'  Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</language>' Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language SYSTEM "language.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Bash"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"1.08"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'kateversion=' Name.Attribute
 '"2.2"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Scripts"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'extensions=' Name.Attribute
 '"*.sh"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '"application/x-shellscript"' Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"keywords"'  Literal.String
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' break '     Text
+' '           Text.Whitespace
+'break'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' case '      Text
+' '           Text.Whitespace
+'case'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' else '      Text
+' '           Text.Whitespace
+'else'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' esac '      Text
+' '           Text.Whitespace
+'esac'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' exit '      Text
+' '           Text.Whitespace
+'exit'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' export '    Text
+' '           Text.Whitespace
+'export'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' for '       Text
+' '           Text.Whitespace
+'for'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' function '  Text
+' '           Text.Whitespace
+'function'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' in '        Text
+' '           Text.Whitespace
+'in'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' return '    Text
+' '           Text.Whitespace
+'return'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' select '    Text
+' '           Text.Whitespace
+'select'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' then '      Text
+' '           Text.Whitespace
+'then'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' until '     Text
+' '           Text.Whitespace
+'until'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' while '     Text
+' '           Text.Whitespace
+'while'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' . '         Text
+' '           Text.Whitespace
+'.'           Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' done '      Text
+' '           Text.Whitespace
+'done'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' do '        Text
+' '           Text.Whitespace
+'do'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' elif '      Text
+' '           Text.Whitespace
+'elif'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' fi '        Text
+' '           Text.Whitespace
+'fi'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' if '        Text
+' '           Text.Whitespace
+'if'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\n                ' Text
+'\n\n                ' Text.Whitespace
 '</list>'     Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"commands"'  Literal.String
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' cp '        Text
+' '           Text.Whitespace
+'cp'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' date '      Text
+' '           Text.Whitespace
+'date'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' echo '      Text
+' '           Text.Whitespace
+'echo'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' eval '      Text
+' '           Text.Whitespace
+'eval'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dcop '      Text
+' '           Text.Whitespace
+'dcop'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dcopstart ' Text
+' '           Text.Whitespace
+'dcopstart'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dcopfind '  Text
+' '           Text.Whitespace
+'dcopfind'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</list>'     Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Base"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bdone\\b"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"dodone1"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bdo\\b"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"dodone1"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\belif\\b"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"iffi1"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"iffi1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bif\\b"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"iffi1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bfi\\b"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"iffi1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bcase\\b"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"case1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\besac\\b"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"case1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"^[^()]+\\)"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"subcase1"'  Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '";;"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"subcase1"'  Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"{"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"func1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"}"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"func1"'     Literal.String
 '/>'          Name.Tag
-'\n\n                                ' Text
+'\n\n                                ' Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"keywords"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"commands"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Command"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<Int'        Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\$[A-Za-z0-9_?{}!]+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RangeDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1 ='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<AnyChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"|&lt;&gt;=;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Operator"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"\'"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Single Quote"' Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"`"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1 ='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#"'         Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#.*$"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\n                        ' Text
+'\n\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\\\"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\&quot;"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Single Quote"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\\\"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\\'"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\'"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\\\"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\`"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"`"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\$[A-Za-z0-9_?]+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</contexts>' Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsKeyword"' Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsDecVal"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Float"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsFloat"'   Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Char"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsChar"'    Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsString"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsComment"' Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Operator"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Command"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</highlighting>' Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<comments'   Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"singleLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"#"'         Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</comments>' Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<keywords'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"1"'         Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</general>'  Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</language>' Name.Tag
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"BibTeX"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"0.1"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'extensions=' Name.Attribute
 '"*.bib"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Markup"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '"text/x-bib"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"1"'         Literal.String
 '>'           Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"@"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Bib Item"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Bib Item"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"%"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Bib Item"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Bib Item"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"{"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Ref Key"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"%"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Ref Key"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Ref Key"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '","'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"%"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\\\."'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"@"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Bib Item"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Bib Item"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '","'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '\'"\''       Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Value"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Value"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"%"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Value"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Value"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"\\"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '\'"\''       Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Value"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '\'"\''       Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Value"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Keyword"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t\n\t\t\t' Text
+'\n\t\t\t\n\t\t\t' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"5"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</contexts>' Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Bib Item"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'color='      Name.Attribute
 '"#0000ff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffff00"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'color='      Name.Attribute
 '"#000000"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#dddddd"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Value"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'color='      Name.Attribute
 '"#aa5500"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#22aaff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Ref Key"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'color='      Name.Attribute
 '"#007700"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#00aa00"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'color='      Name.Attribute
 '"#aaaaaa"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#222222"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '</highlighting>' Name.Tag
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<comments'   Name.Tag
 '>'           Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"singleLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"%"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</comments>' Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '</general>'  Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</language>' Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language SYSTEM "language.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"C"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"1.09"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'kateversion=' Name.Attribute
 '"2.1"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Sources"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'extensions=' Name.Attribute
 '"*.c;*.C;*.h"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '"text/x-csrc;text/x-c++src;text/x-chdr"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'priority='   Name.Attribute
 '"5"'         Literal.String
 '>'           Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"keywords"'  Literal.String
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' break '     Text
+' '           Text.Whitespace
+'break'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' case '      Text
+' '           Text.Whitespace
+'case'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' continue '  Text
+' '           Text.Whitespace
+'continue'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' default '   Text
+' '           Text.Whitespace
+'default'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' do '        Text
+' '           Text.Whitespace
+'do'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' else '      Text
+' '           Text.Whitespace
+'else'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' enum '      Text
+' '           Text.Whitespace
+'enum'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' extern '    Text
+' '           Text.Whitespace
+'extern'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' for '       Text
+' '           Text.Whitespace
+'for'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' goto '      Text
+' '           Text.Whitespace
+'goto'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' if '        Text
+' '           Text.Whitespace
+'if'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' inline '    Text
+' '           Text.Whitespace
+'inline'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' return '    Text
+' '           Text.Whitespace
+'return'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' sizeof '    Text
+' '           Text.Whitespace
+'sizeof'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' struct '    Text
+' '           Text.Whitespace
+'struct'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' switch '    Text
+' '           Text.Whitespace
+'switch'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' typedef '   Text
+' '           Text.Whitespace
+'typedef'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' union '     Text
+' '           Text.Whitespace
+'union'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' while '     Text
+' '           Text.Whitespace
+'while'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</list>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"types"'     Literal.String
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' auto '      Text
+' '           Text.Whitespace
+'auto'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' char '      Text
+' '           Text.Whitespace
+'char'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' const '     Text
+' '           Text.Whitespace
+'const'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' double '    Text
+' '           Text.Whitespace
+'double'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' float '     Text
+' '           Text.Whitespace
+'float'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' int '       Text
+' '           Text.Whitespace
+'int'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' long '      Text
+' '           Text.Whitespace
+'long'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' register '  Text
+' '           Text.Whitespace
+'register'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' restrict '  Text
+' '           Text.Whitespace
+'restrict'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' short '     Text
+' '           Text.Whitespace
+'short'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' signed '    Text
+' '           Text.Whitespace
+'signed'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' static '    Text
+' '           Text.Whitespace
+'static'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' unsigned '  Text
+' '           Text.Whitespace
+'unsigned'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' void '      Text
+' '           Text.Whitespace
+'void'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' volatile '  Text
+' '           Text.Whitespace
+'volatile'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' _Imaginary ' Text
+' '           Text.Whitespace
+'_Imaginary'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' _Complex '  Text
+' '           Text.Whitespace
+'_Complex'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' _Bool '     Text
+' '           Text.Whitespace
+'_Bool'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</list>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"attention"' Literal.String
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' FIXME '     Text
+' '           Text.Whitespace
+'FIXME'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' TODO '      Text
+' '           Text.Whitespace
+'TODO'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ### '       Text
+' '           Text.Whitespace
+'###'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</list>'     Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal"'    Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"keywords"'  Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Data Type"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"types"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Symbol"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"{"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Brace1"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Symbol"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"}"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Brace1"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<Float'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Float"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<AnyChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"fF"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Float"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</Float>'    Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<HlCOct'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Octal"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<HlCHex'     Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Hex"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<Int'        Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '>'           Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"ULL"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"LUL"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"LLU"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"UL"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"LU"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"LL"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"U"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"L"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</Int>'      Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<HlCChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Char"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&quot;"'    Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Commentar 1"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"/"'         Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Commentar 2"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Outscoped"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"#if 0"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"FALSE"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"#"'         Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Function"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\b[_\\w][_\\w\\d]*(?=[\\s]*[(])"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Symbol"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Member"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"[.]{1,1}"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<AnyChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Symbol"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String"'    Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<LineContinue' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<HlCStringChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String Char"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&quot;"'    Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Member"'    Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Function"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\b[_\\w][_\\w\\d]*(?=[\\s]*)"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Commentar 1"' Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"attention"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Commentar 2"' Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"attention"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Preprocessor"' Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<LineContinue' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Define"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"define.*((?=\\\\))"' Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"define.*"'  Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RangeDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Prep. Lib"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"&quot;"'    Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RangeDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Prep. Lib"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&lt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"&gt;"'      Literal.String
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Commentar/Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Comment2"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Define"'    Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<LineContinue' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Commentar/Preprocessor"' Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Comment2"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Some Context"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Some Context2"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Outscoped"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"attention"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Outscoped intern"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"^#if"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"#endif"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"#else"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Outscoped intern"' Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Outscoped intern"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"#if"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"#endif"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '</context>'  Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</contexts>' Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal Text"' Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Keyword"'   Literal.String
-'      '      Text
+'      '      Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsKeyword"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Function"'  Literal.String
-'     '       Text
+'     '       Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsKeyword"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'color='      Name.Attribute
 '"#000080"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Data Type"' Literal.String
-'    '        Text
+'    '        Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDataType"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Decimal"'   Literal.String
-'      '      Text
+'      '      Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDecVal"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Octal"'     Literal.String
-'        '    Text
+'        '    Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsBaseN"'   Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Hex"'       Literal.String
-'          '  Text
+'          '  Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsBaseN"'   Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Float"'     Literal.String
-'        '    Text
+'        '    Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsFloat"'   Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Char"'      Literal.String
-'         '   Text
+'         '   Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsChar"'    Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String"'    Literal.String
-'       '     Text
+'       '     Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsString"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String Char"' Literal.String
-'  '          Text
+'  '          Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsChar"'    Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Comment"'   Literal.String
-'      '      Text
+'      '      Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsComment"' Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Symbol"'    Literal.String
-'       '     Text
+'       '     Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Preprocessor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Prep. Lib"' Literal.String
-'    '        Text
+'    '        Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-' '           Text
+' '           Text.Whitespace
 '<!--,Qt::darkYellow,Qt::yellow,false,false)); -->' Comment.Multiline
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '</highlighting>' Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<comments'   Name.Tag
 '>'           Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"singleLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"//"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n      '    Text
+'\n      '    Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"multiLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"/*"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'end='        Name.Attribute
 '"*/"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '</comments>' Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<keywords'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '</general>'  Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</language>' Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language SYSTEM "language.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ChangeLog"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"1.01"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'kateversion=' Name.Attribute
 '"2.1"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Other"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'extensions=' Name.Attribute
 '"ChangeLog"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '""'          Literal.String
 '>'           Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal"'    Literal.String
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"^\\d\\d\\d\\d\\s*-\\s*\\d\\d\\s*-\\s*\\d\\d.*$"' Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</context>'  Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '</contexts>' Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsKeyword"' Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Identifier"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Types"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDataType"' Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsString"'  Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsComment"' Literal.String
 '/>'          Name.Tag
-'\n          ' Text
+'\n          ' Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n        '  Text
+'\n        '  Text.Whitespace
 '</highlighting>' Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n    '      Text
+'\n    '      Text.Whitespace
 '<keywords'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n  '        Text
+'\n  '        Text.Whitespace
 '</general>'  Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</language>' Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language SYSTEM "language.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Cisco"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"1.09"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'kateversion=' Name.Attribute
 '"2.2"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Scripts"'   Literal.String
-'\n          ' Text
+'\n          ' Text.Whitespace
 'extensions=' Name.Attribute
 '"*.cis"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '"text/cisco"' Literal.String
-'\n          ' Text
+'\n          ' Text.Whitespace
 'author='     Name.Attribute
 '"Raphaël GRAPINET"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'license='    Name.Attribute
 '"LGPL"'      Literal.String
 '>'           Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"commands"'  Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' aaa '       Text
+' '           Text.Whitespace
+'aaa'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' access-list ' Text
+' '           Text.Whitespace
+'access-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' address '   Text
+' '           Text.Whitespace
+'address'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' alias '     Text
+' '           Text.Whitespace
+'alias'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' arp '       Text
+' '           Text.Whitespace
+'arp'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' async-bootp ' Text
+' '           Text.Whitespace
+'async-bootp' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' banner '    Text
+' '           Text.Whitespace
+'banner'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' boot '      Text
+' '           Text.Whitespace
+'boot'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' bridge '    Text
+' '           Text.Whitespace
+'bridge'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' buffers '   Text
+' '           Text.Whitespace
+'buffers'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' busy-message ' Text
+' '           Text.Whitespace
+'busy-message' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' call-history-mib ' Text
+' '           Text.Whitespace
+'call-history-mib' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' cdp '       Text
+' '           Text.Whitespace
+'cdp'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' chat-script ' Text
+' '           Text.Whitespace
+'chat-script' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' class-map ' Text
+' '           Text.Whitespace
+'class-map'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' clock '     Text
+' '           Text.Whitespace
+'clock'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' cns '       Text
+' '           Text.Whitespace
+'cns'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' config-register ' Text
+' '           Text.Whitespace
+'config-register' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' controller ' Text
+' '           Text.Whitespace
+'controller'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' crypto '    Text
+' '           Text.Whitespace
+'crypto'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' default '   Text
+' '           Text.Whitespace
+'default'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' default-value ' Text
+' '           Text.Whitespace
+'default-value' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dialer '    Text
+' '           Text.Whitespace
+'dialer'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dialer-list ' Text
+' '           Text.Whitespace
+'dialer-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dnsix-dmdp ' Text
+' '           Text.Whitespace
+'dnsix-dmdp'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dnsix-nat ' Text
+' '           Text.Whitespace
+'dnsix-nat'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' downward-compatible-config ' Text
+' '           Text.Whitespace
+'downward-compatible-config' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' enable '    Text
+' '           Text.Whitespace
+'enable'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' end '       Text
+' '           Text.Whitespace
+'end'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' exception ' Text
+' '           Text.Whitespace
+'exception'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' exit '      Text
+' '           Text.Whitespace
+'exit'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' file '      Text
+' '           Text.Whitespace
+'file'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' frame-relay ' Text
+' '           Text.Whitespace
+'frame-relay' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' help '      Text
+' '           Text.Whitespace
+'help'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' hostname '  Text
+' '           Text.Whitespace
+'hostname'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' interface ' Text
+' '           Text.Whitespace
+'interface'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ip '        Text
+' '           Text.Whitespace
+'ip'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' isdn '      Text
+' '           Text.Whitespace
+'isdn'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' isdn-mib '  Text
+' '           Text.Whitespace
+'isdn-mib'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' kerberos '  Text
+' '           Text.Whitespace
+'kerberos'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' key '       Text
+' '           Text.Whitespace
+'key'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' line '      Text
+' '           Text.Whitespace
+'line'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' logging '   Text
+' '           Text.Whitespace
+'logging'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' login-string ' Text
+' '           Text.Whitespace
+'login-string' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' map-class ' Text
+' '           Text.Whitespace
+'map-class'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' map-list '  Text
+' '           Text.Whitespace
+'map-list'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' memory-size ' Text
+' '           Text.Whitespace
+'memory-size' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' menu '      Text
+' '           Text.Whitespace
+'menu'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' modemcap '  Text
+' '           Text.Whitespace
+'modemcap'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' multilink ' Text
+' '           Text.Whitespace
+'multilink'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' netbios '   Text
+' '           Text.Whitespace
+'netbios'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' no '        Text
+' '           Text.Whitespace
+'no'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ntp '       Text
+' '           Text.Whitespace
+'ntp'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' partition ' Text
+' '           Text.Whitespace
+'partition'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' policy-map ' Text
+' '           Text.Whitespace
+'policy-map'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' priority-list ' Text
+' '           Text.Whitespace
+'priority-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' privilege ' Text
+' '           Text.Whitespace
+'privilege'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' process-max-time ' Text
+' '           Text.Whitespace
+'process-max-time' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' prompt '    Text
+' '           Text.Whitespace
+'prompt'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' queue-list ' Text
+' '           Text.Whitespace
+'queue-list'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' resume-string ' Text
+' '           Text.Whitespace
+'resume-string' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rlogin '    Text
+' '           Text.Whitespace
+'rlogin'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rmon '      Text
+' '           Text.Whitespace
+'rmon'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' route-map ' Text
+' '           Text.Whitespace
+'route-map'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' router '    Text
+' '           Text.Whitespace
+'router'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rtr '       Text
+' '           Text.Whitespace
+'rtr'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' scheduler ' Text
+' '           Text.Whitespace
+'scheduler'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' service '   Text
+' '           Text.Whitespace
+'service'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' snmp-server ' Text
+' '           Text.Whitespace
+'snmp-server' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' sntp '      Text
+' '           Text.Whitespace
+'sntp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' stackmaker ' Text
+' '           Text.Whitespace
+'stackmaker'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' state-machine ' Text
+' '           Text.Whitespace
+'state-machine' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' subscriber-policy ' Text
+' '           Text.Whitespace
+'subscriber-policy' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tacacs-server ' Text
+' '           Text.Whitespace
+'tacacs-server' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' template '  Text
+' '           Text.Whitespace
+'template'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' terminal-queue ' Text
+' '           Text.Whitespace
+'terminal-queue' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tftp-server ' Text
+' '           Text.Whitespace
+'tftp-server' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' time-range ' Text
+' '           Text.Whitespace
+'time-range'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' username '  Text
+' '           Text.Whitespace
+'username'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' virtual-profile ' Text
+' '           Text.Whitespace
+'virtual-profile' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' virtual-template ' Text
+' '           Text.Whitespace
+'virtual-template' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' vpdn '      Text
+' '           Text.Whitespace
+'vpdn'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' vpdn-group ' Text
+' '           Text.Whitespace
+'vpdn-group'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' x25 '       Text
+' '           Text.Whitespace
+'x25'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' x29 '       Text
+' '           Text.Whitespace
+'x29'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</list>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"parameters"' Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' accounting ' Text
+' '           Text.Whitespace
+'accounting'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' accounting-list ' Text
+' '           Text.Whitespace
+'accounting-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' accounting-threshold ' Text
+' '           Text.Whitespace
+'accounting-threshold' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' accounting-transits ' Text
+' '           Text.Whitespace
+'accounting-transits' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' address-pool ' Text
+' '           Text.Whitespace
+'address-pool' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' as-path '   Text
+' '           Text.Whitespace
+'as-path'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' audit '     Text
+' '           Text.Whitespace
+'audit'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' auth-proxy ' Text
+' '           Text.Whitespace
+'auth-proxy'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' authentication ' Text
+' '           Text.Whitespace
+'authentication' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' authorization ' Text
+' '           Text.Whitespace
+'authorization' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' bgp-community ' Text
+' '           Text.Whitespace
+'bgp-community' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' bootp '     Text
+' '           Text.Whitespace
+'bootp'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' cef '       Text
+' '           Text.Whitespace
+'cef'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' classless ' Text
+' '           Text.Whitespace
+'classless'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' community-list ' Text
+' '           Text.Whitespace
+'community-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' default-gateway ' Text
+' '           Text.Whitespace
+'default-gateway' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' default-network ' Text
+' '           Text.Whitespace
+'default-network' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dhcp '      Text
+' '           Text.Whitespace
+'dhcp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dhcp-server ' Text
+' '           Text.Whitespace
+'dhcp-server' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' domain-list ' Text
+' '           Text.Whitespace
+'domain-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' domain-lookup ' Text
+' '           Text.Whitespace
+'domain-lookup' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' domain-name ' Text
+' '           Text.Whitespace
+'domain-name' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dvmrp '     Text
+' '           Text.Whitespace
+'dvmrp'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' exec-callback ' Text
+' '           Text.Whitespace
+'exec-callback' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' extcommunity-list ' Text
+' '           Text.Whitespace
+'extcommunity-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' finger '    Text
+' '           Text.Whitespace
+'finger'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' flow-aggregation ' Text
+' '           Text.Whitespace
+'flow-aggregation' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' flow-cache ' Text
+' '           Text.Whitespace
+'flow-cache'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' flow-export ' Text
+' '           Text.Whitespace
+'flow-export' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' forward-protocol ' Text
+' '           Text.Whitespace
+'forward-protocol' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ftp '       Text
+' '           Text.Whitespace
+'ftp'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' gratuitous-arps ' Text
+' '           Text.Whitespace
+'gratuitous-arps' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' host '      Text
+' '           Text.Whitespace
+'host'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' host-routing ' Text
+' '           Text.Whitespace
+'host-routing' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' hp-host '   Text
+' '           Text.Whitespace
+'hp-host'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' http '      Text
+' '           Text.Whitespace
+'http'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' icmp '      Text
+' '           Text.Whitespace
+'icmp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' inspect '   Text
+' '           Text.Whitespace
+'inspect'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' local '     Text
+' '           Text.Whitespace
+'local'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' mrm '       Text
+' '           Text.Whitespace
+'mrm'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' mroute '    Text
+' '           Text.Whitespace
+'mroute'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' msdp '      Text
+' '           Text.Whitespace
+'msdp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' multicast ' Text
+' '           Text.Whitespace
+'multicast'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' multicast-routing ' Text
+' '           Text.Whitespace
+'multicast-routing' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' name-server ' Text
+' '           Text.Whitespace
+'name-server' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' nat '       Text
+' '           Text.Whitespace
+'nat'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' new-model ' Text
+' '           Text.Whitespace
+'new-model'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ospf '      Text
+' '           Text.Whitespace
+'ospf'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' password '  Text
+' '           Text.Whitespace
+'password'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' password-encryption ' Text
+' '           Text.Whitespace
+'password-encryption' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' pgm '       Text
+' '           Text.Whitespace
+'pgm'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' pim '       Text
+' '           Text.Whitespace
+'pim'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' port-map '  Text
+' '           Text.Whitespace
+'port-map'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' prefix-list ' Text
+' '           Text.Whitespace
+'prefix-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' radius '    Text
+' '           Text.Whitespace
+'radius'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rcmd '      Text
+' '           Text.Whitespace
+'rcmd'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' reflexive-list ' Text
+' '           Text.Whitespace
+'reflexive-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' route '     Text
+' '           Text.Whitespace
+'route'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' routing '   Text
+' '           Text.Whitespace
+'routing'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rsvp '      Text
+' '           Text.Whitespace
+'rsvp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rtcp '      Text
+' '           Text.Whitespace
+'rtcp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' sap '       Text
+' '           Text.Whitespace
+'sap'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' sdr '       Text
+' '           Text.Whitespace
+'sdr'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' security '  Text
+' '           Text.Whitespace
+'security'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' source-route ' Text
+' '           Text.Whitespace
+'source-route' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' subnet-zero ' Text
+' '           Text.Whitespace
+'subnet-zero' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tacacs '    Text
+' '           Text.Whitespace
+'tacacs'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tcp '       Text
+' '           Text.Whitespace
+'tcp'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tcp-small-servers ' Text
+' '           Text.Whitespace
+'tcp-small-servers' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' telnet '    Text
+' '           Text.Whitespace
+'telnet'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tftp '      Text
+' '           Text.Whitespace
+'tftp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' timestamps ' Text
+' '           Text.Whitespace
+'timestamps'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' udp-small-servers ' Text
+' '           Text.Whitespace
+'udp-small-servers' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' vrf '       Text
+' '           Text.Whitespace
+'vrf'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' wccp '      Text
+' '           Text.Whitespace
+'wccp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</list>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"options"'   Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' accounting ' Text
+' '           Text.Whitespace
+'accounting'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' accounting-list ' Text
+' '           Text.Whitespace
+'accounting-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' accounting-threshold ' Text
+' '           Text.Whitespace
+'accounting-threshold' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' accounting-transits ' Text
+' '           Text.Whitespace
+'accounting-transits' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' address-pool ' Text
+' '           Text.Whitespace
+'address-pool' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' as-path '   Text
+' '           Text.Whitespace
+'as-path'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' audit '     Text
+' '           Text.Whitespace
+'audit'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' auth-proxy ' Text
+' '           Text.Whitespace
+'auth-proxy'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' authentication ' Text
+' '           Text.Whitespace
+'authentication' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' authorization ' Text
+' '           Text.Whitespace
+'authorization' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' bgp-community ' Text
+' '           Text.Whitespace
+'bgp-community' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' bootp '     Text
+' '           Text.Whitespace
+'bootp'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' cef '       Text
+' '           Text.Whitespace
+'cef'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' classless ' Text
+' '           Text.Whitespace
+'classless'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' community-list ' Text
+' '           Text.Whitespace
+'community-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' default-gateway ' Text
+' '           Text.Whitespace
+'default-gateway' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' default-network ' Text
+' '           Text.Whitespace
+'default-network' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dhcp '      Text
+' '           Text.Whitespace
+'dhcp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dhcp-server ' Text
+' '           Text.Whitespace
+'dhcp-server' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' domain-list ' Text
+' '           Text.Whitespace
+'domain-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' domain-lookup ' Text
+' '           Text.Whitespace
+'domain-lookup' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' domain-name ' Text
+' '           Text.Whitespace
+'domain-name' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' dvmrp '     Text
+' '           Text.Whitespace
+'dvmrp'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' exec-callback ' Text
+' '           Text.Whitespace
+'exec-callback' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' extcommunity-list ' Text
+' '           Text.Whitespace
+'extcommunity-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' finger '    Text
+' '           Text.Whitespace
+'finger'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' flow-aggregation ' Text
+' '           Text.Whitespace
+'flow-aggregation' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' flow-cache ' Text
+' '           Text.Whitespace
+'flow-cache'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' flow-export ' Text
+' '           Text.Whitespace
+'flow-export' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' forward-protocol ' Text
+' '           Text.Whitespace
+'forward-protocol' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ftp '       Text
+' '           Text.Whitespace
+'ftp'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' gratuitous-arps ' Text
+' '           Text.Whitespace
+'gratuitous-arps' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' host '      Text
+' '           Text.Whitespace
+'host'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' host-routing ' Text
+' '           Text.Whitespace
+'host-routing' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' hp-host '   Text
+' '           Text.Whitespace
+'hp-host'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' http '      Text
+' '           Text.Whitespace
+'http'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' icmp '      Text
+' '           Text.Whitespace
+'icmp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' inspect '   Text
+' '           Text.Whitespace
+'inspect'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' local '     Text
+' '           Text.Whitespace
+'local'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' mrm '       Text
+' '           Text.Whitespace
+'mrm'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' mroute '    Text
+' '           Text.Whitespace
+'mroute'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' msdp '      Text
+' '           Text.Whitespace
+'msdp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' multicast ' Text
+' '           Text.Whitespace
+'multicast'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' multicast-routing ' Text
+' '           Text.Whitespace
+'multicast-routing' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' name-server ' Text
+' '           Text.Whitespace
+'name-server' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' nat '       Text
+' '           Text.Whitespace
+'nat'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' new-model ' Text
+' '           Text.Whitespace
+'new-model'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ospf '      Text
+' '           Text.Whitespace
+'ospf'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' password '  Text
+' '           Text.Whitespace
+'password'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' password-encryption ' Text
+' '           Text.Whitespace
+'password-encryption' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' pgm '       Text
+' '           Text.Whitespace
+'pgm'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' pim '       Text
+' '           Text.Whitespace
+'pim'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' port-map '  Text
+' '           Text.Whitespace
+'port-map'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' prefix-list ' Text
+' '           Text.Whitespace
+'prefix-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' radius '    Text
+' '           Text.Whitespace
+'radius'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rcmd '      Text
+' '           Text.Whitespace
+'rcmd'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' reflexive-list ' Text
+' '           Text.Whitespace
+'reflexive-list' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' route '     Text
+' '           Text.Whitespace
+'route'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' routing '   Text
+' '           Text.Whitespace
+'routing'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rsvp '      Text
+' '           Text.Whitespace
+'rsvp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' rtcp '      Text
+' '           Text.Whitespace
+'rtcp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' sap '       Text
+' '           Text.Whitespace
+'sap'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' sdr '       Text
+' '           Text.Whitespace
+'sdr'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' security '  Text
+' '           Text.Whitespace
+'security'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' source-route ' Text
+' '           Text.Whitespace
+'source-route' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' subnet-zero ' Text
+' '           Text.Whitespace
+'subnet-zero' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tacacs '    Text
+' '           Text.Whitespace
+'tacacs'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tcp '       Text
+' '           Text.Whitespace
+'tcp'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tcp-small-servers ' Text
+' '           Text.Whitespace
+'tcp-small-servers' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' telnet '    Text
+' '           Text.Whitespace
+'telnet'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tftp '      Text
+' '           Text.Whitespace
+'tftp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' timestamps ' Text
+' '           Text.Whitespace
+'timestamps'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' udp-small-servers ' Text
+' '           Text.Whitespace
+'udp-small-servers' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' vrf '       Text
+' '           Text.Whitespace
+'vrf'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' wccp '      Text
+' '           Text.Whitespace
+'wccp'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</list>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Base"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bdone\\b"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"dodone1"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bdo\\b"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"dodone1"'   Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\belif\\b"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"iffi1"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"iffi1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bif\\b"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"iffi1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bfi\\b"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"iffi1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\bcase\\b"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"case1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\besac\\b"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"case1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"^[^()]+\\)"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"subcase1"'  Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '";;"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'insensitive=' Name.Attribute
 '"TRUE"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"subcase1"'  Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"{"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"func1"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"}"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"func1"'     Literal.String
 '/>'          Name.Tag
-'\n\n                                ' Text
+'\n\n                                ' Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"commands"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Command"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"parameters"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"options"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<Int'        Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\$[A-Za-z0-9_?{}!]+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RangeDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1 ='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<AnyChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"|&lt;&gt;=;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Operator"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"\'"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Single Quote"' Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"`"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1 ='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#"'         Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#.*$"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\n                        ' Text
+'\n\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\\\"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\&quot;"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Single Quote"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\\\"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\\'"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\'"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\\\"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\`"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'char ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"`"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context ='   Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n                                ' Text
+'\n                                ' Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'String ='    Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"\\$[A-Za-z0-9_?]+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '</context>'  Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</contexts>' Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsKeyword"' Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Decimal"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsDecVal"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Float"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsFloat"'   Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Char"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsChar"'    Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsString"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Comment"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsComment"' Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Substitution"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Parameter"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Operator"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n                        ' Text
+'\n                        ' Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name ='      Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"Command"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum =' Name.Attribute
-' '           Text
+' '           Text.Whitespace
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n                ' Text
+'\n                ' Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '</highlighting>' Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<comments'   Name.Tag
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"singleLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"!"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</comments>' Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<keywords'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"0"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</general>'  Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</language>' Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language SYSTEM "language.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ColdFusion"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"1.03"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'kateversion=' Name.Attribute
 '"2.1"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Markup"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'extensions=' Name.Attribute
 '"*.cfm;*.cfc;*.cfml;*.dbm"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '"text/x-coldfusion"' Literal.String
 '>'           Name.Tag
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Keywords"' Literal.String
 '>'           Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' if '        Text
+' '           Text.Whitespace
+'if'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' else '      Text
+' '           Text.Whitespace
+'else'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' for '       Text
+' '           Text.Whitespace
+'for'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' in '        Text
+' '           Text.Whitespace
+'in'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' while '     Text
+' '           Text.Whitespace
+'while'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' do '        Text
+' '           Text.Whitespace
+'do'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' continue '  Text
+' '           Text.Whitespace
+'continue'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' break '     Text
+' '           Text.Whitespace
+'break'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' with '      Text
+' '           Text.Whitespace
+'with'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' try '       Text
+' '           Text.Whitespace
+'try'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' catch '     Text
+' '           Text.Whitespace
+'catch'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' switch '    Text
+' '           Text.Whitespace
+'switch'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' case '      Text
+' '           Text.Whitespace
+'case'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' new '       Text
+' '           Text.Whitespace
+'new'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' var '       Text
+' '           Text.Whitespace
+'var'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' function '  Text
+' '           Text.Whitespace
+'function'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' return '    Text
+' '           Text.Whitespace
+'return'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' this '      Text
+' '           Text.Whitespace
+'this'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' delete '    Text
+' '           Text.Whitespace
+'delete'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' true '      Text
+' '           Text.Whitespace
+'true'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' false '     Text
+' '           Text.Whitespace
+'false'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' void '      Text
+' '           Text.Whitespace
+'void'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' throw '     Text
+' '           Text.Whitespace
+'throw'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' typeof '    Text
+' '           Text.Whitespace
+'typeof'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' const '     Text
+' '           Text.Whitespace
+'const'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' default '   Text
+' '           Text.Whitespace
+'default'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '</list>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Objects"' Literal.String
 '>'           Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Anchor '    Text
+' '           Text.Whitespace
+'Anchor'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Applet '    Text
+' '           Text.Whitespace
+'Applet'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Area '      Text
+' '           Text.Whitespace
+'Area'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Array '     Text
+' '           Text.Whitespace
+'Array'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Boolean '   Text
+' '           Text.Whitespace
+'Boolean'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Button '    Text
+' '           Text.Whitespace
+'Button'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Checkbox '  Text
+' '           Text.Whitespace
+'Checkbox'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Date '      Text
+' '           Text.Whitespace
+'Date'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Document '  Text
+' '           Text.Whitespace
+'Document'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Event '     Text
+' '           Text.Whitespace
+'Event'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' FileUpload ' Text
+' '           Text.Whitespace
+'FileUpload'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Form '      Text
+' '           Text.Whitespace
+'Form'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Frame '     Text
+' '           Text.Whitespace
+'Frame'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Function '  Text
+' '           Text.Whitespace
+'Function'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Hidden '    Text
+' '           Text.Whitespace
+'Hidden'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' History '   Text
+' '           Text.Whitespace
+'History'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Image '     Text
+' '           Text.Whitespace
+'Image'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Layer '     Text
+' '           Text.Whitespace
+'Layer'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Linke '     Text
+' '           Text.Whitespace
+'Linke'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Location '  Text
+' '           Text.Whitespace
+'Location'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Math '      Text
+' '           Text.Whitespace
+'Math'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Navigator ' Text
+' '           Text.Whitespace
+'Navigator'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Number '    Text
+' '           Text.Whitespace
+'Number'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Object '    Text
+' '           Text.Whitespace
+'Object'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Option '    Text
+' '           Text.Whitespace
+'Option'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Password '  Text
+' '           Text.Whitespace
+'Password'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Radio '     Text
+' '           Text.Whitespace
+'Radio'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' RegExp '    Text
+' '           Text.Whitespace
+'RegExp'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Reset '     Text
+' '           Text.Whitespace
+'Reset'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Screen '    Text
+' '           Text.Whitespace
+'Screen'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Select '    Text
+' '           Text.Whitespace
+'Select'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' String '    Text
+' '           Text.Whitespace
+'String'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Submit '    Text
+' '           Text.Whitespace
+'Submit'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Text '      Text
+' '           Text.Whitespace
+'Text'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Textarea '  Text
+' '           Text.Whitespace
+'Textarea'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Window '    Text
+' '           Text.Whitespace
+'Window'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '</list>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Methods"' Literal.String
 '>'           Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' abs '       Text
+' '           Text.Whitespace
+'abs'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' acos '      Text
+' '           Text.Whitespace
+'acos'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' alert '     Text
+' '           Text.Whitespace
+'alert'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' anchor '    Text
+' '           Text.Whitespace
+'anchor'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' apply '     Text
+' '           Text.Whitespace
+'apply'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' asin '      Text
+' '           Text.Whitespace
+'asin'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' atan '      Text
+' '           Text.Whitespace
+'atan'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' atan2 '     Text
+' '           Text.Whitespace
+'atan2'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' back '      Text
+' '           Text.Whitespace
+'back'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' blur '      Text
+' '           Text.Whitespace
+'blur'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' call '      Text
+' '           Text.Whitespace
+'call'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' captureEvents ' Text
+' '           Text.Whitespace
+'captureEvents' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ceil '      Text
+' '           Text.Whitespace
+'ceil'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' charAt '    Text
+' '           Text.Whitespace
+'charAt'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' charCodeAt ' Text
+' '           Text.Whitespace
+'charCodeAt'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' clearInterval ' Text
+' '           Text.Whitespace
+'clearInterval' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' clearTimeout ' Text
+' '           Text.Whitespace
+'clearTimeout' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' click '     Text
+' '           Text.Whitespace
+'click'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' close '     Text
+' '           Text.Whitespace
+'close'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' compile '   Text
+' '           Text.Whitespace
+'compile'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' concat '    Text
+' '           Text.Whitespace
+'concat'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' confirm '   Text
+' '           Text.Whitespace
+'confirm'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' cos '       Text
+' '           Text.Whitespace
+'cos'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' disableExternalCapture ' Text
+' '           Text.Whitespace
+'disableExternalCapture' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' enableExternalCapture ' Text
+' '           Text.Whitespace
+'enableExternalCapture' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' eval '      Text
+' '           Text.Whitespace
+'eval'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' exec '      Text
+' '           Text.Whitespace
+'exec'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' exp '       Text
+' '           Text.Whitespace
+'exp'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' find '      Text
+' '           Text.Whitespace
+'find'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' floor '     Text
+' '           Text.Whitespace
+'floor'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' focus '     Text
+' '           Text.Whitespace
+'focus'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' forward '   Text
+' '           Text.Whitespace
+'forward'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' fromCharCode ' Text
+' '           Text.Whitespace
+'fromCharCode' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getDate '   Text
+' '           Text.Whitespace
+'getDate'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getDay '    Text
+' '           Text.Whitespace
+'getDay'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getFullYear ' Text
+' '           Text.Whitespace
+'getFullYear' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getHours '  Text
+' '           Text.Whitespace
+'getHours'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getMilliseconds ' Text
+' '           Text.Whitespace
+'getMilliseconds' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getMinutes ' Text
+' '           Text.Whitespace
+'getMinutes'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getMonth '  Text
+' '           Text.Whitespace
+'getMonth'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getSeconds ' Text
+' '           Text.Whitespace
+'getSeconds'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getSelection ' Text
+' '           Text.Whitespace
+'getSelection' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getTime '   Text
+' '           Text.Whitespace
+'getTime'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getTimezoneOffset ' Text
+' '           Text.Whitespace
+'getTimezoneOffset' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getUTCDate ' Text
+' '           Text.Whitespace
+'getUTCDate'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getUTCDay ' Text
+' '           Text.Whitespace
+'getUTCDay'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getUTCFullYear ' Text
+' '           Text.Whitespace
+'getUTCFullYear' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getUTCHours ' Text
+' '           Text.Whitespace
+'getUTCHours' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getUTCMilliseconds ' Text
+' '           Text.Whitespace
+'getUTCMilliseconds' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getUTCMinutes ' Text
+' '           Text.Whitespace
+'getUTCMinutes' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getUTCMonth ' Text
+' '           Text.Whitespace
+'getUTCMonth' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' getUTCSeconds ' Text
+' '           Text.Whitespace
+'getUTCSeconds' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' go '        Text
+' '           Text.Whitespace
+'go'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' handleEvent ' Text
+' '           Text.Whitespace
+'handleEvent' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' home '      Text
+' '           Text.Whitespace
+'home'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' indexOf '   Text
+' '           Text.Whitespace
+'indexOf'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' javaEnabled ' Text
+' '           Text.Whitespace
+'javaEnabled' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' join '      Text
+' '           Text.Whitespace
+'join'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' lastIndexOf ' Text
+' '           Text.Whitespace
+'lastIndexOf' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' link '      Text
+' '           Text.Whitespace
+'link'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' load '      Text
+' '           Text.Whitespace
+'load'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' log '       Text
+' '           Text.Whitespace
+'log'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' match '     Text
+' '           Text.Whitespace
+'match'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' max '       Text
+' '           Text.Whitespace
+'max'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' min '       Text
+' '           Text.Whitespace
+'min'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' moveAbove ' Text
+' '           Text.Whitespace
+'moveAbove'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' moveBelow ' Text
+' '           Text.Whitespace
+'moveBelow'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' moveBy '    Text
+' '           Text.Whitespace
+'moveBy'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' moveTo '    Text
+' '           Text.Whitespace
+'moveTo'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' moveToAbsolute ' Text
+' '           Text.Whitespace
+'moveToAbsolute' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' open '      Text
+' '           Text.Whitespace
+'open'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' parse '     Text
+' '           Text.Whitespace
+'parse'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' plugins.refresh ' Text
+' '           Text.Whitespace
+'plugins.refresh' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' pop '       Text
+' '           Text.Whitespace
+'pop'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' pow '       Text
+' '           Text.Whitespace
+'pow'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' preference ' Text
+' '           Text.Whitespace
+'preference'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' print '     Text
+' '           Text.Whitespace
+'print'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' prompt '    Text
+' '           Text.Whitespace
+'prompt'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' push '      Text
+' '           Text.Whitespace
+'push'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' random '    Text
+' '           Text.Whitespace
+'random'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' releaseEvents ' Text
+' '           Text.Whitespace
+'releaseEvents' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' reload '    Text
+' '           Text.Whitespace
+'reload'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' replace '   Text
+' '           Text.Whitespace
+'replace'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' reset '     Text
+' '           Text.Whitespace
+'reset'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' resizeBy '  Text
+' '           Text.Whitespace
+'resizeBy'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' resizeTo '  Text
+' '           Text.Whitespace
+'resizeTo'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' reverse '   Text
+' '           Text.Whitespace
+'reverse'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' round '     Text
+' '           Text.Whitespace
+'round'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' routeEvent ' Text
+' '           Text.Whitespace
+'routeEvent'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' scrollBy '  Text
+' '           Text.Whitespace
+'scrollBy'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' scrollTo '  Text
+' '           Text.Whitespace
+'scrollTo'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' search '    Text
+' '           Text.Whitespace
+'search'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' select '    Text
+' '           Text.Whitespace
+'select'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setDate '   Text
+' '           Text.Whitespace
+'setDate'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setFullYear ' Text
+' '           Text.Whitespace
+'setFullYear' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setHours '  Text
+' '           Text.Whitespace
+'setHours'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setInterval ' Text
+' '           Text.Whitespace
+'setInterval' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setMilliseconds ' Text
+' '           Text.Whitespace
+'setMilliseconds' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setMinutes ' Text
+' '           Text.Whitespace
+'setMinutes'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setMonth '  Text
+' '           Text.Whitespace
+'setMonth'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setSeconds ' Text
+' '           Text.Whitespace
+'setSeconds'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setTime '   Text
+' '           Text.Whitespace
+'setTime'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setTimeout ' Text
+' '           Text.Whitespace
+'setTimeout'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setUTCDate ' Text
+' '           Text.Whitespace
+'setUTCDate'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setUTCFullYear ' Text
+' '           Text.Whitespace
+'setUTCFullYear' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setUTCHours ' Text
+' '           Text.Whitespace
+'setUTCHours' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setUTCMilliseconds ' Text
+' '           Text.Whitespace
+'setUTCMilliseconds' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setUTCMinutes ' Text
+' '           Text.Whitespace
+'setUTCMinutes' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setUTCMonth ' Text
+' '           Text.Whitespace
+'setUTCMonth' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' setUTCSeconds ' Text
+' '           Text.Whitespace
+'setUTCSeconds' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' shift '     Text
+' '           Text.Whitespace
+'shift'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' sin '       Text
+' '           Text.Whitespace
+'sin'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' slice '     Text
+' '           Text.Whitespace
+'slice'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' sort '      Text
+' '           Text.Whitespace
+'sort'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' splice '    Text
+' '           Text.Whitespace
+'splice'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' split '     Text
+' '           Text.Whitespace
+'split'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' sqrt '      Text
+' '           Text.Whitespace
+'sqrt'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' stop '      Text
+' '           Text.Whitespace
+'stop'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' String formatting ' Text
+' '           Text.Whitespace
+'String'      Text
+' '           Text.Whitespace
+'formatting'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' submit '    Text
+' '           Text.Whitespace
+'submit'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' substr '    Text
+' '           Text.Whitespace
+'substr'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' substring ' Text
+' '           Text.Whitespace
+'substring'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' taintEnabled ' Text
+' '           Text.Whitespace
+'taintEnabled' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' tan '       Text
+' '           Text.Whitespace
+'tan'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' test '      Text
+' '           Text.Whitespace
+'test'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' toLocaleString ' Text
+' '           Text.Whitespace
+'toLocaleString' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' toLowerCase ' Text
+' '           Text.Whitespace
+'toLowerCase' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' toSource '  Text
+' '           Text.Whitespace
+'toSource'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' toString '  Text
+' '           Text.Whitespace
+'toString'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' toUpperCase ' Text
+' '           Text.Whitespace
+'toUpperCase' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' toUTCString ' Text
+' '           Text.Whitespace
+'toUTCString' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' unshift '   Text
+' '           Text.Whitespace
+'unshift'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' unwatch '   Text
+' '           Text.Whitespace
+'unwatch'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' UTC '       Text
+' '           Text.Whitespace
+'UTC'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' valueOf '   Text
+' '           Text.Whitespace
+'valueOf'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' watch '     Text
+' '           Text.Whitespace
+'watch'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' write '     Text
+' '           Text.Whitespace
+'write'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' writeln  '  Text
+' '           Text.Whitespace
+'writeln'     Text
+'  '          Text.Whitespace
 '</item>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '</list>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CFSCRIPT Keywords"' Literal.String
 '>'           Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' break '     Text
+' '           Text.Whitespace
+'break'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' case '      Text
+' '           Text.Whitespace
+'case'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' catch '     Text
+' '           Text.Whitespace
+'catch'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' continue '  Text
+' '           Text.Whitespace
+'continue'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' default '   Text
+' '           Text.Whitespace
+'default'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' do '        Text
+' '           Text.Whitespace
+'do'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' else '      Text
+' '           Text.Whitespace
+'else'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' for '       Text
+' '           Text.Whitespace
+'for'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' function '  Text
+' '           Text.Whitespace
+'function'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' if '        Text
+' '           Text.Whitespace
+'if'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' in '        Text
+' '           Text.Whitespace
+'in'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' return '    Text
+' '           Text.Whitespace
+'return'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' switch '    Text
+' '           Text.Whitespace
+'switch'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' try '       Text
+' '           Text.Whitespace
+'try'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' var '       Text
+' '           Text.Whitespace
+'var'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' while '     Text
+' '           Text.Whitespace
+'while'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '</list>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CFSCRIPT Functions"' Literal.String
 '>'           Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Abs '       Text
+' '           Text.Whitespace
+'Abs'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ACos '      Text
+' '           Text.Whitespace
+'ACos'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayAppend ' Text
+' '           Text.Whitespace
+'ArrayAppend' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayAvg '  Text
+' '           Text.Whitespace
+'ArrayAvg'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayClear ' Text
+' '           Text.Whitespace
+'ArrayClear'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayDeleteAt ' Text
+' '           Text.Whitespace
+'ArrayDeleteAt' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayInsertAt ' Text
+' '           Text.Whitespace
+'ArrayInsertAt' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayIsEmpty ' Text
+' '           Text.Whitespace
+'ArrayIsEmpty' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayLen '  Text
+' '           Text.Whitespace
+'ArrayLen'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayMax '  Text
+' '           Text.Whitespace
+'ArrayMax'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayMin '  Text
+' '           Text.Whitespace
+'ArrayMin'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayNew '  Text
+' '           Text.Whitespace
+'ArrayNew'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayPrepend ' Text
+' '           Text.Whitespace
+'ArrayPrepend' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayResize ' Text
+' '           Text.Whitespace
+'ArrayResize' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArraySet '  Text
+' '           Text.Whitespace
+'ArraySet'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArraySort ' Text
+' '           Text.Whitespace
+'ArraySort'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArraySum '  Text
+' '           Text.Whitespace
+'ArraySum'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArraySwap ' Text
+' '           Text.Whitespace
+'ArraySwap'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ArrayToList ' Text
+' '           Text.Whitespace
+'ArrayToList' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Asc '       Text
+' '           Text.Whitespace
+'Asc'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ASin '      Text
+' '           Text.Whitespace
+'ASin'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Atn '       Text
+' '           Text.Whitespace
+'Atn'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BitAnd '    Text
+' '           Text.Whitespace
+'BitAnd'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BitMaskClear ' Text
+' '           Text.Whitespace
+'BitMaskClear' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BitMaskRead ' Text
+' '           Text.Whitespace
+'BitMaskRead' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BitMaskSet ' Text
+' '           Text.Whitespace
+'BitMaskSet'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BitNot '    Text
+' '           Text.Whitespace
+'BitNot'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BitOr '     Text
+' '           Text.Whitespace
+'BitOr'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BitSHLN '   Text
+' '           Text.Whitespace
+'BitSHLN'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BitSHRN '   Text
+' '           Text.Whitespace
+'BitSHRN'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BitXor '    Text
+' '           Text.Whitespace
+'BitXor'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Ceiling '   Text
+' '           Text.Whitespace
+'Ceiling'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Chr '       Text
+' '           Text.Whitespace
+'Chr'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CJustify '  Text
+' '           Text.Whitespace
+'CJustify'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Compare '   Text
+' '           Text.Whitespace
+'Compare'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CompareNoCase ' Text
+' '           Text.Whitespace
+'CompareNoCase' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Cos '       Text
+' '           Text.Whitespace
+'Cos'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CreateDate ' Text
+' '           Text.Whitespace
+'CreateDate'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CreateDateTime ' Text
+' '           Text.Whitespace
+'CreateDateTime' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CreateObject ' Text
+' '           Text.Whitespace
+'CreateObject' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CreateODBCDate ' Text
+' '           Text.Whitespace
+'CreateODBCDate' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CreateODBCDateTime ' Text
+' '           Text.Whitespace
+'CreateODBCDateTime' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CreateODBCTime ' Text
+' '           Text.Whitespace
+'CreateODBCTime' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CreateTime ' Text
+' '           Text.Whitespace
+'CreateTime'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CreateTimeSpan ' Text
+' '           Text.Whitespace
+'CreateTimeSpan' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CreateUUID ' Text
+' '           Text.Whitespace
+'CreateUUID'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DateAdd '   Text
+' '           Text.Whitespace
+'DateAdd'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DateCompare ' Text
+' '           Text.Whitespace
+'DateCompare' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DateConvert ' Text
+' '           Text.Whitespace
+'DateConvert' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DateDiff '  Text
+' '           Text.Whitespace
+'DateDiff'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DateFormat ' Text
+' '           Text.Whitespace
+'DateFormat'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DatePart '  Text
+' '           Text.Whitespace
+'DatePart'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Day '       Text
+' '           Text.Whitespace
+'Day'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DayOfWeek ' Text
+' '           Text.Whitespace
+'DayOfWeek'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DayOfWeekAsString ' Text
+' '           Text.Whitespace
+'DayOfWeekAsString' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DayOfYear ' Text
+' '           Text.Whitespace
+'DayOfYear'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DaysInMonth ' Text
+' '           Text.Whitespace
+'DaysInMonth' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DaysInYear ' Text
+' '           Text.Whitespace
+'DaysInYear'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DE '        Text
+' '           Text.Whitespace
+'DE'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DecimalFormat ' Text
+' '           Text.Whitespace
+'DecimalFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DecrementValue ' Text
+' '           Text.Whitespace
+'DecrementValue' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Decrypt '   Text
+' '           Text.Whitespace
+'Decrypt'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DeleteClientVariable ' Text
+' '           Text.Whitespace
+'DeleteClientVariable' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DirectoryExists ' Text
+' '           Text.Whitespace
+'DirectoryExists' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DollarFormat ' Text
+' '           Text.Whitespace
+'DollarFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Duplicate ' Text
+' '           Text.Whitespace
+'Duplicate'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Encrypt '   Text
+' '           Text.Whitespace
+'Encrypt'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Evaluate '  Text
+' '           Text.Whitespace
+'Evaluate'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Exp '       Text
+' '           Text.Whitespace
+'Exp'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ExpandPath ' Text
+' '           Text.Whitespace
+'ExpandPath'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' FileExists ' Text
+' '           Text.Whitespace
+'FileExists'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Find '      Text
+' '           Text.Whitespace
+'Find'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' FindNoCase ' Text
+' '           Text.Whitespace
+'FindNoCase'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' FindOneOf ' Text
+' '           Text.Whitespace
+'FindOneOf'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' FirstDayOfMonth ' Text
+' '           Text.Whitespace
+'FirstDayOfMonth' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Fix '       Text
+' '           Text.Whitespace
+'Fix'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' FormatBaseN ' Text
+' '           Text.Whitespace
+'FormatBaseN' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetAuthUser ' Text
+' '           Text.Whitespace
+'GetAuthUser' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetBaseTagData ' Text
+' '           Text.Whitespace
+'GetBaseTagData' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetBaseTagList ' Text
+' '           Text.Whitespace
+'GetBaseTagList' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetBaseTemplatePath ' Text
+' '           Text.Whitespace
+'GetBaseTemplatePath' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetClientVariablesList ' Text
+' '           Text.Whitespace
+'GetClientVariablesList' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetCurrentTemplatePath ' Text
+' '           Text.Whitespace
+'GetCurrentTemplatePath' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetDirectoryFromPath ' Text
+' '           Text.Whitespace
+'GetDirectoryFromPath' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetException ' Text
+' '           Text.Whitespace
+'GetException' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetFileFromPath ' Text
+' '           Text.Whitespace
+'GetFileFromPath' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetFunctionList ' Text
+' '           Text.Whitespace
+'GetFunctionList' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetHttpRequestData ' Text
+' '           Text.Whitespace
+'GetHttpRequestData' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetHttpTimeString ' Text
+' '           Text.Whitespace
+'GetHttpTimeString' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetK2ServerDocCount ' Text
+' '           Text.Whitespace
+'GetK2ServerDocCount' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetK2ServerDocCountLimit ' Text
+' '           Text.Whitespace
+'GetK2ServerDocCountLimit' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetLocale ' Text
+' '           Text.Whitespace
+'GetLocale'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetMetaData ' Text
+' '           Text.Whitespace
+'GetMetaData' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetMetricData ' Text
+' '           Text.Whitespace
+'GetMetricData' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetPageContext ' Text
+' '           Text.Whitespace
+'GetPageContext' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetProfileSections ' Text
+' '           Text.Whitespace
+'GetProfileSections' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetProfileString ' Text
+' '           Text.Whitespace
+'GetProfileString' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetServiceSettings ' Text
+' '           Text.Whitespace
+'GetServiceSettings' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetTempDirectory ' Text
+' '           Text.Whitespace
+'GetTempDirectory' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetTempFile ' Text
+' '           Text.Whitespace
+'GetTempFile' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetTemplatePath ' Text
+' '           Text.Whitespace
+'GetTemplatePath' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetTickCount ' Text
+' '           Text.Whitespace
+'GetTickCount' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetTimeZoneInfo ' Text
+' '           Text.Whitespace
+'GetTimeZoneInfo' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' GetToken '  Text
+' '           Text.Whitespace
+'GetToken'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Hash '      Text
+' '           Text.Whitespace
+'Hash'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Hour '      Text
+' '           Text.Whitespace
+'Hour'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' HTMLCodeFormat ' Text
+' '           Text.Whitespace
+'HTMLCodeFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' HTMLEditFormat ' Text
+' '           Text.Whitespace
+'HTMLEditFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IIf '       Text
+' '           Text.Whitespace
+'IIf'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IncrementValue ' Text
+' '           Text.Whitespace
+'IncrementValue' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' InputBaseN ' Text
+' '           Text.Whitespace
+'InputBaseN'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Insert '    Text
+' '           Text.Whitespace
+'Insert'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Int '       Text
+' '           Text.Whitespace
+'Int'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsArray '   Text
+' '           Text.Whitespace
+'IsArray'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsBinary '  Text
+' '           Text.Whitespace
+'IsBinary'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsBoolean ' Text
+' '           Text.Whitespace
+'IsBoolean'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsCustomFunction ' Text
+' '           Text.Whitespace
+'IsCustomFunction' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsDate '    Text
+' '           Text.Whitespace
+'IsDate'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsDebugMode ' Text
+' '           Text.Whitespace
+'IsDebugMode' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsDefined ' Text
+' '           Text.Whitespace
+'IsDefined'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsK2ServerABroker ' Text
+' '           Text.Whitespace
+'IsK2ServerABroker' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsK2ServerDocCountExceeded ' Text
+' '           Text.Whitespace
+'IsK2ServerDocCountExceeded' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsK2ServerOnline ' Text
+' '           Text.Whitespace
+'IsK2ServerOnline' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsLeapYear ' Text
+' '           Text.Whitespace
+'IsLeapYear'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsNumeric ' Text
+' '           Text.Whitespace
+'IsNumeric'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsNumericDate ' Text
+' '           Text.Whitespace
+'IsNumericDate' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsObject '  Text
+' '           Text.Whitespace
+'IsObject'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsQuery '   Text
+' '           Text.Whitespace
+'IsQuery'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsSimpleValue ' Text
+' '           Text.Whitespace
+'IsSimpleValue' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsStruct '  Text
+' '           Text.Whitespace
+'IsStruct'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsUserInRole ' Text
+' '           Text.Whitespace
+'IsUserInRole' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsWDDX '    Text
+' '           Text.Whitespace
+'IsWDDX'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsXmlDoc '  Text
+' '           Text.Whitespace
+'IsXmlDoc'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsXmlElement ' Text
+' '           Text.Whitespace
+'IsXmlElement' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IsXmlRoot ' Text
+' '           Text.Whitespace
+'IsXmlRoot'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' JavaCast '  Text
+' '           Text.Whitespace
+'JavaCast'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' JSStringFormat ' Text
+' '           Text.Whitespace
+'JSStringFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LCase '     Text
+' '           Text.Whitespace
+'LCase'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Left '      Text
+' '           Text.Whitespace
+'Left'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Len '       Text
+' '           Text.Whitespace
+'Len'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListAppend ' Text
+' '           Text.Whitespace
+'ListAppend'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListChangeDelims ' Text
+' '           Text.Whitespace
+'ListChangeDelims' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListContains ' Text
+' '           Text.Whitespace
+'ListContains' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListContainsNoCase ' Text
+' '           Text.Whitespace
+'ListContainsNoCase' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListDeleteAt ' Text
+' '           Text.Whitespace
+'ListDeleteAt' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListFind '  Text
+' '           Text.Whitespace
+'ListFind'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListFindNoCase ' Text
+' '           Text.Whitespace
+'ListFindNoCase' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListFirst ' Text
+' '           Text.Whitespace
+'ListFirst'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListGetAt ' Text
+' '           Text.Whitespace
+'ListGetAt'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListInsertAt ' Text
+' '           Text.Whitespace
+'ListInsertAt' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListLast '  Text
+' '           Text.Whitespace
+'ListLast'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListLen '   Text
+' '           Text.Whitespace
+'ListLen'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListPrepend ' Text
+' '           Text.Whitespace
+'ListPrepend' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListQualify ' Text
+' '           Text.Whitespace
+'ListQualify' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListRest '  Text
+' '           Text.Whitespace
+'ListRest'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListSetAt ' Text
+' '           Text.Whitespace
+'ListSetAt'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListSort '  Text
+' '           Text.Whitespace
+'ListSort'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListToArray ' Text
+' '           Text.Whitespace
+'ListToArray' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListValueCount ' Text
+' '           Text.Whitespace
+'ListValueCount' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ListValueCountNoCase ' Text
+' '           Text.Whitespace
+'ListValueCountNoCase' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LJustify '  Text
+' '           Text.Whitespace
+'LJustify'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Log '       Text
+' '           Text.Whitespace
+'Log'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Log10 '     Text
+' '           Text.Whitespace
+'Log10'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSCurrencyFormat ' Text
+' '           Text.Whitespace
+'LSCurrencyFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSDateFormat ' Text
+' '           Text.Whitespace
+'LSDateFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSEuroCurrencyFormat ' Text
+' '           Text.Whitespace
+'LSEuroCurrencyFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSIsCurrency ' Text
+' '           Text.Whitespace
+'LSIsCurrency' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSIsDate '  Text
+' '           Text.Whitespace
+'LSIsDate'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSIsNumeric ' Text
+' '           Text.Whitespace
+'LSIsNumeric' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSNumberFormat ' Text
+' '           Text.Whitespace
+'LSNumberFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSParseCurrency ' Text
+' '           Text.Whitespace
+'LSParseCurrency' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSParseDateTime ' Text
+' '           Text.Whitespace
+'LSParseDateTime' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSParseEuroCurrency ' Text
+' '           Text.Whitespace
+'LSParseEuroCurrency' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSParseNumber ' Text
+' '           Text.Whitespace
+'LSParseNumber' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LSTimeFormat ' Text
+' '           Text.Whitespace
+'LSTimeFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LTrim '     Text
+' '           Text.Whitespace
+'LTrim'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Max '       Text
+' '           Text.Whitespace
+'Max'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Mid '       Text
+' '           Text.Whitespace
+'Mid'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Min '       Text
+' '           Text.Whitespace
+'Min'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Minute '    Text
+' '           Text.Whitespace
+'Minute'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Month '     Text
+' '           Text.Whitespace
+'Month'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' MonthAsString ' Text
+' '           Text.Whitespace
+'MonthAsString' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Now '       Text
+' '           Text.Whitespace
+'Now'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' NumberFormat ' Text
+' '           Text.Whitespace
+'NumberFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ParagraphFormat ' Text
+' '           Text.Whitespace
+'ParagraphFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ParameterExists ' Text
+' '           Text.Whitespace
+'ParameterExists' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ParseDateTime ' Text
+' '           Text.Whitespace
+'ParseDateTime' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Pi '        Text
+' '           Text.Whitespace
+'Pi'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' PreserveSingleQuotes ' Text
+' '           Text.Whitespace
+'PreserveSingleQuotes' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Quarter '   Text
+' '           Text.Whitespace
+'Quarter'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' QueryAddColumn ' Text
+' '           Text.Whitespace
+'QueryAddColumn' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' QueryAddRow ' Text
+' '           Text.Whitespace
+'QueryAddRow' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' QueryNew '  Text
+' '           Text.Whitespace
+'QueryNew'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' QuerySetCell ' Text
+' '           Text.Whitespace
+'QuerySetCell' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' QuotedValueList ' Text
+' '           Text.Whitespace
+'QuotedValueList' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Rand '      Text
+' '           Text.Whitespace
+'Rand'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Randomize ' Text
+' '           Text.Whitespace
+'Randomize'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' RandRange ' Text
+' '           Text.Whitespace
+'RandRange'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' REFind '    Text
+' '           Text.Whitespace
+'REFind'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' REFindNoCase ' Text
+' '           Text.Whitespace
+'REFindNoCase' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' RemoveChars ' Text
+' '           Text.Whitespace
+'RemoveChars' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' RepeatString ' Text
+' '           Text.Whitespace
+'RepeatString' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Replace '   Text
+' '           Text.Whitespace
+'Replace'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ReplaceList ' Text
+' '           Text.Whitespace
+'ReplaceList' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ReplaceNoCase ' Text
+' '           Text.Whitespace
+'ReplaceNoCase' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' REReplace ' Text
+' '           Text.Whitespace
+'REReplace'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' REReplaceNoCase ' Text
+' '           Text.Whitespace
+'REReplaceNoCase' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Reverse '   Text
+' '           Text.Whitespace
+'Reverse'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Right '     Text
+' '           Text.Whitespace
+'Right'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' RJustify '  Text
+' '           Text.Whitespace
+'RJustify'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Round '     Text
+' '           Text.Whitespace
+'Round'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' RTrim '     Text
+' '           Text.Whitespace
+'RTrim'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Second '    Text
+' '           Text.Whitespace
+'Second'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SetEncoding ' Text
+' '           Text.Whitespace
+'SetEncoding' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SetLocale ' Text
+' '           Text.Whitespace
+'SetLocale'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SetProfileString ' Text
+' '           Text.Whitespace
+'SetProfileString' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SetVariable ' Text
+' '           Text.Whitespace
+'SetVariable' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Sgn '       Text
+' '           Text.Whitespace
+'Sgn'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Sin '       Text
+' '           Text.Whitespace
+'Sin'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SpanExcluding ' Text
+' '           Text.Whitespace
+'SpanExcluding' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SpanIncluding ' Text
+' '           Text.Whitespace
+'SpanIncluding' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Sqr '       Text
+' '           Text.Whitespace
+'Sqr'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StripCR '   Text
+' '           Text.Whitespace
+'StripCR'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructAppend ' Text
+' '           Text.Whitespace
+'StructAppend' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructClear ' Text
+' '           Text.Whitespace
+'StructClear' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructCopy ' Text
+' '           Text.Whitespace
+'StructCopy'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructCount ' Text
+' '           Text.Whitespace
+'StructCount' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructDelete ' Text
+' '           Text.Whitespace
+'StructDelete' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructFind ' Text
+' '           Text.Whitespace
+'StructFind'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructFindKey ' Text
+' '           Text.Whitespace
+'StructFindKey' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructFindValue ' Text
+' '           Text.Whitespace
+'StructFindValue' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructGet ' Text
+' '           Text.Whitespace
+'StructGet'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructInsert ' Text
+' '           Text.Whitespace
+'StructInsert' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructIsEmpty ' Text
+' '           Text.Whitespace
+'StructIsEmpty' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructKeyArray ' Text
+' '           Text.Whitespace
+'StructKeyArray' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructKeyExists ' Text
+' '           Text.Whitespace
+'StructKeyExists' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructKeyList ' Text
+' '           Text.Whitespace
+'StructKeyList' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructNew ' Text
+' '           Text.Whitespace
+'StructNew'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructSort ' Text
+' '           Text.Whitespace
+'StructSort'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' StructUpdate ' Text
+' '           Text.Whitespace
+'StructUpdate' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Tan '       Text
+' '           Text.Whitespace
+'Tan'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' TimeFormat ' Text
+' '           Text.Whitespace
+'TimeFormat'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ToBase64 '  Text
+' '           Text.Whitespace
+'ToBase64'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ToBinary '  Text
+' '           Text.Whitespace
+'ToBinary'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ToString '  Text
+' '           Text.Whitespace
+'ToString'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Trim '      Text
+' '           Text.Whitespace
+'Trim'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' UCase '     Text
+' '           Text.Whitespace
+'UCase'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' URLDecode ' Text
+' '           Text.Whitespace
+'URLDecode'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' URLEncodedFormat ' Text
+' '           Text.Whitespace
+'URLEncodedFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' URLSessionFormat ' Text
+' '           Text.Whitespace
+'URLSessionFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Val '       Text
+' '           Text.Whitespace
+'Val'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ValueList ' Text
+' '           Text.Whitespace
+'ValueList'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Week '      Text
+' '           Text.Whitespace
+'Week'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' WriteOutput ' Text
+' '           Text.Whitespace
+'WriteOutput' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' XmlChildPos ' Text
+' '           Text.Whitespace
+'XmlChildPos' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' XmlElemNew ' Text
+' '           Text.Whitespace
+'XmlElemNew'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' XmlFormat ' Text
+' '           Text.Whitespace
+'XmlFormat'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' XmlNew '    Text
+' '           Text.Whitespace
+'XmlNew'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' XmlParse '  Text
+' '           Text.Whitespace
+'XmlParse'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' XmlSearch ' Text
+' '           Text.Whitespace
+'XmlSearch'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' XmlTransform ' Text
+' '           Text.Whitespace
+'XmlTransform' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' Year '      Text
+' '           Text.Whitespace
+'Year'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' YesNoFormat ' Text
+' '           Text.Whitespace
+'YesNoFormat' Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '</list>'     Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal Text"' Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CF Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxCF Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;!---"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"HTML Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxHTML Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;!--"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxCFSCRIPT Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;[cC][fF][sS][cC][rR][iI][pP][tT]"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxSCRIPT Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;[sS][cC][rR][iI][pP][tT]"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Style Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxSTYLE Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;[sS][tT][yY][lL][eE]"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"HTML Entities"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxHTML Entities"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&amp;"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Custom Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxCustom Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;\\/?[cC][fF]_"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CFX Tags"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxCFX Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;\\/?[cC][fF][xX]_"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CF Tags"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxCF Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;\\/?[cC][fF]"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Table Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxTable Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;\\/?([tT][aAhHbBfFrRdD])|([cC][aA][pP][tT])"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Anchor Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxAnchor Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;\\/?[aA] "' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Image Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxImage Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;\\/?[iI][mM][gG] "' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Tags"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxTag"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;!?\\/?[a-zA-Z0-9_]+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\n\n\t\t\t' Text
+'\n\n\n\n\t\t\t' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxCFSCRIPT Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxCFSCRIPT Block"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxSCRIPT Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxSCRIPT Block"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxSTYLE Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Style Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Style Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxSTYLE Block"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\n\n\t\t\t' Text
+'\n\n\n\n\t\t\t' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxTag"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Tags"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Tags"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxTable Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Table Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Table Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxAnchor Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Anchor Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Anchor Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxImage Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Image Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Image Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxCF Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CF Tags"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CF Tags"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxCustom Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Custom Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Custom Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxCFX Tag"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CFX Tags"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CFX Tags"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&gt;"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"="'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\n\n\t\t\t' Text
+'\n\n\n\n\t\t\t' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxHTML Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"HTML Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CF Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxCF Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;!---"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"HTML Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"--&gt;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxCF Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CF Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CF Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"---&gt;"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxC Style Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n        \t\t' Text
+'\n        \t\t' Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxOne Line Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxHTML Entities"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"HTML Entities"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"HTML Entities"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '";"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\n\n\t\t\t' Text
+'\n\n\n\n\t\t\t' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxCFSCRIPT Block"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxC Style Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxOne Line Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Strings"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Strings"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Int'        Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Numbers"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Float'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Numbers"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<AnyChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Operators"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"[()[\\]=+-*/]+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<AnyChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Brackets"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"{}"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\n\t\t\t\t' Text
+'\n\n\t\t\t\t' Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Keywords"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"CFSCRIPT Keywords"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Functions"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"CFSCRIPT Functions"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop#pop"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;/[cC][fF][sS][cC][rR][iI][pP][tT]&gt;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\n\n\t\t\t' Text
+'\n\n\n\n\t\t\t' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxSCRIPT Block"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxC Style Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxOne Line Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Strings"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Strings"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Int'        Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Numbers"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Float'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Numbers"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<AnyChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Operators"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"[()[\\]=+-*/]+"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<AnyChar'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Brackets"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"{}"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\n\t\t\t\t' Text
+'\n\n\t\t\t\t' Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Keywords"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"Script Keywords"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Objects"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"Script Objects"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Functions"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"Script Methods"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop#pop"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;/[sS][cC][rR][iI][pP][tT]&gt;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\n\n\t\t\t' Text
+'\n\n\n\n\t\t\t' Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxSTYLE Block"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Style Selectors"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxC Style Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Brackets"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxStyle Properties"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"{"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Style Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop#pop"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&lt;/[sS][tT][yY][lL][eE]&gt;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxStyle Properties"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Style Properties"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Brackets"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"}"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxC Style Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"/"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"ctxStyle Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '":"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ctxStyle Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Style Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#pop"'      Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '";"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '","'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Int'        Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Numbers"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Float'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Numbers"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Numbers"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"#([0-9a-fA-F]{3})|([0-9a-fA-F]{6})"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"&quot;[^&quot;]*&quot;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\'[^\']*\'"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '</contexts>' Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#000000"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Tags"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 'color='      Name.Attribute
 '"#000080"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Table Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#008080"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#800000"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Image Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#800080"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Style Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#800080"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Anchor Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#008000"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Attribute Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t'          Text
+'\t'          Text.Whitespace
 'color='      Name.Attribute
 '"#0000ff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"HTML Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsComment"' Literal.String
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'color='      Name.Attribute
 '"#008000"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#999999"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CF Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsComment"' Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#ff9900"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#999999"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Comment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsComment"' Literal.String
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'color='      Name.Attribute
 '"#ff9900"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#999999"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CF Tags"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 'color='      Name.Attribute
 '"#800000"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Custom Tags"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#cc6666"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CFX Tags"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#008000"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Numbers"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t\t'    Text
+'\t\t\t\t'    Text.Whitespace
 'color='      Name.Attribute
 '"#0000ff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"HTML Entities"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'color='      Name.Attribute
 '"#000000"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Style Selectors"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'color='      Name.Attribute
 '"#ff00ff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Style Properties"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t'          Text
+'\t'          Text.Whitespace
 'color='      Name.Attribute
 '"#000080"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Style Values"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'color='      Name.Attribute
 '"#ff0000"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Brackets"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t\t'      Text
+'\t\t\t'      Text.Whitespace
 'color='      Name.Attribute
 '"#000080"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Numbers"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'color='      Name.Attribute
 '"#ff00ff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Strings"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'color='      Name.Attribute
 '"#008080"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Operators"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t'          Text
+'\t'          Text.Whitespace
 'color='      Name.Attribute
 '"#0000ff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Keywords"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'color='      Name.Attribute
 '"#0000cc"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Functions"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t'          Text
+'\t'          Text.Whitespace
 'color='      Name.Attribute
 '"#000080"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Script Objects"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-'\t\t'        Text
+'\t\t'        Text.Whitespace
 'color='      Name.Attribute
 '"#0000cc"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'selColor='   Name.Attribute
 '"#ffffff"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'bold='       Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'italic='     Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '</highlighting>' Name.Tag
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<comments'   Name.Tag
 '>'           Name.Tag
-'\n\n\t\t\t'  Text
+'\n\n\t\t\t'  Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"multiLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"&lt;!--"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'end='        Name.Attribute
 '"--&gt;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"multiLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"/*"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'end='        Name.Attribute
 '"*/"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"singleLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"//"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '</comments>' Name.Tag
-'\n\n\t\t'    Text
+'\n\n\t\t'    Text.Whitespace
 '<keywords'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"0"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'weakDeliminator=' Name.Attribute
 '"-"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '</general>'  Name.Tag
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '</language>' Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<?xml version="1.0" encoding="UTF-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!DOCTYPE language SYSTEM "language.dtd">' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- Author: Werner Braun <wb@o3-software.de> -->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- 29.05.2003 wb mailed to the kate-team (cullmann) -->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- 23.05.2003 wb added *.bro File-Type for GPCP Browser output-->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- 09.05.2003 wb nested comments allowed (maximum two level nesting) -->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- 07.04.2003 wb IN Problem solved -->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- 06.05.2003 wb NEW without ( -->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- 22.04.2003 wb Minor bugfixes -->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- 19.04.2003 wb Some more Enhancements -->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- 18.04.2003 wb Enhancenment for Maior / Minor Comments and Full / ReadOnly Exports, Folds for Procedures, Records, Comments -->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<!-- 17.04.2003 wb Enhancements for Relation and Operators -->' Comment.Multiline
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<language'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Component-Pascal"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"1.05"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'kateversion=' Name.Attribute
 '"2.1"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'section='    Name.Attribute
 '"Sources"'   Literal.String
-'\n          ' Text
+'\n          ' Text.Whitespace
 'extensions=' Name.Attribute
 '"*.cp;*.bro"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'mimetype='   Name.Attribute
 '"text/x-component-pascal"' Literal.String
-'\n          ' Text
+'\n          ' Text.Whitespace
 'author='     Name.Attribute
 '"Werner Braun (wb@o3-software.de)"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'license='    Name.Attribute
 '""'          Literal.String
 '>'           Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<highlighting' Name.Tag
 '>'           Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"keywords"'  Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BEGIN '     Text
+' '           Text.Whitespace
+'BEGIN'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BY '        Text
+' '           Text.Whitespace
+'BY'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CASE '      Text
+' '           Text.Whitespace
+'CASE'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CLOSE '     Text
+' '           Text.Whitespace
+'CLOSE'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CONST '     Text
+' '           Text.Whitespace
+'CONST'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DO '        Text
+' '           Text.Whitespace
+'DO'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ELSE '      Text
+' '           Text.Whitespace
+'ELSE'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ELSIF '     Text
+' '           Text.Whitespace
+'ELSIF'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' END '       Text
+' '           Text.Whitespace
+'END'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' FOR '       Text
+' '           Text.Whitespace
+'FOR'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IF '        Text
+' '           Text.Whitespace
+'IF'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' IMPORT '    Text
+' '           Text.Whitespace
+'IMPORT'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LOOP '      Text
+' '           Text.Whitespace
+'LOOP'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' MODULE '    Text
+' '           Text.Whitespace
+'MODULE'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' NEW '       Text
+' '           Text.Whitespace
+'NEW'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' OF '        Text
+' '           Text.Whitespace
+'OF'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' OUT '       Text
+' '           Text.Whitespace
+'OUT'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' PROCEDURE ' Text
+' '           Text.Whitespace
+'PROCEDURE'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' REPEAT '    Text
+' '           Text.Whitespace
+'REPEAT'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' THEN '      Text
+' '           Text.Whitespace
+'THEN'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' TO '        Text
+' '           Text.Whitespace
+'TO'          Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' TYPE '      Text
+' '           Text.Whitespace
+'TYPE'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' UNTIL '     Text
+' '           Text.Whitespace
+'UNTIL'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' VAR '       Text
+' '           Text.Whitespace
+'VAR'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' WHILE '     Text
+' '           Text.Whitespace
+'WHILE'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' WITH '      Text
+' '           Text.Whitespace
+'WITH'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</list>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"exits"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ASSERT '    Text
+' '           Text.Whitespace
+'ASSERT'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' EXIT '      Text
+' '           Text.Whitespace
+'EXIT'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' HALT '      Text
+' '           Text.Whitespace
+'HALT'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' RETURN '    Text
+' '           Text.Whitespace
+'RETURN'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</list>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"types"'     Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ANYPTR '    Text
+' '           Text.Whitespace
+'ANYPTR'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ANYREC '    Text
+' '           Text.Whitespace
+'ANYREC'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ARRAY '     Text
+' '           Text.Whitespace
+'ARRAY'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BOOLEAN '   Text
+' '           Text.Whitespace
+'BOOLEAN'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SHORTCHAR ' Text
+' '           Text.Whitespace
+'SHORTCHAR'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CHAR '      Text
+' '           Text.Whitespace
+'CHAR'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BYTE '      Text
+' '           Text.Whitespace
+'BYTE'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SHORTINT '  Text
+' '           Text.Whitespace
+'SHORTINT'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' INTEGER '   Text
+' '           Text.Whitespace
+'INTEGER'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LONGINT '   Text
+' '           Text.Whitespace
+'LONGINT'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' POINTER '   Text
+' '           Text.Whitespace
+'POINTER'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' RECORD '    Text
+' '           Text.Whitespace
+'RECORD'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SHORTREAL ' Text
+' '           Text.Whitespace
+'SHORTREAL'   Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' REAL '      Text
+' '           Text.Whitespace
+'REAL'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SET '       Text
+' '           Text.Whitespace
+'SET'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</list>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"attributes"' Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ABSTRACT '  Text
+' '           Text.Whitespace
+'ABSTRACT'    Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' EMPTY '     Text
+' '           Text.Whitespace
+'EMPTY'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' EXTENSIBLE ' Text
+' '           Text.Whitespace
+'EXTENSIBLE'  Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LIMITED '   Text
+' '           Text.Whitespace
+'LIMITED'     Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</list>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"builtins"'  Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ABS '       Text
+' '           Text.Whitespace
+'ABS'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ASH '       Text
+' '           Text.Whitespace
+'ASH'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' BITS '      Text
+' '           Text.Whitespace
+'BITS'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CAP '       Text
+' '           Text.Whitespace
+'CAP'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' CHR '       Text
+' '           Text.Whitespace
+'CHR'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' DEC '       Text
+' '           Text.Whitespace
+'DEC'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ENTIER '    Text
+' '           Text.Whitespace
+'ENTIER'      Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' EXCL '      Text
+' '           Text.Whitespace
+'EXCL'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' INC '       Text
+' '           Text.Whitespace
+'INC'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' INCL '      Text
+' '           Text.Whitespace
+'INCL'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LEN '       Text
+' '           Text.Whitespace
+'LEN'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' LONG '      Text
+' '           Text.Whitespace
+'LONG'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' MAX '       Text
+' '           Text.Whitespace
+'MAX'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' MIN '       Text
+' '           Text.Whitespace
+'MIN'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ODD '       Text
+' '           Text.Whitespace
+'ODD'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' ORD '       Text
+' '           Text.Whitespace
+'ORD'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SHORT '     Text
+' '           Text.Whitespace
+'SHORT'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' SIZE '      Text
+' '           Text.Whitespace
+'SIZE'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</list>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<list'       Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"specials"'  Literal.String
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' FALSE '     Text
+' '           Text.Whitespace
+'FALSE'       Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' INF '       Text
+' '           Text.Whitespace
+'INF'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' NIL '       Text
+' '           Text.Whitespace
+'NIL'         Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<item'       Name.Tag
 '>'           Name.Tag
-' TRUE '      Text
+' '           Text.Whitespace
+'TRUE'        Text
+' '           Text.Whitespace
 '</item>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</list>'     Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<contexts'   Name.Tag
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal"'    Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMaior"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Comment1"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"(**"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"Comment2"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"("'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"String1"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&quot;"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"String2"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"\'"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"PROCEDURE\\s"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Proc"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"ABSTRACT;|EMPTY;|END\\s*[A-Za-z][A-Za-z0-9_]*\\;"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Proc"'      Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Type"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"RECORD"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'beginRegion=' Name.Attribute
 '"Rec"'       Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"END"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Rec"'       Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<StringDetect' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"MemAlloc"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"NEW"'       Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"keywords"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Exit"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"exits"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Type"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"types"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Attribute"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"attributes"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Builtin"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"builtins"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<keyword'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"SpecialValues"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"specials"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Integer"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\s[\\+|\\-]{0,1}[0-9]([0-9]*|[0-9A-F]*(H|L))"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Float'      Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Float"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Char"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\s[0-9][0-9A-F]*X"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"ExportFull"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"[A-Za-z][A-Za-z0-9_]*\\*"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"ExportReadOnly"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"[A-Za-z][A-Za-z0-9_]*\\-"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Relation"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\s(=|#|&lt;|&lt;=|&gt;|&gt;=|IN\\s|IS)"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<RegExpr'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"Operator"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'String='     Name.Attribute
 '"\\s(\\+|\\-|OR|\\*|/|DIV|MOD|\\&amp;)"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMaior"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Comment1"'  Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMaior"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '")"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"CommentN"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"("'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Comment2"'  Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '")"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'endRegion='  Name.Attribute
 '"Comment"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"CommentN"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"("'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CommentN"'  Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '")"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"CommentN2"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"("'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '"*"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CommentN2"' Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<Detect2Chars' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"*"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 'char1='      Name.Attribute
 '")"'         Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String1"'   Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"&quot;"'    Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<context'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'lineEndContext=' Name.Attribute
 '"#stay"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String2"'   Literal.String
 '>'           Name.Tag
-'\n\t\t\t\t'  Text
+'\n\t\t\t\t'  Text.Whitespace
 '<DetectChar' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'attribute='  Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'context='    Name.Attribute
 '"#pop"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'char='       Name.Attribute
 '"\'"'        Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '</context>'  Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</contexts>' Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<itemDatas'  Name.Tag
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Normal Text"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CommentMaior"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsComment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CommentMinor"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsComment"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"String"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsString"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Keyword"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsKeyword"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"MemAlloc"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsKeyword"' Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Exit"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsKeyword"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Type"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDataType"' Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Attribute"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Builtin"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Integer"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsBaseN"'   Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Float"'     Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsFloat"'   Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Char"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsChar"'    Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"SpecialValues"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsDecVal"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ExportFull"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"ExportReadOnly"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsOthers"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Relation"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<itemData'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Operator"'  Literal.String
-' '           Text
+' '           Text.Whitespace
 'defStyleNum=' Name.Attribute
 '"dsNormal"'  Literal.String
 '/>'          Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</itemDatas>' Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '</highlighting>' Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<general'    Name.Tag
 '>'           Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<keywords'   Name.Tag
-' '           Text
+' '           Text.Whitespace
 'casesensitive=' Name.Attribute
 '"1"'         Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<comments'   Name.Tag
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<comment'    Name.Tag
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"multiLine"' Literal.String
-' '           Text
+' '           Text.Whitespace
 'start='      Name.Attribute
 '"(*"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 'end='        Name.Attribute
 '"*)"'        Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</comments>' Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '</general>'  Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</language>' Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/xquery/test-3.0.xq.output b/tests/examplefiles/xquery/test-3.0.xq.output
index d373236f5c..300af915f4 100644
--- a/tests/examplefiles/xquery/test-3.0.xq.output
+++ b/tests/examplefiles/xquery/test-3.0.xq.output
@@ -1,5 +1,5 @@
 'xquery'      Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'version'     Keyword.Pseudo
 ' '           Text.Whitespace
 '"3.0"'       Literal.String.Double
@@ -7,7 +7,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'namespace'   Keyword.Declaration
 ' '           Text.Whitespace
 'other'       Name.Namespace
@@ -19,9 +19,9 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'variable'    Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'local:straight-var1' Name
 ' '           Text.Whitespace
@@ -32,7 +32,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '%'           Name.Decorator
 'private'     Name.Decorator
 ' '           Text
@@ -48,7 +48,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '%'           Name.Decorator
 'public'      Name.Decorator
 ' '           Text
@@ -64,7 +64,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '%'           Name.Decorator
 'other:annotation' Name.Decorator
 '('           Punctuation
@@ -86,9 +86,9 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'variable'    Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'local:straight-var2' Name
 ' '           Text.Whitespace
@@ -104,7 +104,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:word-count' Name.Function
@@ -115,12 +115,12 @@
 'as'          Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 '*'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'xs:integer'  Keyword.Type
@@ -152,7 +152,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:add'   Name.Function
@@ -181,7 +181,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:dispatch' Name.Function
@@ -192,11 +192,11 @@
 'as'          Keyword
 ' '           Text.Whitespace
 'node'        Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'item'        Keyword
@@ -215,7 +215,7 @@
 'case'        Keyword
 ' '           Text.Whitespace
 'text'        Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 ' '           Text.Whitespace
@@ -227,7 +227,7 @@
 'case'        Keyword
 ' '           Text.Whitespace
 'comment'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 ' '           Text.Whitespace
@@ -239,7 +239,7 @@
 'case'        Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 'bill'        Name
 ')'           Punctuation
@@ -255,7 +255,7 @@
 'case'        Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 'btitle'      Name
 ')'           Punctuation
@@ -271,7 +271,7 @@
 'case'        Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 'section-id'  Name
 ')'           Punctuation
@@ -287,7 +287,7 @@
 'case'        Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 'bill-text'   Name
 ')'           Punctuation
@@ -303,7 +303,7 @@
 'case'        Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 'strike'      Name
 ')'           Punctuation
@@ -337,7 +337,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:noise' Name.Function
@@ -349,7 +349,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'duck'        Name
 ' '           Text.Whitespace
@@ -368,14 +368,14 @@
 'return'      Keyword
 '\n\t\t'      Text.Whitespace
 'switch'      Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '$'           Name.Variable
 'animal'      Name
 ')'           Punctuation
 '\n\t\t\t'    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 '"Cow"'       Literal.String.Double
 ' '           Text.Whitespace
 'return'      Keyword
@@ -383,7 +383,7 @@
 '"Moo"'       Literal.String.Double
 '\n\t\t\t'    Text.Whitespace
 'case'        Keyword
-' '           Text
+' '           Text.Whitespace
 "'Cat'"       Literal.String.Single
 ' '           Text.Whitespace
 'return'      Keyword
@@ -417,7 +417,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:a-to-z' Name.Function
@@ -427,14 +427,14 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'data'        Name
 ' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 '*'           Punctuation
@@ -526,7 +526,7 @@
 '{'           Punctuation
 '\n\t\t\t'    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'item'        Name
 ' '           Text.Whitespace
@@ -600,7 +600,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:plays-by-character' Name.Function
@@ -610,7 +610,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'plays'       Name
 ' '           Text.Whitespace
@@ -619,7 +619,7 @@
 '('           Punctuation
 '\n\t\t'      Text.Whitespace
 'document'    Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t'    Text.Whitespace
 '<'           Name.Tag
@@ -839,7 +839,7 @@
 ','           Punctuation
 '\n\t\t'      Text.Whitespace
 'document'    Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t'    Text.Whitespace
 '<'           Name.Tag
@@ -1036,7 +1036,7 @@
 'return'      Keyword
 '\n\n\t\t'    Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'play'        Name
 ' '           Text.Whitespace
@@ -1048,7 +1048,7 @@
 'play'        Name.Tag
 '\n\t\t'      Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'title'       Name
 ' '           Text.Whitespace
@@ -1060,7 +1060,7 @@
 'title'       Name.Tag
 '\n\t\t'      Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'character'   Name
 ' '           Text.Whitespace
@@ -1132,7 +1132,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '%'           Name.Decorator
 'other:a'     Name.Decorator
 '\n\t'        Text
@@ -1170,7 +1170,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'thing'       Name
 ' '           Text.Whitespace
@@ -1189,7 +1189,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '%'           Name.Decorator
 'public'      Name.Decorator
 ' '           Text
@@ -1202,7 +1202,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'nothing'     Name
 ' '           Text.Whitespace
@@ -1222,7 +1222,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:ordered' Name.Function
@@ -1232,7 +1232,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'hit'         Name
 ' '           Text.Whitespace
@@ -1256,7 +1256,7 @@
 ']'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'score'       Name
 ' '           Text.Whitespace
@@ -1329,7 +1329,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:concat-expr' Name.Function
@@ -1341,7 +1341,7 @@
 '{'           Punctuation
 '\n\n\t'      Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'concatenated' Name
 ' '           Text.Whitespace
@@ -1371,7 +1371,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:human-units' Name.Function
@@ -1383,7 +1383,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'unit'        Name
 ' '           Text.Whitespace
@@ -1499,7 +1499,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:merge-simple' Name.Function
@@ -1521,7 +1521,7 @@
 'xs:string'   Keyword.Type
 '+'           Operator
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'xs:string'   Keyword.Type
@@ -1549,7 +1549,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:apply' Name.Function
@@ -1582,7 +1582,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:apply-all' Name.Function
@@ -1619,7 +1619,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:apply-all-long' Name.Function
@@ -1633,7 +1633,7 @@
 '('           Punctuation
 'xs:string'   Keyword.Type
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'xs:string'   Keyword.Type
@@ -1667,7 +1667,7 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:merge' Name.Function
@@ -1710,7 +1710,7 @@
 'xs:string'   Keyword.Type
 '+'           Operator
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'xs:string'   Keyword.Type
@@ -1735,7 +1735,7 @@
 '\n\n'        Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'to-upper'    Name
 ' '           Text.Whitespace
@@ -1747,7 +1747,7 @@
 '\n'          Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'to-upper-long' Name
 ' '           Text.Whitespace
@@ -1757,7 +1757,7 @@
 '('           Punctuation
 'xs:string'   Keyword.Type
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'xs:string'   Keyword.Type
diff --git a/tests/examplefiles/xquery/test-exist-update.xq.output b/tests/examplefiles/xquery/test-exist-update.xq.output
index 76b146941e..7faf0c2d08 100644
--- a/tests/examplefiles/xquery/test-exist-update.xq.output
+++ b/tests/examplefiles/xquery/test-exist-update.xq.output
@@ -1,5 +1,5 @@
 'xquery'      Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'version'     Keyword.Pseudo
 ' '           Text.Whitespace
 '"3.0"'       Literal.String.Double
@@ -7,7 +7,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:add-log-message' Name.Function
@@ -19,11 +19,11 @@
 ' '           Text.Whitespace
 'xs:string'   Keyword.Type
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'empty-sequence' Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 '?'           Punctuation
@@ -32,7 +32,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'logfile-collection' Name
 ' '           Text.Whitespace
@@ -41,7 +41,7 @@
 '"/db/apps/exist101/log"' Literal.String.Double
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'logfile-name' Name
 ' '           Text.Whitespace
@@ -50,7 +50,7 @@
 '"exist101-log.xml"' Literal.String.Double
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'logfile-full' Name
 ' '           Text.Whitespace
@@ -70,7 +70,7 @@
 ')'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'logfile-created' Name
 ' '           Text.Whitespace
@@ -109,7 +109,7 @@
 'return'      Keyword
 '\n\t\t'      Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 '\n\t\t\t'    Text.Whitespace
 '<'           Name.Tag
@@ -149,7 +149,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:insert-attributes' Name.Function
@@ -159,14 +159,14 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'elm'         Name
 ' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 ' '           Text.Whitespace
@@ -184,7 +184,7 @@
 '('           Punctuation
 '\n\t\t'      Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 '<'           Name.Tag
@@ -198,11 +198,11 @@
 ','           Punctuation
 '\n\t\t'      Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -225,11 +225,11 @@
 ','           Punctuation
 '\n\t\t'      Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'a'           Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -258,7 +258,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:insert-elem' Name.Function
@@ -268,14 +268,14 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'elm'         Name
 ' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 ' '           Text.Whitespace
@@ -291,7 +291,7 @@
 'return'      Keyword
 '\n\t\t'      Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 '<'           Name.Tag
@@ -321,7 +321,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:insert-elem2' Name.Function
@@ -331,14 +331,14 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'elm'         Name
 ' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 ' '           Text.Whitespace
@@ -352,14 +352,14 @@
 '*'           Name.Tag
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'new-element' Name
 ' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 ' '           Text.Whitespace
@@ -384,7 +384,7 @@
 'return'      Keyword
 '\n\t\t'      Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 '$'           Name.Variable
@@ -401,7 +401,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:insert-single' Name.Function
@@ -411,7 +411,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 '<'           Name.Tag
@@ -457,7 +457,7 @@
 '\n\n\n'      Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:trim-insert' Name.Function
@@ -467,7 +467,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'document'    Name
 ' '           Text.Whitespace
@@ -479,7 +479,7 @@
 ')'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'newentry'    Name
 ' '           Text.Whitespace
@@ -516,7 +516,7 @@
 'return'      Keyword
 '\n\t\t'      Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'delete'      Keyword
 ' '           Text.Whitespace
 '$'           Name.Variable
@@ -554,7 +554,7 @@
 'then'        Keyword
 '\n\t\t\t'    Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 '$'           Name.Variable
@@ -575,7 +575,7 @@
 'else'        Keyword
 '\n\t\t\t'    Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 '$'           Name.Variable
@@ -594,7 +594,7 @@
 '\n\n\n'      Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:attempt-document-node-insert' Name.Function
@@ -610,14 +610,14 @@
 ':)'          Comment
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'document'    Name
 ' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'document-node' Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 ')'           Punctuation
 ' '           Text.Whitespace
@@ -636,7 +636,7 @@
 'return'      Keyword
 '\n\t\t'      Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 '<'           Name.Tag
@@ -656,7 +656,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'local:attempt-attr-update-with-node' Name.Function
@@ -666,7 +666,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'replace'     Keyword
 ' '           Text.Whitespace
 'doc'         Name.Function
@@ -705,7 +705,7 @@
 '\n\n\n'      Text.Whitespace
 
 '(#'          Punctuation
-' '           Text
+' '           Text.Whitespace
 'exist:batch-transaction' Name.Variable
 ' '           Literal
 '#)'          Punctuation
@@ -713,7 +713,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'delete'      Keyword
 ' '           Text.Whitespace
 '$'           Name.Variable
@@ -734,7 +734,7 @@
 ','           Punctuation
 '\n\t'        Text.Whitespace
 'update'      Keyword
-' '           Text
+' '           Text.Whitespace
 'insert'      Keyword
 ' '           Text.Whitespace
 '$'           Name.Variable
diff --git a/tests/examplefiles/xquery/test.xqy.output b/tests/examplefiles/xquery/test.xqy.output
index 859cdf5edf..268e691935 100644
--- a/tests/examplefiles/xquery/test.xqy.output
+++ b/tests/examplefiles/xquery/test.xqy.output
@@ -9,7 +9,7 @@
 '\n'          Text.Whitespace
 
 'xquery'      Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'version'     Keyword.Pseudo
 ' '           Text.Whitespace
 '"1.0"'       Literal.String.Double
@@ -17,7 +17,7 @@
 '\n\n'        Text.Whitespace
 
 'module'      Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'namespace'   Keyword.Declaration
 ' '           Text.Whitespace
 'xqueryexample' Name.Namespace
@@ -27,7 +27,7 @@
 '\n'          Text.Whitespace
 
 'import'      Keyword.Pseudo
-' '           Text
+' '           Text.Whitespace
 'module'      Keyword.Pseudo
 ' '           Text.Whitespace
 'namespace'   Keyword
@@ -39,13 +39,13 @@
 '"http://example.com/ns/imported"' Literal.String.Double
 ' '           Text.Whitespace
 'at'          Keyword
-' '           Text
+' '           Text.Whitespace
 '"no/such/file.xqy"' Literal.String.Double
 ';'           Punctuation
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'namespace'   Keyword.Declaration
 ' '           Text.Whitespace
 'sess'        Name.Namespace
@@ -57,9 +57,9 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'variable'    Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'amazing'     Name
 ' '           Text.Whitespace
@@ -70,16 +70,16 @@
 '\n'          Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'variable'    Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'SESSIONS'    Name
 ' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'element'     Name.Tag
-''            Text
+''            Text.Whitespace
 '('           Punctuation
 'sess:session' Name
 ')'           Punctuation
@@ -94,7 +94,7 @@
 '\n\n'        Text.Whitespace
 
 'declare'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'option'      Keyword.Declaration
 ' '           Text.Whitespace
 'sess:clear'  Name.Variable
@@ -104,7 +104,7 @@
 '\n\n'        Text.Whitespace
 
 'define'      Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'function'    Keyword.Declaration
 ' '           Text.Whitespace
 'whatsit'     Name.Function
@@ -116,7 +116,7 @@
 ' '           Text.Whitespace
 'xs:string'   Keyword.Type
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'as'          Keyword
 ' '           Text.Whitespace
 'xs:string'   Keyword.Type
@@ -124,7 +124,7 @@
 '{'           Punctuation
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'var1'        Name
 ' '           Text.Whitespace
@@ -133,7 +133,7 @@
 '1'           Literal.Number.Integer
 '\n\t'        Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'var2'        Name
 ' '           Text.Whitespace
@@ -164,7 +164,7 @@
 ')'           Punctuation
 '\n\n\t'      Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'let'         Name
 ' '           Text.Whitespace
@@ -190,13 +190,13 @@
 ':)'          Comment
 ' '           Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'element'     Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t'    Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'attribute'   Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -207,7 +207,7 @@
 ','           Punctuation
 '\n\t\t\t\t'  Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'test'        Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -218,7 +218,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'foo'         Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -268,7 +268,7 @@
 '\n\n'        Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'bride'       Name
 ' '           Text.Whitespace
@@ -278,14 +278,14 @@
 '\n'          Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'test'        Name
 ' '           Text.Whitespace
 ':='          Operator
 ' '           Text.Whitespace
 'validate'    Keyword
-' '           Text
+' '           Text.Whitespace
 'lax'         Keyword
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -305,14 +305,14 @@
 '\n'          Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'test'        Name
 ' '           Text.Whitespace
 ':='          Operator
 ' '           Text.Whitespace
 'validate'    Keyword
-' '           Text
+' '           Text.Whitespace
 'strict'      Keyword
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -332,14 +332,14 @@
 '\n'          Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'test'        Name
 ' '           Text.Whitespace
 ':='          Operator
 ' '           Text.Whitespace
 'validate'    Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 ' '           Text.Whitespace
 '<'           Name.Tag
@@ -357,7 +357,7 @@
 '\n'          Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'test'        Name
 ' '           Text.Whitespace
@@ -380,7 +380,7 @@
 '\n'          Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'test'        Name
 ' '           Text.Whitespace
@@ -397,14 +397,14 @@
 '\n\n'        Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'noop'        Name
 ' '           Text.Whitespace
 ':='          Operator
 ' '           Text.Whitespace
 'ordered'     Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 ' '           Text.Whitespace
 '$'           Name.Variable
@@ -414,14 +414,14 @@
 '\n'          Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'noop'        Name
 ' '           Text.Whitespace
 ':='          Operator
 ' '           Text.Whitespace
 'unordered'   Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 ' '           Text.Whitespace
 '$'           Name.Variable
@@ -431,14 +431,14 @@
 '\n\n'        Text.Whitespace
 
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'noop'        Name
 ' '           Text.Whitespace
 ':='          Operator
 '\n\t'        Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'version'     Name
 ' '           Text.Whitespace
@@ -455,7 +455,7 @@
 'version'     Name.Tag
 '\n\t\t'      Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'row'         Name
 ' '           Text.Whitespace
@@ -695,13 +695,13 @@
 ':)'          Comment
 '\n\t\t\t\t'  Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'div'         Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'id'          Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -712,7 +712,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'class'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -723,7 +723,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'h1'          Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -734,7 +734,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'p'           Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -746,13 +746,13 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'a'           Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'href'        Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -782,7 +782,7 @@
 '{'           Punctuation
 '\n\t\t\t\t'  Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'i'           Name
 ' '           Text.Whitespace
@@ -792,7 +792,7 @@
 'sessions'    Name
 '\n\t\t\t\t'  Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'id'          Name
 ' '           Text.Whitespace
@@ -805,7 +805,7 @@
 ')'           Punctuation
 '\n\t\t\t\t'  Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'uri'         Name
 ' '           Text.Whitespace
@@ -822,7 +822,7 @@
 ':)'          Comment
 '\n\t\t\t\t'  Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'conflicting' Name
 ' '           Text.Whitespace
@@ -838,7 +838,7 @@
 ')'           Punctuation
 '\n\t\t\t\t'  Text.Whitespace
 'let'         Keyword
-' '           Text
+' '           Text.Whitespace
 '$'           Name.Variable
 'name'        Name
 ' '           Text.Whitespace
@@ -864,13 +864,13 @@
 'return'      Keyword
 ' '           Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'tr'          Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'td'          Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -882,7 +882,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'td'          Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -899,7 +899,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'td'          Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -916,7 +916,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'td'          Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -933,13 +933,13 @@
 ','           Punctuation
 '\n\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'td'          Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t\t\t\t' Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'empty'       Name.Function
 '('           Punctuation
@@ -956,7 +956,7 @@
 'else'        Keyword
 '\n\t\t\t\t\t\t' Text.Whitespace
 'text'        Keyword
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 '"by"'        Literal.String.Double
@@ -1001,13 +1001,13 @@
 ':)'          Comment
 '\n\t\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'input'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'type'        Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1018,7 +1018,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'title'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1040,7 +1040,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'onclick'     Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1061,7 +1061,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'value'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1106,13 +1106,13 @@
 ':)'          Comment
 '\n\t\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'input'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'type'        Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1123,7 +1123,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'title'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1134,7 +1134,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'onclick'     Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1155,7 +1155,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'value'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1191,13 +1191,13 @@
 ':)'          Comment
 '\n\t\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'input'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'type'        Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1208,7 +1208,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'title'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1219,7 +1219,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'onclick'     Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1240,7 +1240,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'value'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1276,13 +1276,13 @@
 ':)'          Comment
 '\n\t\t\t\t\t\t' Text.Whitespace
 'element'     Keyword
-' '           Text
+' '           Text.Whitespace
 'input'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'type'        Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1293,7 +1293,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'title'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1304,7 +1304,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'onclick'     Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
@@ -1325,7 +1325,7 @@
 ','           Punctuation
 '\n\t\t\t\t\t\t\t' Text.Whitespace
 'attribute'   Keyword
-' '           Text
+' '           Text.Whitespace
 'value'       Name.Variable
 ' '           Text.Whitespace
 '{'           Punctuation
diff --git a/tests/examplefiles/xslt/test.xsl.output b/tests/examplefiles/xslt/test.xsl.output
index 83a86b94d0..d47e117abd 100644
--- a/tests/examplefiles/xslt/test.xsl.output
+++ b/tests/examplefiles/xslt/test.xsl.output
@@ -1,103 +1,103 @@
 '<?xml version="1.0" encoding="utf-8"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<xsl:stylesheet' Keyword
-' '           Text
+' '           Text.Whitespace
 'version='    Name.Attribute
 '"1.0"'       Literal.String
-' '           Text
+' '           Text.Whitespace
 'xmlns:xsl='  Name.Attribute
 '"http://www.w3.org/1999/XSL/Transform"' Literal.String
 '>'           Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<xsl:output' Keyword
-' '           Text
+' '           Text.Whitespace
 'method='     Name.Attribute
 '"xml"'       Literal.String
 '/>'          Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<xsl:template' Keyword
-' '           Text
+' '           Text.Whitespace
 'match='      Name.Attribute
 '"/"'         Literal.String
 '>'           Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<customers'  Name.Tag
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<xsl:apply-templates' Keyword
-' '           Text
+' '           Text.Whitespace
 'select='     Name.Attribute
 '"customers/customer[@Country=\'Germany\']"' Literal.String
 '/>'          Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</customers>' Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '</xsl:template>' Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<xsl:template' Keyword
-' '           Text
+' '           Text.Whitespace
 'match='      Name.Attribute
 '"customers"' Literal.String
 '>'           Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<xsl:apply-templates' Keyword
 '/>'          Name.Tag
-'\n\n\t'      Text
+'\n\n\t'      Text.Whitespace
 '</xsl:template>' Keyword
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '<xsl:template' Keyword
-' '           Text
+' '           Text.Whitespace
 'match='      Name.Attribute
 '"customer"'  Literal.String
 '>'           Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<customer'   Name.Tag
 '>'           Name.Tag
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<xsl:attribute' Keyword
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CompanyName"' Literal.String
 '>'           Name.Tag
 '<xsl:value-of' Keyword
-' '           Text
+' '           Text.Whitespace
 'select='     Name.Attribute
 '"@CompanyName"' Literal.String
 '/>'          Name.Tag
 '</xsl:attribute>' Keyword
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<xsl:attribute' Keyword
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"CustomerID"' Literal.String
 '>'           Name.Tag
 '<xsl:value-of' Keyword
-' '           Text
+' '           Text.Whitespace
 'select='     Name.Attribute
 '"@CustomerID"' Literal.String
 '/>'          Name.Tag
 '</xsl:attribute>' Keyword
-'\n\t\t\t'    Text
+'\n\t\t\t'    Text.Whitespace
 '<xsl:attribute' Keyword
-' '           Text
+' '           Text.Whitespace
 'name='       Name.Attribute
 '"Country"'   Literal.String
 '>'           Name.Tag
 '<xsl:value-of' Keyword
-' '           Text
+' '           Text.Whitespace
 'select='     Name.Attribute
 '"@Country"'  Literal.String
 '/>'          Name.Tag
 '</xsl:attribute>' Keyword
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '</customer>' Name.Tag
-'\n\t\t'      Text
+'\n\t\t'      Text.Whitespace
 '<xsl:apply-templates' Keyword
 '/>'          Name.Tag
-'\n\t'        Text
+'\n\t'        Text.Whitespace
 '</xsl:template>' Keyword
-'\n\n'        Text
+'\n\n'        Text.Whitespace
 
 '</xsl:stylesheet>' Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/examplefiles/xul+mozpreproc/demo.xul.in.output b/tests/examplefiles/xul+mozpreproc/demo.xul.in.output
index 8a337c199f..f5b4e9a196 100644
--- a/tests/examplefiles/xul+mozpreproc/demo.xul.in.output
+++ b/tests/examplefiles/xul+mozpreproc/demo.xul.in.output
@@ -1,14 +1,14 @@
 '<?xml version="1.0" encoding="iso-8859-1"?>' Comment.Preproc
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<window'     Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
-'   '         Text
+'   '         Text.Whitespace
 'xmlns='      Name.Attribute
 '"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"' Literal.String
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Preproc
 'if'          Comment.Preproc
@@ -20,16 +20,16 @@
 '\n'          Text
 
 '<description' Name.Tag
-' '           Text
+' '           Text.Whitespace
 'value='      Name.Attribute
 '"Text"'      Literal.String
-' '           Text
+' '           Text.Whitespace
 '/>'          Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 '#'           Comment.Preproc
 'endif'       Comment.Preproc
 '\n'          Text
 
 '</window>'   Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/console/fake_ps2_prompt.txt b/tests/snippets/console/fake_ps2_prompt.txt
index 4921d304a9..683b36daf3 100644
--- a/tests/snippets/console/fake_ps2_prompt.txt
+++ b/tests/snippets/console/fake_ps2_prompt.txt
@@ -7,8 +7,8 @@ $ echo "> not a prompt"
 ---tokens---
 '$ '          Generic.Prompt
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"> not a prompt"' Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 '> not a prompt\n' Generic.Output
diff --git a/tests/snippets/console/prompt_in_output.txt b/tests/snippets/console/prompt_in_output.txt
index 96481d1959..993bc75b50 100644
--- a/tests/snippets/console/prompt_in_output.txt
+++ b/tests/snippets/console/prompt_in_output.txt
@@ -9,12 +9,12 @@ line1
 ---tokens---
 '$ '          Generic.Prompt
 'cat'         Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '> '          Generic.Prompt
 'test.txt'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'line1\n'     Generic.Output
 
diff --git a/tests/snippets/console/ps2_prompt.txt b/tests/snippets/console/ps2_prompt.txt
index f0aff939c1..175a473771 100644
--- a/tests/snippets/console/ps2_prompt.txt
+++ b/tests/snippets/console/ps2_prompt.txt
@@ -10,6 +10,6 @@ ls: cannot access ...
 
 '> '          Generic.Prompt
 '/does/not/exist' Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'ls: cannot access ...\n' Generic.Output
diff --git a/tests/snippets/console/test_newline_in_echo_no_ps2.txt b/tests/snippets/console/test_newline_in_echo_no_ps2.txt
index 56a7470f91..57a1190d1e 100644
--- a/tests/snippets/console/test_newline_in_echo_no_ps2.txt
+++ b/tests/snippets/console/test_newline_in_echo_no_ps2.txt
@@ -6,11 +6,11 @@ hi
 ---tokens---
 '$ '          Generic.Prompt
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'  '          Text
+'  '          Text.Whitespace
 'hi'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'hi\n'        Generic.Output
diff --git a/tests/snippets/console/test_newline_in_echo_ps2.txt b/tests/snippets/console/test_newline_in_echo_ps2.txt
index f1335f1d55..b90eeadd2a 100644
--- a/tests/snippets/console/test_newline_in_echo_ps2.txt
+++ b/tests/snippets/console/test_newline_in_echo_ps2.txt
@@ -6,11 +6,11 @@ hi
 ---tokens---
 '$ '          Generic.Prompt
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '> '          Generic.Prompt
 'hi'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'hi\n'        Generic.Output
diff --git a/tests/snippets/console/test_newline_in_ls_no_ps2.txt b/tests/snippets/console/test_newline_in_ls_no_ps2.txt
index 5a6bda8595..3366bc08fd 100644
--- a/tests/snippets/console/test_newline_in_ls_no_ps2.txt
+++ b/tests/snippets/console/test_newline_in_ls_no_ps2.txt
@@ -6,11 +6,11 @@ hi
 ---tokens---
 '$ '          Generic.Prompt
 'ls'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
-'  '          Text
+'  '          Text.Whitespace
 'hi'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'hi\n'        Generic.Output
diff --git a/tests/snippets/console/test_newline_in_ls_ps2.txt b/tests/snippets/console/test_newline_in_ls_ps2.txt
index d556a98da9..bf1bae5ea7 100644
--- a/tests/snippets/console/test_newline_in_ls_ps2.txt
+++ b/tests/snippets/console/test_newline_in_ls_ps2.txt
@@ -6,11 +6,11 @@ hi
 ---tokens---
 '$ '          Generic.Prompt
 'ls'          Text
-' '           Text
+' '           Text.Whitespace
 '\\\n'        Literal.String.Escape
 
 '> '          Generic.Prompt
 'hi'          Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'hi\n'        Generic.Output
diff --git a/tests/snippets/console/test_virtualenv.txt b/tests/snippets/console/test_virtualenv.txt
index 2b0182f8bd..420b07a723 100644
--- a/tests/snippets/console/test_virtualenv.txt
+++ b/tests/snippets/console/test_virtualenv.txt
@@ -6,6 +6,6 @@
 ' '           Text
 '[~/project]$ ' Generic.Prompt
 'foo'         Text
-' '           Text
+' '           Text.Whitespace
 '-h'          Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ezhil/test_function.txt b/tests/snippets/ezhil/test_function.txt
index 8b5700e0d8..f89a35741f 100644
--- a/tests/snippets/ezhil/test_function.txt
+++ b/tests/snippets/ezhil/test_function.txt
@@ -12,7 +12,7 @@
 
 ---tokens---
 '# (C) முத்தையா அண்ணாமலை 2013, 2015' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'நிரல்பாகம்'  Keyword
 '  '          Text.Whitespace
@@ -26,7 +26,7 @@
 'y'           Name
 ' '           Text.Whitespace
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'மு'          Name
 ' '           Text.Whitespace
@@ -38,7 +38,7 @@
 ','           Operator
 'y'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text.Whitespace
 'q'           Name
@@ -51,9 +51,9 @@
 ','           Operator
 'y'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '@'           Operator
 '('           Punctuation
@@ -67,16 +67,16 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '       '     Text.Whitespace
 'பின்கொடு'    Keyword
 '  '          Text.Whitespace
 'மு'          Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'பின்கொடு'    Keyword
 '  '          Text.Whitespace
@@ -94,7 +94,7 @@
 'q'           Name
 ' '           Text.Whitespace
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ezhil/test_gcd_expr.txt b/tests/snippets/ezhil/test_gcd_expr.txt
index 0e5cd291f9..f4aaed963f 100644
--- a/tests/snippets/ezhil/test_gcd_expr.txt
+++ b/tests/snippets/ezhil/test_gcd_expr.txt
@@ -18,4 +18,4 @@
 ','           Operator
 'b'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ezhil/test_if_statement.txt b/tests/snippets/ezhil/test_if_statement.txt
index a803ac9ef4..2fe35b7241 100644
--- a/tests/snippets/ezhil/test_if_statement.txt
+++ b/tests/snippets/ezhil/test_if_statement.txt
@@ -16,13 +16,13 @@
 ')'           Punctuation
 ' '           Text.Whitespace
 'ஆனால்'       Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text.Whitespace
 'பதிப்பி'     Keyword
 ' '           Text.Whitespace
 '"wont print"' Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 'முடி'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ezhil/test_sum.txt b/tests/snippets/ezhil/test_sum.txt
index 2ce200d4ab..fa2063d714 100644
--- a/tests/snippets/ezhil/test_sum.txt
+++ b/tests/snippets/ezhil/test_sum.txt
@@ -5,4 +5,4 @@
 '1'           Literal.Number.Integer
 '+'           Operator
 '3'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/http/test_application_calendar_xml.txt b/tests/snippets/http/test_application_calendar_xml.txt
index 81fff58731..beb63865a0 100644
--- a/tests/snippets/http/test_application_calendar_xml.txt
+++ b/tests/snippets/http/test_application_calendar_xml.txt
@@ -25,4 +25,4 @@ Content-Type: application/calendar+xml
 
 '<foo'        Name.Tag
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/http/test_application_xml.txt b/tests/snippets/http/test_application_xml.txt
index 6b3cffad26..97b29435e7 100644
--- a/tests/snippets/http/test_application_xml.txt
+++ b/tests/snippets/http/test_application_xml.txt
@@ -25,4 +25,4 @@ Content-Type: application/xml
 
 '<foo'        Name.Tag
 '>'           Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/mason/test_handles_tags_correctly.txt b/tests/snippets/mason/test_handles_tags_correctly.txt
index 2f3f064fbd..0eb215d111 100644
--- a/tests/snippets/mason/test_handles_tags_correctly.txt
+++ b/tests/snippets/mason/test_handles_tags_correctly.txt
@@ -7,63 +7,63 @@ has 'baz' => (isa => 'Int', default => 17);
 
 ---tokens---
 '<%class>'    Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'has'         Name
-' '           Text
+' '           Text.Whitespace
 "'foo'"       Literal.String
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'has'         Name
-' '           Text
+' '           Text.Whitespace
 "'bar'"       Literal.String
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 ''            Name
 'required'    Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 ''            Name
 'has'         Name
-' '           Text
+' '           Text.Whitespace
 "'baz'"       Literal.String
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 ''            Name
 'isa'         Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 "'Int'"       Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 ''            Name
 'default'     Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '17'          Literal.Number.Integer
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '</%class>'   Name.Tag
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_bold_fenced_by_asterisk.txt b/tests/snippets/md/test_bold_fenced_by_asterisk.txt
index 7ab6a4b433..25c899d19c 100644
--- a/tests/snippets/md/test_bold_fenced_by_asterisk.txt
+++ b/tests/snippets/md/test_bold_fenced_by_asterisk.txt
@@ -5,11 +5,11 @@
 
 ---tokens---
 '**bold**'    Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '('           Text
 '**bold**'    Generic.Strong
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_bold_fenced_by_underscore.txt b/tests/snippets/md/test_bold_fenced_by_underscore.txt
index 5c822695ae..49c91108d9 100644
--- a/tests/snippets/md/test_bold_fenced_by_underscore.txt
+++ b/tests/snippets/md/test_bold_fenced_by_underscore.txt
@@ -5,11 +5,11 @@ __bold__
 
 ---tokens---
 '__bold__'    Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '('           Text
 '__bold__'    Generic.Strong
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_bulleted_list_1.txt b/tests/snippets/md/test_bulleted_list_1.txt
index 6bb58fbe4c..8da212c651 100644
--- a/tests/snippets/md/test_bulleted_list_1.txt
+++ b/tests/snippets/md/test_bulleted_list_1.txt
@@ -4,11 +4,11 @@
 
 ---tokens---
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 'foo'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 'bar'         Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_bulleted_list_2.txt b/tests/snippets/md/test_bulleted_list_2.txt
index 9283611d74..040b908ab1 100644
--- a/tests/snippets/md/test_bulleted_list_2.txt
+++ b/tests/snippets/md/test_bulleted_list_2.txt
@@ -4,11 +4,11 @@
 
 ---tokens---
 '-'           Keyword
-' '           Text
+' '           Text.Whitespace
 'foo'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-'           Keyword
-' '           Text
+' '           Text.Whitespace
 'bar'         Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_bulleted_list_3.txt b/tests/snippets/md/test_bulleted_list_3.txt
index b71420077e..a59d5f7cab 100644
--- a/tests/snippets/md/test_bulleted_list_3.txt
+++ b/tests/snippets/md/test_bulleted_list_3.txt
@@ -4,11 +4,11 @@
 
 ---tokens---
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 '*foo*'       Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 'bar'         Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_bulleted_list_4.txt b/tests/snippets/md/test_bulleted_list_4.txt
index fe29d0a66c..111f9cfcb5 100644
--- a/tests/snippets/md/test_bulleted_list_4.txt
+++ b/tests/snippets/md/test_bulleted_list_4.txt
@@ -9,11 +9,11 @@ code
 '```\ncode\n```\n' Literal.String.Backtick
 
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 '*foo*'       Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 'bar'         Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_code_block_with_language.txt b/tests/snippets/md/test_code_block_with_language.txt
index 088ae26c0a..41f2563f22 100644
--- a/tests/snippets/md/test_code_block_with_language.txt
+++ b/tests/snippets/md/test_code_block_with_language.txt
@@ -11,6 +11,6 @@ import this
 'import'      Keyword.Namespace
 ' '           Text
 'this'        Name.Namespace
-'\n'          Text
+'\n'          Text.Whitespace
 
 '```\n'       Literal.String.Backtick
diff --git a/tests/snippets/md/test_escape_italics.txt b/tests/snippets/md/test_escape_italics.txt
index 625125937c..42e1cb4257 100644
--- a/tests/snippets/md/test_escape_italics.txt
+++ b/tests/snippets/md/test_escape_italics.txt
@@ -9,9 +9,9 @@
 ' '           Text
 'italics'     Text
 '\\*'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\\_'         Text
 ' '           Text
@@ -20,4 +20,4 @@
 'italics'     Text
 ' '           Text
 '\\_'         Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_inline_code.txt b/tests/snippets/md/test_inline_code.txt
index c79c528686..c9a396464a 100644
--- a/tests/snippets/md/test_inline_code.txt
+++ b/tests/snippets/md/test_inline_code.txt
@@ -11,26 +11,26 @@ code (`in brackets`)
 'code:'       Text
 ' '           Text
 '`code`'      Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 ' '           Text
 '`**code**`'  Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '('           Text
 '`code`'      Literal.String.Backtick
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'code'        Text
 ' '           Text
 '('           Text
 '`in brackets`' Literal.String.Backtick
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_inline_code_after_block.txt b/tests/snippets/md/test_inline_code_after_block.txt
index 9be80acf3f..e1f704bc36 100644
--- a/tests/snippets/md/test_inline_code_after_block.txt
+++ b/tests/snippets/md/test_inline_code_after_block.txt
@@ -9,11 +9,11 @@ code
 '```\ncode\n```\n' Literal.String.Backtick
 
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 'nocode'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 '`code`'      Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_inline_code_in_list.txt b/tests/snippets/md/test_inline_code_in_list.txt
index 643f0e5dc8..9cd8aa0649 100644
--- a/tests/snippets/md/test_inline_code_in_list.txt
+++ b/tests/snippets/md/test_inline_code_in_list.txt
@@ -7,20 +7,20 @@
 
 ---tokens---
 '*'           Keyword
-' '           Text
+' '           Text.Whitespace
 '`code`'      Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-'           Keyword
-' '           Text
+' '           Text.Whitespace
 '`code`'      Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1.'          Keyword
 ' '           Text
 '`code`'      Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_invalid_bold.txt b/tests/snippets/md/test_invalid_bold.txt
index cc55d832d7..6a5db6adac 100644
--- a/tests/snippets/md/test_invalid_bold.txt
+++ b/tests/snippets/md/test_invalid_bold.txt
@@ -11,21 +11,21 @@ _no bold_
 '**no'        Text
 ' '           Text
 'bold__'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '__no'        Text
 ' '           Text
 'bold**'      Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 '*no bold*'   Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 '_no bold_'   Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_invalid_italics.txt b/tests/snippets/md/test_invalid_italics.txt
index 7e7cbc34e2..28acb5de9e 100644
--- a/tests/snippets/md/test_invalid_italics.txt
+++ b/tests/snippets/md/test_invalid_italics.txt
@@ -11,21 +11,21 @@ __no italics__
 '*no'         Text
 ' '           Text
 'italics_'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '_no'         Text
 ' '           Text
 'italics*'    Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 '**no italics**' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
 '__no italics__' Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_italics_and_bold.txt b/tests/snippets/md/test_italics_and_bold.txt
index 70a426ec1a..bb2bf4f274 100644
--- a/tests/snippets/md/test_italics_and_bold.txt
+++ b/tests/snippets/md/test_italics_and_bold.txt
@@ -9,7 +9,7 @@
 'and'         Text
 ' '           Text
 '*italics*'   Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
 '\n'          Text
 
@@ -18,4 +18,4 @@
 'and'         Text
 ' '           Text
 '**bold**'    Generic.Strong
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_italics_fenced_by_asterisk.txt b/tests/snippets/md/test_italics_fenced_by_asterisk.txt
index 0a43d60d33..cd8775e1cc 100644
--- a/tests/snippets/md/test_italics_fenced_by_asterisk.txt
+++ b/tests/snippets/md/test_italics_fenced_by_asterisk.txt
@@ -5,11 +5,11 @@
 
 ---tokens---
 '*italics*'   Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '('           Text
 '*italics*'   Generic.Emph
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_italics_fenced_by_underscore.txt b/tests/snippets/md/test_italics_fenced_by_underscore.txt
index d712ca6581..5f57756691 100644
--- a/tests/snippets/md/test_italics_fenced_by_underscore.txt
+++ b/tests/snippets/md/test_italics_fenced_by_underscore.txt
@@ -5,11 +5,11 @@ _italics_
 
 ---tokens---
 '_italics_'   Generic.Emph
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '('           Text
 '_italics_'   Generic.Emph
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_italics_no_multiline.txt b/tests/snippets/md/test_italics_no_multiline.txt
index ad2007b86a..2657ed1e92 100644
--- a/tests/snippets/md/test_italics_no_multiline.txt
+++ b/tests/snippets/md/test_italics_no_multiline.txt
@@ -4,7 +4,7 @@ italics*
 
 ---tokens---
 '*no'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 'italics*'    Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_links.txt b/tests/snippets/md/test_links.txt
index 83b274e2d3..9fc46e8c41 100644
--- a/tests/snippets/md/test_links.txt
+++ b/tests/snippets/md/test_links.txt
@@ -10,9 +10,9 @@
 '('           Text
 'link'        Name.Attribute
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '!['          Text
 'Image of foo' Name.Tag
@@ -20,4 +20,4 @@
 '('           Text
 'https://bar.baz' Name.Attribute
 ')'           Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_mentions.txt b/tests/snippets/md/test_mentions.txt
index 7c7ef01fa3..a2def5c48a 100644
--- a/tests/snippets/md/test_mentions.txt
+++ b/tests/snippets/md/test_mentions.txt
@@ -7,4 +7,4 @@ note for @me:
 'for'         Text
 ' '           Text
 '@me:'        Name.Entity
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_numbered_list.txt b/tests/snippets/md/test_numbered_list.txt
index 0f3864382c..1384d6b8a3 100644
--- a/tests/snippets/md/test_numbered_list.txt
+++ b/tests/snippets/md/test_numbered_list.txt
@@ -6,9 +6,9 @@
 '1.'          Keyword
 ' '           Text
 'foo'         Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '2.'          Keyword
 ' '           Text
 'bar'         Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_reference_style_links.txt b/tests/snippets/md/test_reference_style_links.txt
index 3acc68758e..813cef37b6 100644
--- a/tests/snippets/md/test_reference_style_links.txt
+++ b/tests/snippets/md/test_reference_style_links.txt
@@ -9,10 +9,10 @@
 '['           Text
 'id'          Name.Label
 ']'           Text
-'\n'          Text
+'\n'          Text.Whitespace
 
 '['           Text
 'id'          Name.Label
 ']: '         Text
 'http://example.com' Name.Attribute
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_strikethrough.txt b/tests/snippets/md/test_strikethrough.txt
index 3c63e97502..483c63a5de 100644
--- a/tests/snippets/md/test_strikethrough.txt
+++ b/tests/snippets/md/test_strikethrough.txt
@@ -6,4 +6,4 @@
 'not'         Text
 ' '           Text
 'striked'     Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_task_list.txt b/tests/snippets/md/test_task_list.txt
index e821ff8ed5..7a64506d72 100644
--- a/tests/snippets/md/test_task_list.txt
+++ b/tests/snippets/md/test_task_list.txt
@@ -12,9 +12,9 @@
 'sample'      Text
 ' '           Text
 'task'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 '* '          Keyword
 '[ ]'         Keyword
@@ -22,13 +22,13 @@
 'sample'      Text
 ' '           Text
 'task'        Text
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n  '        Text
+'\n  '        Text.Whitespace
 '* '          Keyword
 '[ ]'         Keyword
 ' '           Text
 'sample'      Text
 ' '           Text
 'task'        Text
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/md/test_topics.txt b/tests/snippets/md/test_topics.txt
index aa84fc9838..18029cc27c 100644
--- a/tests/snippets/md/test_topics.txt
+++ b/tests/snippets/md/test_topics.txt
@@ -7,4 +7,4 @@ message to #you:
 'to'          Text
 ' '           Text
 '#you:'       Name.Entity
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/mips/deprecated_substrings.txt b/tests/snippets/mips/deprecated_substrings.txt
new file mode 100644
index 0000000000..4e7aa7d386
--- /dev/null
+++ b/tests/snippets/mips/deprecated_substrings.txt
@@ -0,0 +1,34 @@
+---input---
+beql
+bnel
+bgtzl
+bgezl
+bltzl
+blezl
+bltzall
+bgezall
+
+---tokens---
+'beql'        Keyword.Pseudo
+'\n'          Text.Whitespace
+
+'bnel'        Keyword.Pseudo
+'\n'          Text.Whitespace
+
+'bgtzl'       Keyword.Pseudo
+'\n'          Text.Whitespace
+
+'bgezl'       Keyword.Pseudo
+'\n'          Text.Whitespace
+
+'bltzl'       Keyword.Pseudo
+'\n'          Text.Whitespace
+
+'blezl'       Keyword.Pseudo
+'\n'          Text.Whitespace
+
+'bltzall'     Keyword.Pseudo
+'\n'          Text.Whitespace
+
+'bgezall'     Keyword.Pseudo
+'\n'          Text.Whitespace
diff --git a/tests/snippets/mips/keyword_substrings.txt b/tests/snippets/mips/keyword_substrings.txt
new file mode 100644
index 0000000000..70d68d57c3
--- /dev/null
+++ b/tests/snippets/mips/keyword_substrings.txt
@@ -0,0 +1,254 @@
+---input---
+subu
+subi
+sub
+addu
+addiu
+addi
+add
+multu
+mult
+mulu
+mul
+maddu
+madd
+msubu
+msub
+divu
+div
+nor
+xor
+andi
+and
+ori
+xori
+or
+sllv
+sll
+srlv
+srl
+srav
+sra
+sltiu
+sltu
+slti
+slt
+jalr
+jal
+jr
+j
+bgezal
+bgez
+bltzal
+bltz
+lbu
+lb
+lhu
+lh
+lwr
+lw
+swl
+swr
+sw
+teqi
+teq
+tneqi
+tne
+tgeiu
+tgeu
+tgei
+tge
+tltiu
+tltu
+tlti
+tlt
+
+---tokens---
+'subu'        Keyword
+'\n'          Text.Whitespace
+
+'subi'        Keyword
+'\n'          Text.Whitespace
+
+'sub'         Keyword
+'\n'          Text.Whitespace
+
+'addu'        Keyword
+'\n'          Text.Whitespace
+
+'addiu'       Keyword
+'\n'          Text.Whitespace
+
+'addi'        Keyword
+'\n'          Text.Whitespace
+
+'add'         Keyword
+'\n'          Text.Whitespace
+
+'multu'       Keyword
+'\n'          Text.Whitespace
+
+'mult'        Keyword
+'\n'          Text.Whitespace
+
+'mulu'        Keyword
+'\n'          Text.Whitespace
+
+'mul'         Keyword
+'\n'          Text.Whitespace
+
+'maddu'       Keyword
+'\n'          Text.Whitespace
+
+'madd'        Keyword
+'\n'          Text.Whitespace
+
+'msubu'       Keyword
+'\n'          Text.Whitespace
+
+'msub'        Keyword
+'\n'          Text.Whitespace
+
+'divu'        Keyword
+'\n'          Text.Whitespace
+
+'div'         Keyword
+'\n'          Text.Whitespace
+
+'nor'         Keyword
+'\n'          Text.Whitespace
+
+'xor'         Keyword
+'\n'          Text.Whitespace
+
+'andi'        Keyword
+'\n'          Text.Whitespace
+
+'and'         Keyword
+'\n'          Text.Whitespace
+
+'ori'         Keyword
+'\n'          Text.Whitespace
+
+'xori'        Keyword
+'\n'          Text.Whitespace
+
+'or'          Keyword
+'\n'          Text.Whitespace
+
+'sllv'        Keyword
+'\n'          Text.Whitespace
+
+'sll'         Keyword
+'\n'          Text.Whitespace
+
+'srlv'        Keyword
+'\n'          Text.Whitespace
+
+'srl'         Keyword
+'\n'          Text.Whitespace
+
+'srav'        Keyword
+'\n'          Text.Whitespace
+
+'sra'         Keyword
+'\n'          Text.Whitespace
+
+'sltiu'       Keyword
+'\n'          Text.Whitespace
+
+'sltu'        Keyword
+'\n'          Text.Whitespace
+
+'slti'        Keyword
+'\n'          Text.Whitespace
+
+'slt'         Keyword
+'\n'          Text.Whitespace
+
+'jalr'        Keyword
+'\n'          Text.Whitespace
+
+'jal'         Keyword
+'\n'          Text.Whitespace
+
+'jr'          Keyword
+'\n'          Text.Whitespace
+
+'j'           Keyword
+'\n'          Text.Whitespace
+
+'bgezal'      Keyword
+'\n'          Text.Whitespace
+
+'bgez'        Keyword
+'\n'          Text.Whitespace
+
+'bltzal'      Keyword
+'\n'          Text.Whitespace
+
+'bltz'        Keyword
+'\n'          Text.Whitespace
+
+'lbu'         Keyword
+'\n'          Text.Whitespace
+
+'lb'          Keyword
+'\n'          Text.Whitespace
+
+'lhu'         Keyword
+'\n'          Text.Whitespace
+
+'lh'          Keyword
+'\n'          Text.Whitespace
+
+'lwr'         Keyword
+'\n'          Text.Whitespace
+
+'lw'          Keyword
+'\n'          Text.Whitespace
+
+'swl'         Keyword
+'\n'          Text.Whitespace
+
+'swr'         Keyword
+'\n'          Text.Whitespace
+
+'sw'          Keyword
+'\n'          Text.Whitespace
+
+'teqi'        Keyword
+'\n'          Text.Whitespace
+
+'teq'         Keyword
+'\n'          Text.Whitespace
+
+'tneqi'       Keyword
+'\n'          Text.Whitespace
+
+'tne'         Keyword
+'\n'          Text.Whitespace
+
+'tgeiu'       Keyword
+'\n'          Text.Whitespace
+
+'tgeu'        Keyword
+'\n'          Text.Whitespace
+
+'tgei'        Keyword
+'\n'          Text.Whitespace
+
+'tge'         Keyword
+'\n'          Text.Whitespace
+
+'tltiu'       Keyword
+'\n'          Text.Whitespace
+
+'tltu'        Keyword
+'\n'          Text.Whitespace
+
+'tlti'        Keyword
+'\n'          Text.Whitespace
+
+'tlt'         Keyword
+'\n'          Text.Whitespace
diff --git a/tests/snippets/mips/variable_substrings.txt b/tests/snippets/mips/variable_substrings.txt
new file mode 100644
index 0000000000..85e845d3eb
--- /dev/null
+++ b/tests/snippets/mips/variable_substrings.txt
@@ -0,0 +1,102 @@
+---input---
+remu
+rem
+mulou
+mulo
+negu
+neg
+beqz
+bgeu
+bge
+bgtu
+bgt
+bleu
+ble
+bltu
+blt
+bnez
+b
+ulhu
+ulh
+sgtu
+sgt
+sgeu
+sge
+sleu
+sle
+
+---tokens---
+'remu'        Name.Variable
+'\n'          Text.Whitespace
+
+'rem'         Name.Variable
+'\n'          Text.Whitespace
+
+'mulou'       Name.Variable
+'\n'          Text.Whitespace
+
+'mulo'        Name.Variable
+'\n'          Text.Whitespace
+
+'negu'        Name.Variable
+'\n'          Text.Whitespace
+
+'neg'         Name.Variable
+'\n'          Text.Whitespace
+
+'beqz'        Name.Variable
+'\n'          Text.Whitespace
+
+'bgeu'        Name.Variable
+'\n'          Text.Whitespace
+
+'bge'         Name.Variable
+'\n'          Text.Whitespace
+
+'bgtu'        Name.Variable
+'\n'          Text.Whitespace
+
+'bgt'         Name.Variable
+'\n'          Text.Whitespace
+
+'bleu'        Name.Variable
+'\n'          Text.Whitespace
+
+'ble'         Name.Variable
+'\n'          Text.Whitespace
+
+'bltu'        Name.Variable
+'\n'          Text.Whitespace
+
+'blt'         Name.Variable
+'\n'          Text.Whitespace
+
+'bnez'        Name.Variable
+'\n'          Text.Whitespace
+
+'b'           Name.Variable
+'\n'          Text.Whitespace
+
+'ulhu'        Name.Variable
+'\n'          Text.Whitespace
+
+'ulh'         Name.Variable
+'\n'          Text.Whitespace
+
+'sgtu'        Name.Variable
+'\n'          Text.Whitespace
+
+'sgt'         Name.Variable
+'\n'          Text.Whitespace
+
+'sgeu'        Name.Variable
+'\n'          Text.Whitespace
+
+'sge'         Name.Variable
+'\n'          Text.Whitespace
+
+'sleu'        Name.Variable
+'\n'          Text.Whitespace
+
+'sle'         Name.Variable
+'\n'          Text.Whitespace
diff --git a/tests/snippets/peg/test_basic.txt b/tests/snippets/peg/test_basic.txt
index 78d240e4cc..13a9bb4e07 100644
--- a/tests/snippets/peg/test_basic.txt
+++ b/tests/snippets/peg/test_basic.txt
@@ -14,4 +14,4 @@ rule<-("terminal"/nonterminal/[cls])*
 ']'           Punctuation
 ')'           Punctuation
 '*'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/peg/test_modified_strings.txt b/tests/snippets/peg/test_modified_strings.txt
index 21a5987726..f411226547 100644
--- a/tests/snippets/peg/test_modified_strings.txt
+++ b/tests/snippets/peg/test_modified_strings.txt
@@ -18,4 +18,4 @@
 '('           Punctuation
 '"not modified"' Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/peg/test_operators.txt b/tests/snippets/peg/test_operators.txt
index b901c818ef..35aee321e1 100644
--- a/tests/snippets/peg/test_operators.txt
+++ b/tests/snippets/peg/test_operators.txt
@@ -16,7 +16,7 @@ rule: 'a' ~ 'b'
 '|'           Operator
 ' '           Text
 "'b'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'rule'        Name.Class
 ':'           Operator
@@ -26,4 +26,4 @@ rule: 'a' ~ 'b'
 '~'           Operator
 ' '           Text
 "'b'"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_broken_unquoted_string.txt b/tests/snippets/praat/test_broken_unquoted_string.txt
index 573b8079b8..e108bb8eab 100644
--- a/tests/snippets/praat/test_broken_unquoted_string.txt
+++ b/tests/snippets/praat/test_broken_unquoted_string.txt
@@ -4,13 +4,13 @@ printline string
 
 ---tokens---
 'printline'   Keyword
-' '           Text
+' '           Text.Whitespace
 'string'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
 
 '...'         Punctuation
-' '           Text
+' '           Text.Whitespace
 "'interpolated'" Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'string'      Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_function_call.txt b/tests/snippets/praat/test_function_call.txt
index ebb24a63b8..608ef16045 100644
--- a/tests/snippets/praat/test_function_call.txt
+++ b/tests/snippets/praat/test_function_call.txt
@@ -8,13 +8,13 @@ selected("Sound", i+(a*b))
 'Sound'       Literal.String
 '"'           Literal.String
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'i'           Text
 '+'           Operator
 '('           Text
 'a'           Text
 '*'           Operator
 'b'           Text
-')'           Text
 ')'           Punctuation
-'\n'          Text
+')'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_inline_if.txt b/tests/snippets/praat/test_inline_if.txt
index 02b10a5b64..e37026303e 100644
--- a/tests/snippets/praat/test_inline_if.txt
+++ b/tests/snippets/praat/test_inline_if.txt
@@ -3,25 +3,25 @@ var = if true == 1 then -1 else 0 fi
 
 ---tokens---
 'var'         Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'if'          Keyword
-' '           Text
+' '           Text.Whitespace
 'true'        Text
-' '           Text
+' '           Text.Whitespace
 '=='          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'then'        Keyword
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'else'        Keyword
-' '           Text
+' '           Text.Whitespace
 '0'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 'fi'          Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_interpolated_indexed_numeric_with_precision.txt b/tests/snippets/praat/test_interpolated_indexed_numeric_with_precision.txt
index 82849ee8b4..0dc23e645a 100644
--- a/tests/snippets/praat/test_interpolated_indexed_numeric_with_precision.txt
+++ b/tests/snippets/praat/test_interpolated_indexed_numeric_with_precision.txt
@@ -3,4 +3,4 @@
 
 ---tokens---
 "'a[3]:3'"    Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_interpolated_local_numeric_with_precision.txt b/tests/snippets/praat/test_interpolated_local_numeric_with_precision.txt
index 651509bfd5..515fa9eb0b 100644
--- a/tests/snippets/praat/test_interpolated_local_numeric_with_precision.txt
+++ b/tests/snippets/praat/test_interpolated_local_numeric_with_precision.txt
@@ -3,4 +3,4 @@
 
 ---tokens---
 "'a.a:3'"     Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_interpolated_numeric_hash.txt b/tests/snippets/praat/test_interpolated_numeric_hash.txt
index 419faa1a71..3d6d0f88a2 100644
--- a/tests/snippets/praat/test_interpolated_numeric_hash.txt
+++ b/tests/snippets/praat/test_interpolated_numeric_hash.txt
@@ -3,4 +3,4 @@
 
 ---tokens---
 '\'a["b"]\''  Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_interpolated_numeric_indexed.txt b/tests/snippets/praat/test_interpolated_numeric_indexed.txt
index 3cd1b422b3..ea436f146d 100644
--- a/tests/snippets/praat/test_interpolated_numeric_indexed.txt
+++ b/tests/snippets/praat/test_interpolated_numeric_indexed.txt
@@ -3,4 +3,4 @@
 
 ---tokens---
 "'a[3]'"      Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_interpolated_numeric_with_precision.txt b/tests/snippets/praat/test_interpolated_numeric_with_precision.txt
index 800ac35d86..8ab410dca1 100644
--- a/tests/snippets/praat/test_interpolated_numeric_with_precision.txt
+++ b/tests/snippets/praat/test_interpolated_numeric_with_precision.txt
@@ -3,4 +3,4 @@
 
 ---tokens---
 "'a:3'"       Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_interpolated_string_hash.txt b/tests/snippets/praat/test_interpolated_string_hash.txt
index 608873d2e7..49f5147cf9 100644
--- a/tests/snippets/praat/test_interpolated_string_hash.txt
+++ b/tests/snippets/praat/test_interpolated_string_hash.txt
@@ -3,4 +3,4 @@
 
 ---tokens---
 '\'a$["b"]\'' Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_interpolated_string_indexed.txt b/tests/snippets/praat/test_interpolated_string_indexed.txt
index a50b5d1602..7a845d74f7 100644
--- a/tests/snippets/praat/test_interpolated_string_indexed.txt
+++ b/tests/snippets/praat/test_interpolated_string_indexed.txt
@@ -3,4 +3,4 @@
 
 ---tokens---
 "'a$[3]'"     Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_interpolation_boundary.txt b/tests/snippets/praat/test_interpolation_boundary.txt
index d125e829c3..1f3b14bc7f 100644
--- a/tests/snippets/praat/test_interpolation_boundary.txt
+++ b/tests/snippets/praat/test_interpolation_boundary.txt
@@ -5,10 +5,10 @@
 '"'           Literal.String
 "'"           Literal.String
 '"'           Literal.String
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 "'"           Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_numeric_assignment.txt b/tests/snippets/praat/test_numeric_assignment.txt
index ed9545684e..55fc1e6b53 100644
--- a/tests/snippets/praat/test_numeric_assignment.txt
+++ b/tests/snippets/praat/test_numeric_assignment.txt
@@ -3,9 +3,9 @@ var = -15e4
 
 ---tokens---
 'var'         Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '15e4'        Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_string_assignment.txt b/tests/snippets/praat/test_string_assignment.txt
index 0e1a86ef12..baff23db71 100644
--- a/tests/snippets/praat/test_string_assignment.txt
+++ b/tests/snippets/praat/test_string_assignment.txt
@@ -3,10 +3,10 @@ var$ = "foo"
 
 ---tokens---
 'var$'        Text
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'foo'         Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/praat/test_string_escaped_quotes.txt b/tests/snippets/praat/test_string_escaped_quotes.txt
index 6867a312d4..1cf6330fad 100644
--- a/tests/snippets/praat/test_string_escaped_quotes.txt
+++ b/tests/snippets/praat/test_string_escaped_quotes.txt
@@ -10,4 +10,4 @@
 '"'           Literal.String
 '"'           Literal.String
 '"'           Literal.String
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/properties/test_comments.txt b/tests/snippets/properties/test_comments.txt
index b6bc8fb9e6..9bc6586078 100644
--- a/tests/snippets/properties/test_comments.txt
+++ b/tests/snippets/properties/test_comments.txt
@@ -5,8 +5,8 @@
 # also a comment
 
 ---tokens---
-'! a comment' Comment
+'! a comment' Comment.Single
 '\n'          Text.Whitespace
 
-'# also a comment' Comment
+'# also a comment' Comment.Single
 '\n'          Text.Whitespace
diff --git a/tests/snippets/properties/test_leading_whitespace_comments.txt b/tests/snippets/properties/test_leading_whitespace_comments.txt
index be77792b33..3a36afc9df 100644
--- a/tests/snippets/properties/test_leading_whitespace_comments.txt
+++ b/tests/snippets/properties/test_leading_whitespace_comments.txt
@@ -2,5 +2,5 @@
 # comment
 
 ---tokens---
-'# comment'   Comment
+'# comment'   Comment.Single
 '\n'          Text.Whitespace
diff --git a/tests/snippets/properties/test_space_delimited_kv_pair.txt b/tests/snippets/properties/test_space_delimited_kv_pair.txt
index fe12d48efa..98961e4256 100644
--- a/tests/snippets/properties/test_space_delimited_kv_pair.txt
+++ b/tests/snippets/properties/test_space_delimited_kv_pair.txt
@@ -4,4 +4,5 @@ key value
 ---tokens---
 'key'         Name.Attribute
 ' '           Text.Whitespace
-'value\n'     Literal.String
+'value'       Literal.String
+'\n'          Text.Whitespace
diff --git a/tests/snippets/pwsh-session/test_continuation.txt b/tests/snippets/pwsh-session/test_continuation.txt
new file mode 100644
index 0000000000..4735d369a2
--- /dev/null
+++ b/tests/snippets/pwsh-session/test_continuation.txt
@@ -0,0 +1,124 @@
+---input---
+PS> python -m doctest `
+> -o DONT_ACCEPT_TRUE_FOR_1 `
+> -o ELLIPSIS options.txt
+
+PS>  $Params = @{
+>     Height = 50
+>     Width  = 50
+>     Depth  = 50
+>     Name   = 'My Widget'
+>     ID     = '10dbe43f-0269-48b8-96cb-447a755add55'
+> }
+
+
+PS>  ls |
+> grep "python"
+
+---tokens---
+'PS> '        Generic.Prompt
+'python'      Name
+' '           Text
+'-m'          Name
+' '           Text
+'doctest'     Name
+' '           Text
+'`'           Punctuation
+'\n'          Text
+
+'> '          Generic.Prompt
+'-o'          Name
+' '           Text
+'DONT_ACCEPT_TRUE_FOR_1' Name
+' '           Text
+'`'           Punctuation
+'\n'          Text
+
+'> '          Generic.Prompt
+'-o'          Name
+' '           Text
+'ELLIPSIS'    Name
+' '           Text
+'options'     Name
+'.'           Punctuation
+'txt'         Name
+'\n'          Text
+
+'\n'          Generic.Output
+
+'PS> '        Generic.Prompt
+' '           Text
+'$Params'     Name.Variable
+' '           Text
+'='           Punctuation
+' '           Text
+'@'           Punctuation
+'{'           Punctuation
+'\n'          Text
+
+'> '          Generic.Prompt
+'    '        Text
+'Height'      Name
+' '           Text
+'='           Punctuation
+' '           Text
+'50'          Name
+'\n'          Text
+
+'> '          Generic.Prompt
+'    '        Text
+'Width'       Name
+'  '          Text
+'='           Punctuation
+' '           Text
+'50'          Name
+'\n'          Text
+
+'> '          Generic.Prompt
+'    '        Text
+'Depth'       Name
+'  '          Text
+'='           Punctuation
+' '           Text
+'50'          Name
+'\n'          Text
+
+'> '          Generic.Prompt
+'    '        Text
+'Name'        Name
+'   '         Text
+'='           Punctuation
+' '           Text
+"'My Widget'" Literal.String.Single
+'\n'          Text
+
+'> '          Generic.Prompt
+'    '        Text
+'ID'          Name
+'     '       Text
+'='           Punctuation
+' '           Text
+"'10dbe43f-0269-48b8-96cb-447a755add55'" Literal.String.Single
+'\n'          Text
+
+'> '          Generic.Prompt
+'}'           Punctuation
+'\n'          Text
+
+'\n'          Generic.Output
+
+'\n'          Generic.Output
+
+'PS> '        Generic.Prompt
+' '           Text
+'ls '         Name.Builtin
+'|'           Punctuation
+'\n'          Text
+
+'> '          Generic.Prompt
+'grep'        Name
+' '           Text
+'"'           Literal.String.Double
+'python'      Literal.String.Double
+'"'           Literal.String.Double
+'\n'          Text
diff --git a/tests/snippets/python/test_bytes_escape_codes.txt b/tests/snippets/python/test_bytes_escape_codes.txt
index 19948d7eaf..c1a344373d 100644
--- a/tests/snippets/python/test_bytes_escape_codes.txt
+++ b/tests/snippets/python/test_bytes_escape_codes.txt
@@ -21,4 +21,4 @@ b'\\ \n \x12 \777 \u1234 \U00010348 \N{Plus-Minus Sign}'
 '{'           Literal.String.Single
 'Plus-Minus Sign}' Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_floats.txt b/tests/snippets/python/test_floats.txt
index 20bb1d79ed..3ae9dc96e4 100644
--- a/tests/snippets/python/test_floats.txt
+++ b/tests/snippets/python/test_floats.txt
@@ -72,4 +72,4 @@
 ' '           Text
 '5.67'        Literal.Number.Float
 '_'           Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_01a.txt b/tests/snippets/python/test_fstring_01a.txt
index 406e2cc8e3..a3b29a35d7 100644
--- a/tests/snippets/python/test_fstring_01a.txt
+++ b/tests/snippets/python/test_fstring_01a.txt
@@ -22,4 +22,4 @@ f'My name is {name}, my age next year is {age+1}, my anniversary is {anniversary
 '}'           Literal.String.Interpol
 '.'           Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_01b.txt b/tests/snippets/python/test_fstring_01b.txt
index 278258e23b..0d2c34376f 100644
--- a/tests/snippets/python/test_fstring_01b.txt
+++ b/tests/snippets/python/test_fstring_01b.txt
@@ -22,4 +22,4 @@ f"My name is {name}, my age next year is {age+1}, my anniversary is {anniversary
 '}'           Literal.String.Interpol
 '.'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_02a.txt b/tests/snippets/python/test_fstring_02a.txt
index 359c13bef3..cfd41a9765 100644
--- a/tests/snippets/python/test_fstring_02a.txt
+++ b/tests/snippets/python/test_fstring_02a.txt
@@ -10,4 +10,4 @@ f'He said his name is {name!r}.'
 '!r}'         Literal.String.Interpol
 '.'           Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_02b.txt b/tests/snippets/python/test_fstring_02b.txt
index abef1600f8..c72a77b83a 100644
--- a/tests/snippets/python/test_fstring_02b.txt
+++ b/tests/snippets/python/test_fstring_02b.txt
@@ -10,4 +10,4 @@ f"He said his name is {name!r}."
 '!r}'         Literal.String.Interpol
 '.'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_03a.txt b/tests/snippets/python/test_fstring_03a.txt
index 3edee4cf16..366e495167 100644
--- a/tests/snippets/python/test_fstring_03a.txt
+++ b/tests/snippets/python/test_fstring_03a.txt
@@ -11,4 +11,4 @@ f'input={value:#06x}'
 '#06x'        Literal.String.Single
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_03b.txt b/tests/snippets/python/test_fstring_03b.txt
index f7723898b2..260e56d1ba 100644
--- a/tests/snippets/python/test_fstring_03b.txt
+++ b/tests/snippets/python/test_fstring_03b.txt
@@ -11,4 +11,4 @@ f"input={value:#06x}"
 '#06x'        Literal.String.Double
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_04a.txt b/tests/snippets/python/test_fstring_04a.txt
index 85619ab806..58516c9170 100644
--- a/tests/snippets/python/test_fstring_04a.txt
+++ b/tests/snippets/python/test_fstring_04a.txt
@@ -10,4 +10,4 @@ f'{"quoted string"}'
 '"'           Literal.String.Double
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_04b.txt b/tests/snippets/python/test_fstring_04b.txt
index bd6308c2a7..40e1ea0810 100644
--- a/tests/snippets/python/test_fstring_04b.txt
+++ b/tests/snippets/python/test_fstring_04b.txt
@@ -10,4 +10,4 @@ f"{'quoted string'}"
 "'"           Literal.String.Single
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_05a.txt b/tests/snippets/python/test_fstring_05a.txt
index 18074571de..77a5c10af5 100644
--- a/tests/snippets/python/test_fstring_05a.txt
+++ b/tests/snippets/python/test_fstring_05a.txt
@@ -13,4 +13,4 @@ f'{f"{inner}"}'
 '"'           Literal.String.Double
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_05b.txt b/tests/snippets/python/test_fstring_05b.txt
index b0f3ebd8c7..9a0dc5af89 100644
--- a/tests/snippets/python/test_fstring_05b.txt
+++ b/tests/snippets/python/test_fstring_05b.txt
@@ -13,4 +13,4 @@ f"{f'{inner}'}"
 "'"           Literal.String.Single
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_06a.txt b/tests/snippets/python/test_fstring_06a.txt
index 0ba0809a83..b8b33c0a60 100644
--- a/tests/snippets/python/test_fstring_06a.txt
+++ b/tests/snippets/python/test_fstring_06a.txt
@@ -13,4 +13,4 @@ f'{\'quoted string\'}'
 "\\'"         Literal.String.Escape
 '}'           Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_06b.txt b/tests/snippets/python/test_fstring_06b.txt
index f98b3dc20e..0712321b6c 100644
--- a/tests/snippets/python/test_fstring_06b.txt
+++ b/tests/snippets/python/test_fstring_06b.txt
@@ -13,4 +13,4 @@ f"{\"quoted string\"}"
 '\\"'         Literal.String.Escape
 '}'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_07a.txt b/tests/snippets/python/test_fstring_07a.txt
index 6394220090..c597ea97b7 100644
--- a/tests/snippets/python/test_fstring_07a.txt
+++ b/tests/snippets/python/test_fstring_07a.txt
@@ -14,4 +14,4 @@ f'{{ {4*10} }}'
 ' '           Literal.String.Single
 '}}'          Literal.String.Escape
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_07b.txt b/tests/snippets/python/test_fstring_07b.txt
index c7e87bc763..413c1585f2 100644
--- a/tests/snippets/python/test_fstring_07b.txt
+++ b/tests/snippets/python/test_fstring_07b.txt
@@ -14,4 +14,4 @@ f"{{ {4*10} }}"
 ' '           Literal.String.Double
 '}}'          Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_08a.txt b/tests/snippets/python/test_fstring_08a.txt
index 61b6cc8f37..39dd887b2f 100644
--- a/tests/snippets/python/test_fstring_08a.txt
+++ b/tests/snippets/python/test_fstring_08a.txt
@@ -12,4 +12,4 @@ f'{{{4*10}}}'
 '}'           Literal.String.Interpol
 '}}'          Literal.String.Escape
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_08b.txt b/tests/snippets/python/test_fstring_08b.txt
index 41eb13a415..458c697838 100644
--- a/tests/snippets/python/test_fstring_08b.txt
+++ b/tests/snippets/python/test_fstring_08b.txt
@@ -12,4 +12,4 @@ f"{{{4*10}}}"
 '}'           Literal.String.Interpol
 '}}'          Literal.String.Escape
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_09a.txt b/tests/snippets/python/test_fstring_09a.txt
index 3dcec51ed6..00f3e7f16b 100644
--- a/tests/snippets/python/test_fstring_09a.txt
+++ b/tests/snippets/python/test_fstring_09a.txt
@@ -11,4 +11,4 @@ fr'x={4*10}'
 '10'          Literal.Number.Integer
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_09b.txt b/tests/snippets/python/test_fstring_09b.txt
index 72932b29fa..01d74e9554 100644
--- a/tests/snippets/python/test_fstring_09b.txt
+++ b/tests/snippets/python/test_fstring_09b.txt
@@ -11,4 +11,4 @@ fr"x={4*10}"
 '10'          Literal.Number.Integer
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_10a.txt b/tests/snippets/python/test_fstring_10a.txt
index 02fba2b4bd..a2e11ba252 100644
--- a/tests/snippets/python/test_fstring_10a.txt
+++ b/tests/snippets/python/test_fstring_10a.txt
@@ -15,4 +15,4 @@ f'abc {a["x"]} def'
 '}'           Literal.String.Interpol
 ' def'        Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_10b.txt b/tests/snippets/python/test_fstring_10b.txt
index 46150935ef..21d116c762 100644
--- a/tests/snippets/python/test_fstring_10b.txt
+++ b/tests/snippets/python/test_fstring_10b.txt
@@ -15,4 +15,4 @@ f"abc {a['x']} def"
 '}'           Literal.String.Interpol
 ' def'        Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_11a.txt b/tests/snippets/python/test_fstring_11a.txt
index 6116c96086..ce20e7b89d 100644
--- a/tests/snippets/python/test_fstring_11a.txt
+++ b/tests/snippets/python/test_fstring_11a.txt
@@ -15,4 +15,4 @@ f'''abc {a['x']} def'''
 '}'           Literal.String.Interpol
 ' def'        Literal.String.Single
 "'''"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_11b.txt b/tests/snippets/python/test_fstring_11b.txt
index 77c3d6f8c8..baf13701df 100644
--- a/tests/snippets/python/test_fstring_11b.txt
+++ b/tests/snippets/python/test_fstring_11b.txt
@@ -15,4 +15,4 @@ f"""abc {a["x"]} def"""
 '}'           Literal.String.Interpol
 ' def'        Literal.String.Double
 '"""'         Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_12a.txt b/tests/snippets/python/test_fstring_12a.txt
index cc8eeab4a9..99888040aa 100644
--- a/tests/snippets/python/test_fstring_12a.txt
+++ b/tests/snippets/python/test_fstring_12a.txt
@@ -7,10 +7,10 @@ f'''{x
 "'''"         Literal.String.Single
 '{'           Literal.String.Interpol
 'x'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+'           Operator
 '1'           Literal.Number.Integer
 '}'           Literal.String.Interpol
 "'''"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_12b.txt b/tests/snippets/python/test_fstring_12b.txt
index 160b2d9152..878b7a0bf7 100644
--- a/tests/snippets/python/test_fstring_12b.txt
+++ b/tests/snippets/python/test_fstring_12b.txt
@@ -7,10 +7,10 @@ f"""{x
 '"""'         Literal.String.Double
 '{'           Literal.String.Interpol
 'x'           Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+'           Operator
 '1'           Literal.Number.Integer
 '}'           Literal.String.Interpol
 '"""'         Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_13a.txt b/tests/snippets/python/test_fstring_13a.txt
index b556a5b6bc..e6e97e861a 100644
--- a/tests/snippets/python/test_fstring_13a.txt
+++ b/tests/snippets/python/test_fstring_13a.txt
@@ -9,9 +9,9 @@ f'''{d[0
 'd'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 ']'           Punctuation
 '}'           Literal.String.Interpol
 "'''"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_13b.txt b/tests/snippets/python/test_fstring_13b.txt
index 1e9fd60d11..0a3aa56d9f 100644
--- a/tests/snippets/python/test_fstring_13b.txt
+++ b/tests/snippets/python/test_fstring_13b.txt
@@ -9,9 +9,9 @@ f"""{d[0
 'd'           Name
 '['           Punctuation
 '0'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 ']'           Punctuation
 '}'           Literal.String.Interpol
 '"""'         Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_14a.txt b/tests/snippets/python/test_fstring_14a.txt
index de202a2131..a826835b6b 100644
--- a/tests/snippets/python/test_fstring_14a.txt
+++ b/tests/snippets/python/test_fstring_14a.txt
@@ -17,4 +17,4 @@ f'result: {value:{width}.{precision}}'
 '}'           Literal.String.Interpol
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_14b.txt b/tests/snippets/python/test_fstring_14b.txt
index 83aaad5eed..310088336c 100644
--- a/tests/snippets/python/test_fstring_14b.txt
+++ b/tests/snippets/python/test_fstring_14b.txt
@@ -17,4 +17,4 @@ f"result: {value:{width}.{precision}}"
 '}'           Literal.String.Interpol
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_15a.txt b/tests/snippets/python/test_fstring_15a.txt
index 635e8791c5..f8f62b82ae 100644
--- a/tests/snippets/python/test_fstring_15a.txt
+++ b/tests/snippets/python/test_fstring_15a.txt
@@ -39,4 +39,4 @@
 "'"           Literal.String.Single
 'e'           Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_15b.txt b/tests/snippets/python/test_fstring_15b.txt
index 1a1ab251cc..7b5307c150 100644
--- a/tests/snippets/python/test_fstring_15b.txt
+++ b/tests/snippets/python/test_fstring_15b.txt
@@ -39,4 +39,4 @@
 '"'           Literal.String.Double
 'e'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_16a.txt b/tests/snippets/python/test_fstring_16a.txt
index cbd4d14b85..15b11e8384 100644
--- a/tests/snippets/python/test_fstring_16a.txt
+++ b/tests/snippets/python/test_fstring_16a.txt
@@ -15,4 +15,4 @@ f'{i}:{d[i]}'
 ']'           Punctuation
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_16b.txt b/tests/snippets/python/test_fstring_16b.txt
index 8ce173f0dd..e917516fe2 100644
--- a/tests/snippets/python/test_fstring_16b.txt
+++ b/tests/snippets/python/test_fstring_16b.txt
@@ -15,4 +15,4 @@ f"{i}:{d[i]}"
 ']'           Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_17a.txt b/tests/snippets/python/test_fstring_17a.txt
index a1b5b3a5b6..9eefd91860 100644
--- a/tests/snippets/python/test_fstring_17a.txt
+++ b/tests/snippets/python/test_fstring_17a.txt
@@ -11,4 +11,4 @@ f'x = {x:+3}'
 '+3'          Literal.String.Single
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_17b.txt b/tests/snippets/python/test_fstring_17b.txt
index 5f34b17400..2d264814c8 100644
--- a/tests/snippets/python/test_fstring_17b.txt
+++ b/tests/snippets/python/test_fstring_17b.txt
@@ -11,4 +11,4 @@ f"x = {x:+3}"
 '+3'          Literal.String.Double
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_18a.txt b/tests/snippets/python/test_fstring_18a.txt
index 60d0512347..5455db732b 100644
--- a/tests/snippets/python/test_fstring_18a.txt
+++ b/tests/snippets/python/test_fstring_18a.txt
@@ -22,4 +22,4 @@ f'{fn(lst,2)} {fn(lst,3)}'
 ')'           Punctuation
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_18b.txt b/tests/snippets/python/test_fstring_18b.txt
index a189d00a86..356cc3c781 100644
--- a/tests/snippets/python/test_fstring_18b.txt
+++ b/tests/snippets/python/test_fstring_18b.txt
@@ -22,4 +22,4 @@ f"{fn(lst,2)} {fn(lst,3)}"
 ')'           Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_19a.txt b/tests/snippets/python/test_fstring_19a.txt
index 6e412a38bc..7e7cde0da5 100644
--- a/tests/snippets/python/test_fstring_19a.txt
+++ b/tests/snippets/python/test_fstring_19a.txt
@@ -6,41 +6,41 @@ f'mapping is { {a:b for (a, b) in ((1, 2), (3, 4))} }'
 "'"           Literal.String.Single
 'mapping is ' Literal.String.Single
 '{'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 'a'           Name
 ':'           Punctuation
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '('           Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '3'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ')'           Punctuation
 ')'           Punctuation
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_19b.txt b/tests/snippets/python/test_fstring_19b.txt
index 5c9d6f73bb..3ae438a0ae 100644
--- a/tests/snippets/python/test_fstring_19b.txt
+++ b/tests/snippets/python/test_fstring_19b.txt
@@ -6,41 +6,41 @@ f"mapping is { {a:b for (a, b) in ((1, 2), (3, 4))} }"
 '"'           Literal.String.Double
 'mapping is ' Literal.String.Double
 '{'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 'a'           Name
 ':'           Punctuation
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 'for'         Keyword
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 'a'           Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'in'          Operator.Word
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '('           Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number.Integer
 ')'           Punctuation
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '3'           Literal.Number.Integer
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '4'           Literal.Number.Integer
 ')'           Punctuation
 ')'           Punctuation
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_20a.txt b/tests/snippets/python/test_fstring_20a.txt
index a72a7a444d..206e436ffd 100644
--- a/tests/snippets/python/test_fstring_20a.txt
+++ b/tests/snippets/python/test_fstring_20a.txt
@@ -14,4 +14,4 @@ f'a={d["a"]}'
 ']'           Punctuation
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_20b.txt b/tests/snippets/python/test_fstring_20b.txt
index 556f7de8cf..fb3acc4fff 100644
--- a/tests/snippets/python/test_fstring_20b.txt
+++ b/tests/snippets/python/test_fstring_20b.txt
@@ -14,4 +14,4 @@ f"a={d['a']}"
 ']'           Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_21a.txt b/tests/snippets/python/test_fstring_21a.txt
index 1a59100374..0107431d71 100644
--- a/tests/snippets/python/test_fstring_21a.txt
+++ b/tests/snippets/python/test_fstring_21a.txt
@@ -12,4 +12,4 @@ f'a={d[a]}'
 ']'           Punctuation
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_21b.txt b/tests/snippets/python/test_fstring_21b.txt
index 7e3ed08a03..f659d54239 100644
--- a/tests/snippets/python/test_fstring_21b.txt
+++ b/tests/snippets/python/test_fstring_21b.txt
@@ -12,4 +12,4 @@ f"a={d[a]}"
 ']'           Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_22a.txt b/tests/snippets/python/test_fstring_22a.txt
index 6a3b792f1a..a1066e92c9 100644
--- a/tests/snippets/python/test_fstring_22a.txt
+++ b/tests/snippets/python/test_fstring_22a.txt
@@ -11,4 +11,4 @@ fr'{header}:\s+'
 '\\'          Literal.String.Single
 's+'          Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_22b.txt b/tests/snippets/python/test_fstring_22b.txt
index 75a08aac2e..79cb6b420c 100644
--- a/tests/snippets/python/test_fstring_22b.txt
+++ b/tests/snippets/python/test_fstring_22b.txt
@@ -11,4 +11,4 @@ fr"{header}:\s+"
 '\\'          Literal.String.Double
 's+'          Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_23a.txt b/tests/snippets/python/test_fstring_23a.txt
index ae944ed242..ef5cbd430d 100644
--- a/tests/snippets/python/test_fstring_23a.txt
+++ b/tests/snippets/python/test_fstring_23a.txt
@@ -8,4 +8,4 @@ f'{a!r}'
 'a'           Name
 '!r}'         Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_23b.txt b/tests/snippets/python/test_fstring_23b.txt
index 8038c8b473..572fe04d8f 100644
--- a/tests/snippets/python/test_fstring_23b.txt
+++ b/tests/snippets/python/test_fstring_23b.txt
@@ -8,4 +8,4 @@ f"{a!r}"
 'a'           Name
 '!r}'         Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_24a.txt b/tests/snippets/python/test_fstring_24a.txt
index 9dd1e94ea0..d45385b84c 100644
--- a/tests/snippets/python/test_fstring_24a.txt
+++ b/tests/snippets/python/test_fstring_24a.txt
@@ -7,10 +7,10 @@ f'{(lambda x: x*2)(3)}'
 '{'           Literal.String.Interpol
 '('           Punctuation
 'lambda'      Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 '*'           Operator
 '2'           Literal.Number.Integer
@@ -20,4 +20,4 @@ f'{(lambda x: x*2)(3)}'
 ')'           Punctuation
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_24b.txt b/tests/snippets/python/test_fstring_24b.txt
index 0ef51a52d1..5e83b19e18 100644
--- a/tests/snippets/python/test_fstring_24b.txt
+++ b/tests/snippets/python/test_fstring_24b.txt
@@ -7,10 +7,10 @@ f"{(lambda x: x*2)(3)}"
 '{'           Literal.String.Interpol
 '('           Punctuation
 'lambda'      Keyword
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 '*'           Operator
 '2'           Literal.Number.Integer
@@ -20,4 +20,4 @@ f"{(lambda x: x*2)(3)}"
 ')'           Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_25a.txt b/tests/snippets/python/test_fstring_25a.txt
index e42453e556..470db36d75 100644
--- a/tests/snippets/python/test_fstring_25a.txt
+++ b/tests/snippets/python/test_fstring_25a.txt
@@ -21,4 +21,4 @@ extra = f'{extra},waiters:{len(self._waiters)}'
 ')'           Punctuation
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_25b.txt b/tests/snippets/python/test_fstring_25b.txt
index 2ba4b721ad..94893e51dd 100644
--- a/tests/snippets/python/test_fstring_25b.txt
+++ b/tests/snippets/python/test_fstring_25b.txt
@@ -21,4 +21,4 @@ extra = f"{extra},waiters:{len(self._waiters)}"
 ')'           Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_26a.txt b/tests/snippets/python/test_fstring_26a.txt
index c644d44799..01a231d3dd 100644
--- a/tests/snippets/python/test_fstring_26a.txt
+++ b/tests/snippets/python/test_fstring_26a.txt
@@ -17,4 +17,4 @@ message.append(f" [line {lineno:2d}]")
 ']'           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_26b.txt b/tests/snippets/python/test_fstring_26b.txt
index 7396410485..a8131499da 100644
--- a/tests/snippets/python/test_fstring_26b.txt
+++ b/tests/snippets/python/test_fstring_26b.txt
@@ -17,4 +17,4 @@ message.append(f' [line {lineno:2d}]')
 ']'           Literal.String.Single
 "'"           Literal.String.Single
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_27a.txt b/tests/snippets/python/test_fstring_27a.txt
index cd8bdbe286..75af0c100c 100644
--- a/tests/snippets/python/test_fstring_27a.txt
+++ b/tests/snippets/python/test_fstring_27a.txt
@@ -8,4 +8,4 @@ f"{foo=}"
 'foo'         Name
 '=}'          Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_27b.txt b/tests/snippets/python/test_fstring_27b.txt
index 7773ab302d..71e6e51042 100644
--- a/tests/snippets/python/test_fstring_27b.txt
+++ b/tests/snippets/python/test_fstring_27b.txt
@@ -8,4 +8,4 @@ f'{foo=}'
 'foo'         Name
 '=}'          Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_28a.txt b/tests/snippets/python/test_fstring_28a.txt
index 6aca321697..cdc65db229 100644
--- a/tests/snippets/python/test_fstring_28a.txt
+++ b/tests/snippets/python/test_fstring_28a.txt
@@ -8,4 +8,4 @@ f'{foo=!s}'
 'foo'         Name
 '=!s}'        Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_28b.txt b/tests/snippets/python/test_fstring_28b.txt
index 14183eba00..99cf4f302c 100644
--- a/tests/snippets/python/test_fstring_28b.txt
+++ b/tests/snippets/python/test_fstring_28b.txt
@@ -8,4 +8,4 @@ f"{foo=!s}"
 'foo'         Name
 '=!s}'        Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_29a.txt b/tests/snippets/python/test_fstring_29a.txt
index 817150647a..2100b3b8d5 100644
--- a/tests/snippets/python/test_fstring_29a.txt
+++ b/tests/snippets/python/test_fstring_29a.txt
@@ -12,4 +12,4 @@ f"{math.pi=!f:.2f}"
 '.2f'         Literal.String.Double
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_29b.txt b/tests/snippets/python/test_fstring_29b.txt
index de5b5083f3..4cc18dd0d6 100644
--- a/tests/snippets/python/test_fstring_29b.txt
+++ b/tests/snippets/python/test_fstring_29b.txt
@@ -12,4 +12,4 @@ f'{math.pi=!f:.2f}'
 '.2f'         Literal.String.Single
 '}'           Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_30a.txt b/tests/snippets/python/test_fstring_30a.txt
index f295cfe43d..3db443e1af 100644
--- a/tests/snippets/python/test_fstring_30a.txt
+++ b/tests/snippets/python/test_fstring_30a.txt
@@ -5,12 +5,12 @@ f"{ chr(65) =}"
 'f'           Literal.String.Affix
 '"'           Literal.String.Double
 '{'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'chr'         Name.Builtin
 '('           Punctuation
 '65'          Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=}'          Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_30b.txt b/tests/snippets/python/test_fstring_30b.txt
index 10a2af8e13..5f082e532e 100644
--- a/tests/snippets/python/test_fstring_30b.txt
+++ b/tests/snippets/python/test_fstring_30b.txt
@@ -5,12 +5,12 @@ f'{ chr(65) =}'
 'f'           Literal.String.Affix
 "'"           Literal.String.Single
 '{'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 'chr'         Name.Builtin
 '('           Punctuation
 '65'          Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '=}'          Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_31a.txt b/tests/snippets/python/test_fstring_31a.txt
index eac01679c6..3e9c091a75 100644
--- a/tests/snippets/python/test_fstring_31a.txt
+++ b/tests/snippets/python/test_fstring_31a.txt
@@ -9,7 +9,7 @@ f"{chr(65) = }"
 '('           Punctuation
 '65'          Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '= }'         Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_31b.txt b/tests/snippets/python/test_fstring_31b.txt
index 40702daa02..37adb3efe7 100644
--- a/tests/snippets/python/test_fstring_31b.txt
+++ b/tests/snippets/python/test_fstring_31b.txt
@@ -9,7 +9,7 @@ f'{chr(65) = }'
 '('           Punctuation
 '65'          Literal.Number.Integer
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '= }'         Literal.String.Interpol
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_32a.txt b/tests/snippets/python/test_fstring_32a.txt
index 666134c65b..dcfc39d13a 100644
--- a/tests/snippets/python/test_fstring_32a.txt
+++ b/tests/snippets/python/test_fstring_32a.txt
@@ -12,4 +12,4 @@ f'*{n=:30}*'
 '}'           Literal.String.Interpol
 '*'           Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_32b.txt b/tests/snippets/python/test_fstring_32b.txt
index 9e08725291..1f8a45099e 100644
--- a/tests/snippets/python/test_fstring_32b.txt
+++ b/tests/snippets/python/test_fstring_32b.txt
@@ -12,4 +12,4 @@ f"*{n=:30}*"
 '}'           Literal.String.Interpol
 '*'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_33a.txt b/tests/snippets/python/test_fstring_33a.txt
index 232491b27d..5318b552d9 100644
--- a/tests/snippets/python/test_fstring_33a.txt
+++ b/tests/snippets/python/test_fstring_33a.txt
@@ -12,4 +12,4 @@ f'*{n=!r:30}*'
 '}'           Literal.String.Interpol
 '*'           Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_33b.txt b/tests/snippets/python/test_fstring_33b.txt
index 1481e811e4..a0211ddb81 100644
--- a/tests/snippets/python/test_fstring_33b.txt
+++ b/tests/snippets/python/test_fstring_33b.txt
@@ -12,4 +12,4 @@ f"*{n=!r:30}*"
 '}'           Literal.String.Interpol
 '*'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_34a.txt b/tests/snippets/python/test_fstring_34a.txt
index 6bd510a97a..9b80cc9c7e 100644
--- a/tests/snippets/python/test_fstring_34a.txt
+++ b/tests/snippets/python/test_fstring_34a.txt
@@ -17,4 +17,4 @@ f"*{f'{n=}':30}*"
 '}'           Literal.String.Interpol
 '*'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_34b.txt b/tests/snippets/python/test_fstring_34b.txt
index 4cb7e63144..5abf37f071 100644
--- a/tests/snippets/python/test_fstring_34b.txt
+++ b/tests/snippets/python/test_fstring_34b.txt
@@ -17,4 +17,4 @@ f'*{f"{n=}":30}*'
 '}'           Literal.String.Interpol
 '*'           Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_35a.txt b/tests/snippets/python/test_fstring_35a.txt
index f09edc18bd..b4e1041711 100644
--- a/tests/snippets/python/test_fstring_35a.txt
+++ b/tests/snippets/python/test_fstring_35a.txt
@@ -12,4 +12,4 @@ f'*{n=:+<30}*'
 '}'           Literal.String.Interpol
 '*'           Literal.String.Single
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_35b.txt b/tests/snippets/python/test_fstring_35b.txt
index 794f7b69ea..773e7a40fc 100644
--- a/tests/snippets/python/test_fstring_35b.txt
+++ b/tests/snippets/python/test_fstring_35b.txt
@@ -12,4 +12,4 @@ f"*{n=:+<30}*"
 '}'           Literal.String.Interpol
 '*'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_36a.txt b/tests/snippets/python/test_fstring_36a.txt
index 4b6ab23013..773e38e644 100644
--- a/tests/snippets/python/test_fstring_36a.txt
+++ b/tests/snippets/python/test_fstring_36a.txt
@@ -8,9 +8,9 @@ f'''{foo
 "'''"         Literal.String.Single
 '{'           Literal.String.Interpol
 'foo'         Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 '= !s:'       Literal.String.Interpol
 '20'          Literal.String.Single
 '}'           Literal.String.Interpol
 "'''"         Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_36b.txt b/tests/snippets/python/test_fstring_36b.txt
index abc9cf3eb2..da79ce218e 100644
--- a/tests/snippets/python/test_fstring_36b.txt
+++ b/tests/snippets/python/test_fstring_36b.txt
@@ -8,9 +8,9 @@ f"""{foo
 '"""'         Literal.String.Double
 '{'           Literal.String.Interpol
 'foo'         Name
-'\n      '    Text
+'\n      '    Text.Whitespace
 '= !s:'       Literal.String.Interpol
 '20'          Literal.String.Double
 '}'           Literal.String.Interpol
 '"""'         Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_needs_name.txt b/tests/snippets/python/test_needs_name.txt
index 60c782c500..f121da03f2 100644
--- a/tests/snippets/python/test_needs_name.txt
+++ b/tests/snippets/python/test_needs_name.txt
@@ -52,4 +52,4 @@ S = (H @ beta - r).T @ inv(H @ V @ H.T) @ (H @ beta - r)
 ' '           Text
 'r'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_pep_515.txt b/tests/snippets/python/test_pep_515.txt
index a5f2f358a2..38fa61952f 100644
--- a/tests/snippets/python/test_pep_515.txt
+++ b/tests/snippets/python/test_pep_515.txt
@@ -10,19 +10,19 @@
 
 ---tokens---
 '1_000_000'   Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1_000.000_001' Literal.Number.Float
-'\n'          Text
+'\n'          Text.Whitespace
 
 '1_000e1_000j' Literal.Number.Float
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0xCAFE_F00D' Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0b_0011_1111_0100_1110' Literal.Number.Bin
-'\n'          Text
+'\n'          Text.Whitespace
 
 '0o_777_123'  Literal.Number.Oct
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_raw_fstring.txt b/tests/snippets/python/test_raw_fstring.txt
index 0dd51c1e14..3381088192 100644
--- a/tests/snippets/python/test_raw_fstring.txt
+++ b/tests/snippets/python/test_raw_fstring.txt
@@ -14,9 +14,9 @@ rf"m_{{\nu}} = {x}"
 '\\'          Literal.String.Double
 'nu = x'      Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'f'           Literal.String.Affix
 '"'           Literal.String.Double
@@ -27,9 +27,9 @@ rf"m_{{\nu}} = {x}"
 'x'           Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
-'\n'          Text
+'\n'          Text.Whitespace
 
 'rf'          Literal.String.Affix
 '"'           Literal.String.Double
@@ -43,4 +43,4 @@ rf"m_{{\nu}} = {x}"
 'x'           Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_string_escape_codes.txt b/tests/snippets/python/test_string_escape_codes.txt
index 5b06329c27..c02dc037d8 100644
--- a/tests/snippets/python/test_string_escape_codes.txt
+++ b/tests/snippets/python/test_string_escape_codes.txt
@@ -17,4 +17,4 @@
 ' '           Literal.String.Single
 '\\N{Plus-Minus Sign}' Literal.String.Escape
 "'"           Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python/test_walrus_operator.txt b/tests/snippets/python/test_walrus_operator.txt
index 05935ec971..9bab89dce1 100644
--- a/tests/snippets/python/test_walrus_operator.txt
+++ b/tests/snippets/python/test_walrus_operator.txt
@@ -18,4 +18,4 @@ if (a := 2) > 4:
 ' '           Text
 '4'           Literal.Number.Integer
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/python2/test_cls_builtin.txt b/tests/snippets/python2/test_cls_builtin.txt
index 333845d81c..ff533c2c7b 100644
--- a/tests/snippets/python2/test_cls_builtin.txt
+++ b/tests/snippets/python2/test_cls_builtin.txt
@@ -13,11 +13,11 @@ class TestClass():
 '('           Punctuation
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 '@classmethod' Name.Decorator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '    '        Text
 'def'         Keyword
@@ -27,8 +27,8 @@ class TestClass():
 'cls'         Name.Builtin.Pseudo
 ')'           Punctuation
 ':'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '        '    Text
 'pass'        Keyword
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/r/test_call.txt b/tests/snippets/r/test_call.txt
index 1e803132d6..c35a71e53e 100644
--- a/tests/snippets/r/test_call.txt
+++ b/tests/snippets/r/test_call.txt
@@ -6,7 +6,7 @@ f(1, a)
 '('           Punctuation
 '1'           Literal.Number
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/r/test_custom_operator.txt b/tests/snippets/r/test_custom_operator.txt
index a8261a1e83..1b19df77a6 100644
--- a/tests/snippets/r/test_custom_operator.txt
+++ b/tests/snippets/r/test_custom_operator.txt
@@ -3,8 +3,8 @@
 
 ---tokens---
 '7'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '% and %'     Operator
-' '           Text
+' '           Text.Whitespace
 '8'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/r/test_dot_indexing.txt b/tests/snippets/r/test_dot_indexing.txt
index 6294496876..ee0871f0fb 100644
--- a/tests/snippets/r/test_dot_indexing.txt
+++ b/tests/snippets/r/test_dot_indexing.txt
@@ -6,4 +6,4 @@
 '['           Punctuation
 '1'           Literal.Number
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/r/test_dot_name.txt b/tests/snippets/r/test_dot_name.txt
index 513abef044..01df52810c 100644
--- a/tests/snippets/r/test_dot_name.txt
+++ b/tests/snippets/r/test_dot_name.txt
@@ -3,8 +3,8 @@
 
 ---tokens---
 '.'           Name
-' '           Text
+' '           Text.Whitespace
 '<-'          Operator
-' '           Text
+' '           Text.Whitespace
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/r/test_indexing.txt b/tests/snippets/r/test_indexing.txt
index 396a2d383a..6491d1a57f 100644
--- a/tests/snippets/r/test_indexing.txt
+++ b/tests/snippets/r/test_indexing.txt
@@ -6,4 +6,4 @@ a[1]
 '['           Punctuation
 '1'           Literal.Number
 ']'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/r/test_name1.txt b/tests/snippets/r/test_name1.txt
index d685ee7e72..a7651cbd30 100644
--- a/tests/snippets/r/test_name1.txt
+++ b/tests/snippets/r/test_name1.txt
@@ -3,4 +3,4 @@
 
 ---tokens---
 '._a_2.c'     Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/r/test_name2.txt b/tests/snippets/r/test_name2.txt
index 557650d81e..1570aeca26 100644
--- a/tests/snippets/r/test_name2.txt
+++ b/tests/snippets/r/test_name2.txt
@@ -5,4 +5,4 @@
 
 ---tokens---
 '`.1 blah`'   Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/r/test_name3.txt b/tests/snippets/r/test_name3.txt
index 52e359b80e..fe5e8a456f 100644
--- a/tests/snippets/r/test_name3.txt
+++ b/tests/snippets/r/test_name3.txt
@@ -5,4 +5,4 @@
 
 ---tokens---
 '`.1 \\` blah`' Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ruby/test_escaped_bracestring.txt b/tests/snippets/ruby/test_escaped_bracestring.txt
index 7bcf845e48..14718b948d 100644
--- a/tests/snippets/ruby/test_escaped_bracestring.txt
+++ b/tests/snippets/ruby/test_escaped_bracestring.txt
@@ -11,9 +11,9 @@ str.gsub(%r{\\\\}, "/")
 '\\\\'        Literal.String.Regex
 '}'           Literal.String.Regex
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '/'           Literal.String.Double
 '"'           Literal.String.Double
 ')'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ruby/test_interpolation_nested_curly.txt b/tests/snippets/ruby/test_interpolation_nested_curly.txt
index eceb04af40..f4a69f7b91 100644
--- a/tests/snippets/ruby/test_interpolation_nested_curly.txt
+++ b/tests/snippets/ruby/test_interpolation_nested_curly.txt
@@ -5,7 +5,7 @@
 '"'           Literal.String.Double
 'A'           Literal.String.Double
 '#{'          Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
 '3'           Literal.Number.Integer
 '..'          Operator
@@ -13,44 +13,44 @@
 ')'           Punctuation
 '.'           Operator
 'group_by'    Name
-' '           Text
+' '           Text.Whitespace
 '{'           Literal.String.Interpol
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'x'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 'x'           Name
 '/'           Operator
 '2'           Literal.Number.Integer
 '}'           Literal.String.Interpol
 '.'           Operator
 'map'         Name
-' '           Text
+' '           Text.Whitespace
 'do'          Keyword
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 'k'           Name
 ','           Punctuation
 'v'           Name
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '#{'          Literal.String.Interpol
 'k'           Name
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 'end'         Keyword
 '.'           Operator
 'join'        Name
-' '           Text
+' '           Text.Whitespace
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 'Z'           Literal.String.Double
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ruby/test_operator_methods.txt b/tests/snippets/ruby/test_operator_methods.txt
index f444ee4fb8..c8f7a7ac25 100644
--- a/tests/snippets/ruby/test_operator_methods.txt
+++ b/tests/snippets/ruby/test_operator_methods.txt
@@ -6,4 +6,4 @@ x.==4
 '.'           Operator
 '=='          Name.Operator
 '4'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ruby/test_range_syntax1.txt b/tests/snippets/ruby/test_range_syntax1.txt
index df7c40cb37..f0fc15d236 100644
--- a/tests/snippets/ruby/test_range_syntax1.txt
+++ b/tests/snippets/ruby/test_range_syntax1.txt
@@ -5,4 +5,4 @@
 '1'           Literal.Number.Integer
 '..'          Operator
 '3'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ruby/test_range_syntax2.txt b/tests/snippets/ruby/test_range_syntax2.txt
index 72d47e85ab..a3ba24aea0 100644
--- a/tests/snippets/ruby/test_range_syntax2.txt
+++ b/tests/snippets/ruby/test_range_syntax2.txt
@@ -5,4 +5,4 @@
 '1'           Literal.Number.Integer
 '...'         Operator
 '3'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/ruby/test_range_syntax3.txt b/tests/snippets/ruby/test_range_syntax3.txt
index a72f838057..08bf4b1271 100644
--- a/tests/snippets/ruby/test_range_syntax3.txt
+++ b/tests/snippets/ruby/test_range_syntax3.txt
@@ -3,8 +3,8 @@
 
 ---tokens---
 '1'           Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '..'          Operator
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/scala/test_import_path.txt b/tests/snippets/scala/test_import_path.txt
index 3e06d1fa42..1c316a0dad 100644
--- a/tests/snippets/scala/test_import_path.txt
+++ b/tests/snippets/scala/test_import_path.txt
@@ -9,4 +9,4 @@ import a.b.c
 'b'           Name.Namespace
 '.'           Punctuation
 'c'           Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/shell/test_array_nums.txt b/tests/snippets/shell/test_array_nums.txt
index a7474a06db..4e9870c265 100644
--- a/tests/snippets/shell/test_array_nums.txt
+++ b/tests/snippets/shell/test_array_nums.txt
@@ -6,9 +6,9 @@ a=(1 2 3)
 '='           Operator
 '('           Operator
 '1'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '3'           Literal.Number
 ')'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/shell/test_curly_no_escape_and_quotes.txt b/tests/snippets/shell/test_curly_no_escape_and_quotes.txt
index 607b95ebd3..9fbb71850c 100644
--- a/tests/snippets/shell/test_curly_no_escape_and_quotes.txt
+++ b/tests/snippets/shell/test_curly_no_escape_and_quotes.txt
@@ -3,7 +3,7 @@ echo "${a//["b"]/}"
 
 ---tokens---
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String.Double
 '${'          Literal.String.Interpol
 'a'           Name.Variable
@@ -12,4 +12,4 @@ echo "${a//["b"]/}"
 ']/'          Punctuation
 '}'           Literal.String.Interpol
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/shell/test_curly_with_escape.txt b/tests/snippets/shell/test_curly_with_escape.txt
index b6577876e1..d03b23ea5f 100644
--- a/tests/snippets/shell/test_curly_with_escape.txt
+++ b/tests/snippets/shell/test_curly_with_escape.txt
@@ -3,11 +3,11 @@ echo ${a//[\"]/}
 
 ---tokens---
 'echo'        Name.Builtin
-' '           Text
+' '           Text.Whitespace
 '${'          Literal.String.Interpol
 'a'           Name.Variable
 '//['         Punctuation
 '\\"'         Literal.String.Escape
 ']/'          Punctuation
 '}'           Literal.String.Interpol
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/shell/test_end_of_line_nums.txt b/tests/snippets/shell/test_end_of_line_nums.txt
index 8164daefa6..663ea61bcf 100644
--- a/tests/snippets/shell/test_end_of_line_nums.txt
+++ b/tests/snippets/shell/test_end_of_line_nums.txt
@@ -6,10 +6,10 @@ b=2 # comment
 'a'           Name.Variable
 '='           Operator
 '1'           Literal.Number
-'\n'          Text
+'\n'          Text.Whitespace
 
 'b'           Name.Variable
 '='           Operator
 '2'           Literal.Number
-' '           Text
+' '           Text.Whitespace
 '# comment\n' Comment.Single
diff --git a/tests/snippets/shell/test_parsed_single.txt b/tests/snippets/shell/test_parsed_single.txt
index c11b3c76d7..3110c8e9d1 100644
--- a/tests/snippets/shell/test_parsed_single.txt
+++ b/tests/snippets/shell/test_parsed_single.txt
@@ -5,4 +5,4 @@ a=$'abc\''
 'a'           Name.Variable
 '='           Operator
 "$'abc\\''"   Literal.String.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/shell/test_short_variable_names.txt b/tests/snippets/shell/test_short_variable_names.txt
index 5adde793d5..86d4dc167b 100644
--- a/tests/snippets/shell/test_short_variable_names.txt
+++ b/tests/snippets/shell/test_short_variable_names.txt
@@ -9,18 +9,18 @@ z="$abc"
 '"'           Literal.String.Double
 '$'           Text
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'y'           Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$_'          Name.Variable
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
 
 'z'           Name.Variable
 '='           Operator
 '"'           Literal.String.Double
 '$abc'        Name.Variable
 '"'           Literal.String.Double
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/teal/test_comments.txt b/tests/snippets/teal/test_comments.txt
index 20235d071f..df7e1b18b0 100644
--- a/tests/snippets/teal/test_comments.txt
+++ b/tests/snippets/teal/test_comments.txt
@@ -10,19 +10,19 @@ label: implicit comment
 '//c1'        Comment.Single
 '\n'          Text
 
-' '           Text
+' '           Text.Whitespace
 '//c2'        Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
 
 'label:'      Name.Function
 '//c3'        Comment.Single
 '\n'          Text
 
 'a'           Name.Function
-' '           Text
+' '           Text.Whitespace
 '// c4'       Comment.Single
 '\n'          Text
 
 'label:'      Name.Label
 ' implicit comment' Comment.Single
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/teal/test_literals.txt b/tests/snippets/teal/test_literals.txt
index eb0e8cb723..46e43dc1b6 100644
--- a/tests/snippets/teal/test_literals.txt
+++ b/tests/snippets/teal/test_literals.txt
@@ -6,23 +6,23 @@ a b64 aB/c23=
 
 ---tokens---
 'a'           Name.Function
-' '           Text
+' '           Text.Whitespace
 '0x1AaAF'     Literal.Number.Hex
 '\n'          Text
 
 'a'           Name.Function
-' '           Text
+' '           Text.Whitespace
 '7777777777777777777777777777777777777777777777777774MSJUVU' Literal.Number
 '\n'          Text
 
 'a'           Name.Function
-' '           Text
+' '           Text.Whitespace
 'base32'      Literal.String.Affix
 '(aB/c23=)'   Literal.String.Other
 '\n'          Text
 
 'a'           Name.Function
-' '           Text
+' '           Text.Whitespace
 'b64 '        Literal.String.Affix
 'aB/c23='     Literal.String.Other
 '\n'          Text
diff --git a/tests/snippets/teal/test_strings.txt b/tests/snippets/teal/test_strings.txt
index 59d8d6c47a..4e32633cd8 100644
--- a/tests/snippets/teal/test_strings.txt
+++ b/tests/snippets/teal/test_strings.txt
@@ -3,7 +3,7 @@ a "abc\x123\n\"de//f"
 
 ---tokens---
 'a'           Name.Function
-' '           Text
+' '           Text.Whitespace
 '"'           Literal.String
 'abc'         Literal.String
 '\\x12'       Literal.String.Escape
diff --git a/tests/snippets/wren/lonely-paren.txt b/tests/snippets/wren/lonely-paren.txt
new file mode 100644
index 0000000000..5236e601b7
--- /dev/null
+++ b/tests/snippets/wren/lonely-paren.txt
@@ -0,0 +1,10 @@
+---input---
+// This invalid input should terminate.
+)
+
+---tokens---
+'// This invalid input should terminate.' Comment.Single
+'\n'          Text.Whitespace
+
+')'           Punctuation
+'\n'          Text.Whitespace
diff --git a/tests/snippets/xml/multiline-comment-catastrophic-backtracking.txt b/tests/snippets/xml/multiline-comment-catastrophic-backtracking.txt
index 76f2fb91f8..d9a8b7acca 100644
--- a/tests/snippets/xml/multiline-comment-catastrophic-backtracking.txt
+++ b/tests/snippets/xml/multiline-comment-catastrophic-backtracking.txt
@@ -31,4 +31,26 @@ terminated
 
 ---tokens---
 '<'           Error
-'!--\nthis\ncomment\nis\nnever\nterminated\n...\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n...\n' Text
+'!--'         Text
+'\n'          Text.Whitespace
+
+'this'        Text
+'\n'          Text.Whitespace
+
+'comment'     Text
+'\n'          Text.Whitespace
+
+'is'          Text
+'\n'          Text.Whitespace
+
+'never'       Text
+'\n'          Text.Whitespace
+
+'terminated'  Text
+'\n'          Text.Whitespace
+
+'...'         Text
+'\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n' Text.Whitespace
+
+'...'         Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/yaml/test_yaml_colon_in_key.txt b/tests/snippets/yaml/test_yaml_colon_in_key.txt
new file mode 100644
index 0000000000..9f3d313666
--- /dev/null
+++ b/tests/snippets/yaml/test_yaml_colon_in_key.txt
@@ -0,0 +1,11 @@
+# Colon in the key name is accepted by the YAML specs too
+
+---input---
+foo:bar: value
+
+---tokens---
+'foo:bar'     Name.Tag
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.Scalar.Plain
+'\n'          Text.Whitespace
diff --git a/tests/snippets/yaml/test_yaml_colon_in_key_double.txt b/tests/snippets/yaml/test_yaml_colon_in_key_double.txt
new file mode 100644
index 0000000000..6f68b6d37e
--- /dev/null
+++ b/tests/snippets/yaml/test_yaml_colon_in_key_double.txt
@@ -0,0 +1,11 @@
+# Colons in the key name is accepted by the YAML specs too
+
+---input---
+foo::bar: value
+
+---tokens---
+'foo::bar'    Name.Tag
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.Scalar.Plain
+'\n'          Text.Whitespace
diff --git a/tests/snippets/yaml/test_yaml_colon_in_key_start.txt b/tests/snippets/yaml/test_yaml_colon_in_key_start.txt
new file mode 100644
index 0000000000..60d4e2349a
--- /dev/null
+++ b/tests/snippets/yaml/test_yaml_colon_in_key_start.txt
@@ -0,0 +1,11 @@
+# Colon at the beginning of the key name is accepted by the YAML specs too
+
+---input---
+:foo: value
+
+---tokens---
+':foo'        Name.Tag
+':'           Punctuation
+' '           Text.Whitespace
+'value'       Literal.Scalar.Plain
+'\n'          Text.Whitespace
diff --git a/tests/support/structural_diff.py b/tests/support/structural_diff.py
index d2e4d7f203..cea27d1039 100644
--- a/tests/support/structural_diff.py
+++ b/tests/support/structural_diff.py
@@ -1,17 +1,37 @@
-import lxml.html
-import lxml.etree
-import pytest
+import html.parser
+
+
+class Parser(html.parser.HTMLParser):
+    def __init__(self):
+        super().__init__()
+        self._stream = []
+
+    def handle_starttag(self, tag, attrs):
+        attrs = sorted(attrs, key=lambda x: x[0])
+        attrs = '|'.join([k[0] + ':' + k[1] for k in attrs])
+        self._stream.append(('<', tag, attrs))
+
+    def handle_endtag(self, tag):
+        self._stream.append(('>', tag, ''))
+
+    def handle_data(self, data):
+        self._stream.append(('_', data, ''))
+
+    @property
+    def stream(self):
+        return self._stream
+
 
 def _serialize(t):
-    for a, e in lxml.etree.iterwalk(t, events=("start", "end"),):
-        text = e.text.strip() if e.text else ""
-        yield (a, e.tag, repr(text), ', '.join([k[0]+':'+k[1] for k in sorted(e.attrib.items(), key = lambda x: x[0])]))
+    parser = Parser()
+    parser.feed(t)
+    return parser.stream
+
 
 def structural_diff(a, b):
     """Check if there is a structural difference between two HTML files."""
-    a_s = _serialize(lxml.html.fromstring(a))
-    b_s = _serialize(lxml.html.fromstring(b))
-    
+    a_s = _serialize(a)
+    b_s = _serialize(b)
+
     for e, f in zip(a_s, b_s):
-        print(e, f)
-        assert e == f
\ No newline at end of file
+        assert e == f, f'Expected: {e}, found: {f}'
diff --git a/tests/test_func.py b/tests/test_func.py
new file mode 100644
index 0000000000..c494b9cc89
--- /dev/null
+++ b/tests/test_func.py
@@ -0,0 +1,44 @@
+import pytest
+from pygments.lexers.func import FuncLexer
+from pygments.token import Token, Name
+
+@pytest.fixture(scope='module')
+def lexer_func():
+    yield FuncLexer()
+
+
+@pytest.mark.parametrize('text', (
+    'take(first)Entry', '"not_a_string', 'msg.sender', 'send_message,then_terminate', '_'))
+def test_func_not_identifier(lexer_func, text):
+    """Test text that should **not** be tokenized as identifier."""
+    assert list(lexer_func.get_tokens(text))[0] != (Name.Variable, text)
+
+
+@pytest.mark.parametrize('text', (
+    '`test identifier`', 'simple_identifier', 'query\'\'', 
+    '_internal_value', 'get_pubkeys&signatures',
+    'dict::udict_set_builder', '2+2=2*2', '-alsovalidname', '{hehehe}'))
+def test_func_identifier(lexer_func, text):
+    """Test text that should be tokenized as identifier."""
+    assert list(lexer_func.get_tokens(text))[0] == (Name.Variable, text)
+
+
+@pytest.mark.parametrize('text', (
+'`test identifier`(', 'simple_identifier(', 'query\'\'(', 
+'_internal_value(', 'get_pubkeys&signatures(',
+'dict::udict_set_builder(', '2+2=2*2(', '-alsovalidname(', '{hehehe}('))
+def test_func_function(lexer_func, text):
+    """Test text that should be tokenized as identifier."""
+    assert list(lexer_func.get_tokens(text))[0] == (Name.Function, text[:-1])
+
+
+@pytest.mark.parametrize('text', ('0x0f', '0x1_2', '123', '0b10', '0xffff_fff', '1'))
+def test_func_number(lexer_func, text):
+    """Test text that should be tokenized as number."""
+    assert list(lexer_func.get_tokens(text))[0] == (Token.Literal.Number, text)
+
+
+@pytest.mark.parametrize('text', ('0x0f_m', '0X1_2', '12d3', '0b1_0f', '0bff_fff', '0b'))
+def test_func_not_number(lexer_func, text):
+    """Test text that should *not* be tokenized as number."""
+    assert list(lexer_func.get_tokens(text))[0] != (Token.Literal.Number, text)
diff --git a/tests/test_irc_formatter.py b/tests/test_irc_formatter.py
index bedef95d1c..c93016616c 100644
--- a/tests/test_irc_formatter.py
+++ b/tests/test_irc_formatter.py
@@ -12,7 +12,7 @@
 from pygments.formatters import IRCFormatter
 
 tokensource = list(PythonLexer().get_tokens("lambda x: 123"))
-
+newlinetokensource = list(PythonLexer().get_tokens("from \\\n\\\n    os import  path\n"))
 
 def test_correct_output():
     hfmt = IRCFormatter()
@@ -20,3 +20,11 @@ def test_correct_output():
     hfmt.format(tokensource, houtfile)
 
     assert '\x0302lambda\x03 x: \x0302123\x03\n' == houtfile.getvalue()
+
+def test_linecount_output():
+    hfmt = IRCFormatter(linenos = True)
+    houtfile = StringIO()
+    hfmt.format(newlinetokensource, houtfile)
+
+    expected_out = '0001: \x0302from\x03 \\\n0002: \\\n0003:     \x1d\x0310os\x03\x1d \x0302import\x03  path\n0004: '
+    assert expected_out == houtfile.getvalue()
diff --git a/tests/test_latex_formatter.py b/tests/test_latex_formatter.py
index 967a9f195f..42c5eda787 100644
--- a/tests/test_latex_formatter.py
+++ b/tests/test_latex_formatter.py
@@ -83,7 +83,7 @@ def test_embedded_lexer():
         (Token.Operator, '='),
         (Token.Text, ' '),
         (Token.Literal.Number.Integer, '1'),
-        (Token.Text, '\n'),
+        (Token.Text.Whitespace, '\n'),
         (Token.Generic.Prompt, '>>> '),
         (Token.Name, 'y'),
         (Token.Text, ' '),
@@ -98,10 +98,10 @@ def test_embedded_lexer():
         (Token.Punctuation, ')'),
         (Token.Text, '  '),
         (Token.Comment.Single, '# these |pipes| are untouched'),  # note: not Token.Escape
-        (Token.Text, '\n'),
+        (Token.Text.Whitespace, '\n'),
         (Token.Generic.Prompt, '>>> '),
         (Token.Name, 'y'),
-        (Token.Text, '\n'),
+        (Token.Text.Whitespace, '\n'),
         (Token.Escape, '$1 + z^2$'),
         (Token.Generic.Output, '\n'),
     ]
diff --git a/tests/test_perllexer.py b/tests/test_perllexer.py
index 15d06af3c5..21bf749cf8 100644
--- a/tests/test_perllexer.py
+++ b/tests/test_perllexer.py
@@ -39,10 +39,10 @@ def assert_single_token(lexer, s, token):
 def assert_tokens(lexer, strings, expected_tokens):
     """Show that a given string generates the expected tokens."""
     tokens = list(lexer.get_tokens_unprocessed(''.join(strings)))
-    assert len(tokens) == len(expected_tokens)
-    for index, s in enumerate(strings):
-        assert s == tokens[index][2]
-        assert expected_tokens[index] == tokens[index][1]
+    parsed_strings = [t[2] for t in tokens]
+    assert parsed_strings == strings
+    parsed_tokens = [t[1] for t in tokens]
+    assert parsed_tokens == expected_tokens
 
 
 def assert_fast_tokenization(lexer, s):
@@ -161,21 +161,30 @@ def test_substitution_with_parenthesis(lexer):
 # Namespaces/modules
 
 def test_package_statement(lexer):
-    assert_tokens(lexer, ['package', ' ', 'Foo'], [Keyword, Text, Name.Namespace])
-    assert_tokens(lexer, ['package', '  ', 'Foo::Bar'], [Keyword, Text, Name.Namespace])
+    assert_tokens(lexer, ['package', ' ', 'Foo'],
+                  [Keyword, Text.Whitespace, Name.Namespace])
+    assert_tokens(lexer, ['package', '  ', 'Foo::Bar'],
+                  [Keyword, Text.Whitespace, Name.Namespace])
 
 
 def test_use_statement(lexer):
-    assert_tokens(lexer, ['use', ' ', 'Foo'], [Keyword, Text, Name.Namespace])
-    assert_tokens(lexer, ['use', '  ', 'Foo::Bar'], [Keyword, Text, Name.Namespace])
+    assert_tokens(lexer, ['use', ' ', 'Foo'],
+                  [Keyword, Text.Whitespace, Name.Namespace])
+    assert_tokens(lexer, ['use', '  ', 'Foo::Bar'],
+                  [Keyword, Text.Whitespace, Name.Namespace])
 
 
 def test_no_statement(lexer):
-    assert_tokens(lexer, ['no', ' ', 'Foo'], [Keyword, Text, Name.Namespace])
-    assert_tokens(lexer, ['no', '  ', 'Foo::Bar'], [Keyword, Text, Name.Namespace])
+    assert_tokens(lexer, ['no', ' ', 'Foo'],
+                  [Keyword, Text.Whitespace, Name.Namespace])
+    assert_tokens(lexer, ['no', '  ', 'Foo::Bar'],
+                  [Keyword, Text.Whitespace, Name.Namespace])
 
 
 def test_require_statement(lexer):
-    assert_tokens(lexer, ['require', ' ', 'Foo'], [Keyword, Text, Name.Namespace])
-    assert_tokens(lexer, ['require', '  ', 'Foo::Bar'], [Keyword, Text, Name.Namespace])
-    assert_tokens(lexer, ['require', ' ', '"Foo/Bar.pm"'], [Keyword, Text, String])
+    assert_tokens(lexer, ['require', ' ', 'Foo'],
+                  [Keyword, Text.Whitespace, Name.Namespace])
+    assert_tokens(lexer, ['require', '  ', 'Foo::Bar'],
+                  [Keyword, Text.Whitespace, Name.Namespace])
+    assert_tokens(lexer, ['require', ' ', '"Foo/Bar.pm"'],
+                  [Keyword, Text.Whitespace, String])
diff --git a/tests/test_regexlexer.py b/tests/test_regexlexer.py
index 5235d2c2ae..1b9639f6b8 100644
--- a/tests/test_regexlexer.py
+++ b/tests/test_regexlexer.py
@@ -8,7 +8,7 @@
 
 import pytest
 
-from pygments.token import Text
+from pygments.token import Text, Whitespace
 from pygments.lexer import RegexLexer, default
 
 
@@ -47,7 +47,7 @@ def test_tuple(lexer):
 def test_multiline(lexer):
     toks = list(lexer.get_tokens_unprocessed('a\ne'))
     assert toks == [
-        (0, Text.Root, 'a'), (1, Text, '\n'), (2, Text.Root, 'e')]
+        (0, Text.Root, 'a'), (1, Whitespace, '\n'), (2, Text.Root, 'e')]
 
 
 def test_default(lexer):
diff --git a/tests/test_templates.py b/tests/test_templates.py
index b841ccbcf5..9ed816f892 100644
--- a/tests/test_templates.py
+++ b/tests/test_templates.py
@@ -1,11 +1,7 @@
 import pytest
 
-from pygments.lexers.templates import (
-    JavascriptDjangoLexer,
-    MasonLexer,
-    SqlJinjaLexer,
-    VelocityLexer,
-)
+from pygments.lexers.templates import JavascriptDjangoLexer, MasonLexer, \
+    SqlJinjaLexer, VelocityLexer
 
 from pygments.token import Comment
 
diff --git a/tests/test_words.py b/tests/test_words.py
index bbc9cd2266..9a8730ae21 100644
--- a/tests/test_words.py
+++ b/tests/test_words.py
@@ -362,5 +362,5 @@ def test_bracket_escape():
     # This used to emit a FutureWarning.
     assert list(MySecondLexer().get_tokens("x")) == [
         (Token.Name, "x"),
-        (Token.Text, "\n"),
+        (Token.Text.Whitespace, "\n"),
     ]
diff --git a/tox.ini b/tox.ini
index 3d6dac4cbd..dc0a5be5dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,6 @@ deps =
     pytest
     pytest-cov
     wcag-contrast-ratio
-    lxml
 commands = pytest {posargs}