From bc917b56dd0438114f441dbb868e6cab22aaffe8 Mon Sep 17 00:00:00 2001
From: Jono Yang <jyang@nexb.com>
Date: Thu, 1 Oct 2020 18:29:42 -0700
Subject: [PATCH 1/8] Update prog_lexers.py and pygments_lexers.py #4

    * TODO: Comment out newly added lexers in prog_lexers.py if they are not for programming languages

Signed-off-by: Jono Yang <jyang@nexb.com>
---
 src/typecode/prog_lexers.py     | 298 ++++++++++++++++++++++++--------
 src/typecode/pygments_lexers.py | 111 ++++++++++--
 2 files changed, 326 insertions(+), 83 deletions(-)

diff --git a/src/typecode/prog_lexers.py b/src/typecode/prog_lexers.py
index 35aed95..f541f19 100644
--- a/src/typecode/prog_lexers.py
+++ b/src/typecode/prog_lexers.py
@@ -1,96 +1,101 @@
 # -*- coding: utf-8 -*-
 """
-This file is a list of the subset of lexers we care for as actual programming
-languages from the larger whole generated list at pygments.lexers._mapping
+    This file is a list of the subset of lexers we care for as actual programming
+    languages from the larger whole generated list at pygments.lexers._mapping
 
-This is based on Pygments 2.2.0 pygments.lexers._mapping and the modification is
-to comment out certain/most lexers.
+    This is based on Pygments 2.7.1 pygments.lexers._mapping and the modification is
+    to comment out certain/most lexers.
 
-Copyright (c) 2006-2017 by the respective authors (see AUTHORS file).
-All rights reserved.
+    pygments.lexers._mapping
+    ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+    Lexer mapping definitions. This file is generated by itself. Everytime
+    you change something on a builtin lexer definition, run this script from
+    the lexers folder to update it.
 
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    Do not alter the LEXERS dictionary by hand.
 
+    :copyright: Copyright 2006-2014, 2016 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
-
 LEXERS = {
-    'ABAPLexer': ('pygments.lexers.business', 'ABAP', ('abap',), ('*.abap',), ('text/x-abap',)),
+    'ABAPLexer': ('pygments.lexers.business', 'ABAP', ('abap',), ('*.abap', '*.ABAP'), ('text/x-abap',)),
     # 'APLLexer': ('pygments.lexers.apl', 'APL', ('apl',), ('*.apl',), ()),
+    'AbnfLexer': ('pygments.lexers.grammar_notation', 'ABNF', ('abnf',), ('*.abnf',), ('text/x-abnf',)),
     'ActionScript3Lexer': ('pygments.lexers.actionscript', 'ActionScript 3', ('as3', 'actionscript3'), ('*.as',), ('application/x-actionscript3', 'text/x-actionscript3', 'text/actionscript3')),
     'ActionScriptLexer': ('pygments.lexers.actionscript', 'ActionScript', ('as', 'actionscript'), ('*.as',), ('application/x-actionscript', 'text/x-actionscript', 'text/actionscript')),
     #'AdaLexer': ('pygments.lexers.pascal', 'Ada', ('ada', 'ada95', 'ada2005'), ('*.adb', '*.ads', '*.ada'), ('text/x-ada',)),
+    'AdlLexer': ('pygments.lexers.archetype', 'ADL', ('adl',), ('*.adl', '*.adls', '*.adlf', '*.adlx'), ()),
     #'AgdaLexer': ('pygments.lexers.haskell', 'Agda', ('agda',), ('*.agda',), ('text/x-agda',)),
+    'AheuiLexer': ('pygments.lexers.esoteric', 'Aheui', ('aheui',), ('*.aheui',), ()),
     #'AlloyLexer': ('pygments.lexers.dsls', 'Alloy', ('alloy',), ('*.als',), ('text/x-alloy',)),
     #'AmbientTalkLexer': ('pygments.lexers.ambient', 'AmbientTalk', ('at', 'ambienttalk', 'ambienttalk/2'), ('*.at',), ('text/x-ambienttalk',)),
+    'AmplLexer': ('pygments.lexers.ampl', 'Ampl', ('ampl',), ('*.run',), ()),
+    'Angular2HtmlLexer': ('pygments.lexers.templates', 'HTML + Angular2', ('html+ng2',), ('*.ng2',), ()),
+    'Angular2Lexer': ('pygments.lexers.templates', 'Angular2', ('ng2',), (), ()),
     #'AntlrActionScriptLexer': ('pygments.lexers.parsers', 'ANTLR With ActionScript Target', ('antlr-as', 'antlr-actionscript'), ('*.G', '*.g'), ()),
     #'AntlrCSharpLexer': ('pygments.lexers.parsers', 'ANTLR With C# Target', ('antlr-csharp', 'antlr-c#'), ('*.G', '*.g'), ()),
     #'AntlrCppLexer': ('pygments.lexers.parsers', 'ANTLR With CPP Target', ('antlr-cpp',), ('*.G', '*.g'), ()),
     #'AntlrJavaLexer': ('pygments.lexers.parsers', 'ANTLR With Java Target', ('antlr-java',), ('*.G', '*.g'), ()),
-    'AntlrLexer': ('pygments.lexers.parsers', 'ANTLR', ('antlr',), ('*.G', '*.g'), ()),
+    'AntlrLexer': ('pygments.lexers.parsers', 'ANTLR', ('antlr',), (), ()),
     #'AntlrObjectiveCLexer': ('pygments.lexers.parsers', 'ANTLR With ObjectiveC Target', ('antlr-objc',), ('*.G', '*.g'), ()),
     #'AntlrPerlLexer': ('pygments.lexers.parsers', 'ANTLR With Perl Target', ('antlr-perl',), ('*.G', '*.g'), ()),
     #'AntlrPythonLexer': ('pygments.lexers.parsers', 'ANTLR With Python Target', ('antlr-python',), ('*.G', '*.g'), ()),
     #'AntlrRubyLexer': ('pygments.lexers.parsers', 'ANTLR With Ruby Target', ('antlr-ruby', 'antlr-rb'), ('*.G', '*.g'), ()),
     #'ApacheConfLexer': ('pygments.lexers.configs', 'ApacheConf', ('apacheconf', 'aconf', 'apache'), ('.htaccess', 'apache.conf', 'apache2.conf'), ('text/x-apacheconf',)),
     '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',), ()),
     'AspectJLexer': ('pygments.lexers.jvm', 'AspectJ', ('aspectj',), ('*.aj',), ('text/x-aspectj',)),
     #'AsymptoteLexer': ('pygments.lexers.graphics', 'Asymptote', ('asy', 'asymptote'), ('*.asy',), ('text/x-asymptote',)),
+    #'AugeasLexer': ('pygments.lexers.configs', 'Augeas', ('augeas',), ('*.aug',), ()),
     #'AutoItLexer': ('pygments.lexers.automation', 'AutoIt', ('autoit',), ('*.au3',), ('text/x-autoit',)),
     #'AutohotkeyLexer': ('pygments.lexers.automation', 'autohotkey', ('ahk', 'autohotkey'), ('*.ahk', '*.ahkl'), ('text/x-autohotkey',)),
     #'AwkLexer': ('pygments.lexers.textedit', 'Awk', ('awk', 'gawk', 'mawk', 'nawk'), ('*.awk',), ('application/x-awk',)),
+    #'BBCBasicLexer': ('pygments.lexers.basic', 'BBC Basic', ('bbcbasic',), ('*.bbc',), ()),
     #'BBCodeLexer': ('pygments.lexers.markup', 'BBCode', ('bbcode',), (), ('text/x-bbcode',)),
+    'BCLexer': ('pygments.lexers.algebra', 'BC', ('bc',), ('*.bc',), ()),
+    'BSTLexer': ('pygments.lexers.bibtex', 'BST', ('bst', 'bst-pybtex'), ('*.bst',), ()),
+    'BareLexer': ('pygments.lexers.bare', 'BARE', ('bare',), ('*.bare',), ()),
     'BaseMakefileLexer': ('pygments.lexers.make', 'Base Makefile', ('basemake',), (), ()),
-    'BashLexer': ('pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'shell'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript')),
-    #'BashSessionLexer': ('pygments.lexers.shell', 'Bash Session', ('console',), ('*.sh-session',), ('application/x-shell-session',)),
+    'BashLexer': ('pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript', 'text/x-shellscript')),
+    #'BashSessionLexer': ('pygments.lexers.shell', 'Bash Session', ('console', 'shell-session'), ('*.sh-session', '*.shell-session'), ('application/x-shell-session', 'application/x-sh-session')),
     'BatchLexer': ('pygments.lexers.shell', 'Batchfile', ('bat', 'batch', 'dosbatch', 'winbatch'), ('*.bat', '*.cmd'), ('application/x-dos-batch',)),
     #'BefungeLexer': ('pygments.lexers.esoteric', 'Befunge', ('befunge',), ('*.befunge',), ('application/x-befunge',)),
+    'BibTeXLexer': ('pygments.lexers.bibtex', 'BibTeX', ('bib', 'bibtex'), ('*.bib',), ('text/x-bibtex',)),
     #'BlitzBasicLexer': ('pygments.lexers.basic', 'BlitzBasic', ('blitzbasic', 'b3d', 'bplus'), ('*.bb', '*.decls'), ('text/x-bb',)),
     #'BlitzMaxLexer': ('pygments.lexers.basic', 'BlitzMax', ('blitzmax', 'bmax'), ('*.bmx',), ('text/x-bmx',)),
+    'BnfLexer': ('pygments.lexers.grammar_notation', 'BNF', ('bnf',), ('*.bnf',), ('text/x-bnf',)),
+    'BoaLexer': ('pygments.lexers.boa', 'Boa', ('boa',), ('*.boa',), ()),
     #'BooLexer': ('pygments.lexers.dotnet', 'Boo', ('boo',), ('*.boo',), ('text/x-boo',)),
+    'BoogieLexer': ('pygments.lexers.verification', 'Boogie', ('boogie',), ('*.bpl',), ()),
     #'BrainfuckLexer': ('pygments.lexers.esoteric', 'Brainfuck', ('brainfuck', 'bf'), ('*.bf', '*.b'), ('application/x-brainfuck',)),
-    #'BroLexer': ('pygments.lexers.dsls', 'Bro', ('bro',), ('*.bro',), ()),
     #'BugsLexer': ('pygments.lexers.modeling', 'BUGS', ('bugs', 'winbugs', 'openbugs'), ('*.bug',), ()),
+    'CAmkESLexer': ('pygments.lexers.esoteric', 'CAmkES', ('camkes', 'idl4'), ('*.camkes', '*.idl4'), ()),
     'CLexer': ('pygments.lexers.c_cpp', 'C', ('c',), ('*.c', '*.h', '*.idc'), ('text/x-chdr', 'text/x-csrc')),
     'CMakeLexer': ('pygments.lexers.make', 'CMake', ('cmake',), ('*.cmake', 'CMakeLists.txt'), ('text/x-cmake',)),
     #'CObjdumpLexer': ('pygments.lexers.asm', 'c-objdump', ('c-objdump',), ('*.c-objdump',), ('text/x-c-objdump',)),
+    'CPSALexer': ('pygments.lexers.lisp', 'CPSA', ('cpsa',), ('*.cpsa',), ()),
     'CSharpAspxLexer': ('pygments.lexers.dotnet', 'aspx-cs', ('aspx-cs',), ('*.aspx', '*.asax', '*.ascx', '*.ashx', '*.asmx', '*.axd'), ()),
     'CSharpLexer': ('pygments.lexers.dotnet', 'C#', ('csharp', 'c#'), ('*.cs',), ('text/x-csharp',)),
     #'Ca65Lexer': ('pygments.lexers.asm', 'ca65 assembler', ('ca65',), ('*.s',), ()),
+    'CadlLexer': ('pygments.lexers.archetype', 'cADL', ('cadl',), ('*.cadl',), ()),
+    'CapDLLexer': ('pygments.lexers.esoteric', 'CapDL', ('capdl',), ('*.cdl',), ()),
+    'CapnProtoLexer': ('pygments.lexers.capnproto', "Cap'n Proto", ('capnp',), ('*.capnp',), ()),
     #'CbmBasicV2Lexer': ('pygments.lexers.basic', 'CBM BASIC V2', ('cbmbas',), ('*.bas',), ()),
     #'CeylonLexer': ('pygments.lexers.jvm', 'Ceylon', ('ceylon',), ('*.ceylon',), ('text/x-ceylon',)),
     #'Cfengine3Lexer': ('pygments.lexers.configs', 'CFEngine3', ('cfengine3', 'cf3'), ('*.cf',), ()),
     #'ChaiscriptLexer': ('pygments.lexers.scripting', 'ChaiScript', ('chai', 'chaiscript'), ('*.chai',), ('text/x-chaiscript', 'application/x-chaiscript')),
     #'ChapelLexer': ('pygments.lexers.chapel', 'Chapel', ('chapel', 'chpl'), ('*.chpl',), ()),
+    'CharmciLexer': ('pygments.lexers.c_like', 'Charmci', ('charmci',), ('*.ci',), ()),
     #'CheetahHtmlLexer': ('pygments.lexers.templates', 'HTML+Cheetah', ('html+cheetah', 'html+spitfire', 'htmlcheetah'), (), ('text/html+cheetah', 'text/html+spitfire')),
     #'CheetahJavascriptLexer': ('pygments.lexers.templates', 'JavaScript+Cheetah', ('js+cheetah', 'javascript+cheetah', 'js+spitfire', 'javascript+spitfire'), (), ('application/x-javascript+cheetah', 'text/x-javascript+cheetah', 'text/javascript+cheetah', 'application/x-javascript+spitfire', 'text/x-javascript+spitfire', 'text/javascript+spitfire')),
     #'CheetahLexer': ('pygments.lexers.templates', 'Cheetah', ('cheetah', 'spitfire'), ('*.tmpl', '*.spt'), ('application/x-cheetah', 'application/x-spitfire')),
     #'CheetahXmlLexer': ('pygments.lexers.templates', 'XML+Cheetah', ('xml+cheetah', 'xml+spitfire'), (), ('application/xml+cheetah', 'application/xml+spitfire')),
-    #'CirruLexer': ('pygments.lexers.webmisc', 'Cirru', ('cirru',), ('*.cirru', '*.cr'), ('text/x-cirru',)),
+    #'CirruLexer': ('pygments.lexers.webmisc', 'Cirru', ('cirru',), ('*.cirru',), ('text/x-cirru',)),
     #'ClayLexer': ('pygments.lexers.c_like', 'Clay', ('clay',), ('*.clay',), ('text/x-clay',)),
+    'CleanLexer': ('pygments.lexers.clean', 'Clean', ('clean',), ('*.icl', '*.dcl'), ()),
     'ClojureLexer': ('pygments.lexers.jvm', 'Clojure', ('clojure', 'clj'), ('*.clj',), ('text/x-clojure', 'application/x-clojure')),
     'ClojureScriptLexer': ('pygments.lexers.jvm', 'ClojureScript', ('clojurescript', 'cljs'), ('*.cljs',), ('text/x-clojurescript', 'application/x-clojurescript')),
     'CobolFreeformatLexer': ('pygments.lexers.business', 'COBOLFree', ('cobolfree',), ('*.cbl', '*.CBL'), ()),
@@ -99,12 +104,18 @@
     #'ColdfusionCFCLexer': ('pygments.lexers.templates', 'Coldfusion CFC', ('cfc',), ('*.cfc',), ()),
     #'ColdfusionHtmlLexer': ('pygments.lexers.templates', 'Coldfusion HTML', ('cfm',), ('*.cfm', '*.cfml'), ('application/x-coldfusion',)),
     #'ColdfusionLexer': ('pygments.lexers.templates', 'cfstatement', ('cfs',), (), ()),
-    'CommonLispLexer': ('pygments.lexers.lisp', 'Common Lisp', ('common-lisp', 'cl', 'lisp', 'elisp', 'emacs', 'emacs-lisp'), ('*.cl', '*.lisp', '*.el'), ('text/x-common-lisp',)),
+    'CommonLispLexer': ('pygments.lexers.lisp', 'Common Lisp', ('common-lisp', 'cl', 'lisp'), ('*.cl', '*.lisp'), ('text/x-common-lisp',)),
+    'ComponentPascalLexer': ('pygments.lexers.oberon', 'Component Pascal', ('componentpascal', 'cp'), ('*.cp', '*.cps'), ('text/x-component-pascal',)),
     #'CoqLexer': ('pygments.lexers.theorem', 'Coq', ('coq',), ('*.v',), ('text/x-coq',)),
     'CppLexer': ('pygments.lexers.c_cpp', 'C++', ('cpp', 'c++'), ('*.cpp', '*.hpp', '*.c++', '*.h++', '*.cc', '*.hh', '*.cxx', '*.hxx', '*.C', '*.H', '*.cp', '*.CPP'), ('text/x-c++hdr', 'text/x-c++src')),
     #'CppObjdumpLexer': ('pygments.lexers.asm', 'cpp-objdump', ('cpp-objdump', 'c++-objdumb', 'cxx-objdump'), ('*.cpp-objdump', '*.c++-objdump', '*.cxx-objdump'), ('text/x-cpp-objdump',)),
+    'CrmshLexer': ('pygments.lexers.dsls', 'Crmsh', ('crmsh', 'pcmk'), ('*.crmsh', '*.pcmk'), ()),
     #'CrocLexer': ('pygments.lexers.d', 'Croc', ('croc',), ('*.croc',), ('text/x-crocsrc',)),
     #'CryptolLexer': ('pygments.lexers.haskell', 'Cryptol', ('cryptol', 'cry'), ('*.cry',), ('text/x-cryptol',)),
+    'CrystalLexer': ('pygments.lexers.crystal', 'Crystal', ('cr', 'crystal'), ('*.cr',), ('text/x-crystal',)),
+    'CsoundDocumentLexer': ('pygments.lexers.csound', 'Csound Document', ('csound-document', 'csound-csd'), ('*.csd',), ()),
+    'CsoundOrchestraLexer': ('pygments.lexers.csound', 'Csound Orchestra', ('csound', 'csound-orc'), ('*.orc', '*.udo'), ()),
+    'CsoundScoreLexer': ('pygments.lexers.csound', 'Csound Score', ('csound-score', 'csound-sco'), ('*.sco',), ()),
     #'CssDjangoLexer': ('pygments.lexers.templates', 'CSS+Django/Jinja', ('css+django', 'css+jinja'), (), ('text/css+django', 'text/css+jinja')),
     #'CssErbLexer': ('pygments.lexers.templates', 'CSS+Ruby', ('css+erb', 'css+ruby'), (), ('text/css+ruby',)),
     #'CssGenshiLexer': ('pygments.lexers.templates', 'CSS+Genshi Text', ('css+genshitext', 'css+genshi'), (), ('text/css+genshi',)),
@@ -118,8 +129,10 @@
     #'DObjdumpLexer': ('pygments.lexers.asm', 'd-objdump', ('d-objdump',), ('*.d-objdump',), ('text/x-d-objdump',)),
     #'DarcsPatchLexer': ('pygments.lexers.diff', 'Darcs Patch', ('dpatch',), ('*.dpatch', '*.darcspatch'), ()),
     'DartLexer': ('pygments.lexers.javascript', 'Dart', ('dart',), ('*.dart',), ('text/x-dart',)),
+    'Dasm16Lexer': ('pygments.lexers.asm', 'DASM16', ('dasm16',), ('*.dasm16', '*.dasm'), ('text/x-dasm16',)),
     #'DebianControlLexer': ('pygments.lexers.installers', 'Debian Control file', ('control', 'debcontrol'), ('control',), ()),
-    'DelphiLexer': ('pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas',), ('text/x-pascal',)),
+    'DelphiLexer': ('pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
+    'DevicetreeLexer': ('pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
     #'DgLexer': ('pygments.lexers.python', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
     #'DiffLexer': ('pygments.lexers.diff', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
     #'DjangoLexer': ('pygments.lexers.templates', 'Django/Jinja', ('django', 'jinja'), (), ('application/x-django-templating', 'application/x-jinja')),
@@ -131,25 +144,41 @@
     #'DylanLidLexer': ('pygments.lexers.dylan', 'DylanLID', ('dylan-lid', 'lid'), ('*.lid', '*.hdp'), ('text/x-dylan-lid',)),
     #'ECLLexer': ('pygments.lexers.ecl', 'ECL', ('ecl',), ('*.ecl',), ('application/x-ecl',)),
     #'ECLexer': ('pygments.lexers.c_like', 'eC', ('ec',), ('*.ec', '*.eh'), ('text/x-echdr', 'text/x-ecsrc')),
+    'EarlGreyLexer': ('pygments.lexers.javascript', 'Earl Grey', ('earl-grey', 'earlgrey', 'eg'), ('*.eg',), ('text/x-earl-grey',)),
+    'EasytrieveLexer': ('pygments.lexers.scripting', 'Easytrieve', ('easytrieve',), ('*.ezt', '*.mac'), ('text/x-easytrieve',)),
     #'EbnfLexer': ('pygments.lexers.parsers', 'EBNF', ('ebnf',), ('*.ebnf',), ('text/x-ebnf',)),
     #'EiffelLexer': ('pygments.lexers.eiffel', 'Eiffel', ('eiffel',), ('*.e',), ('text/x-eiffel',)),
     #'ElixirConsoleLexer': ('pygments.lexers.erlang', 'Elixir iex session', ('iex',), (), ('text/x-elixir-shellsession',)),
-    'ElixirLexer': ('pygments.lexers.erlang', 'Elixir', ('elixir', 'ex', 'exs'), ('*.ex', '*.exs'), ('text/x-elixir',)),
+    'ElixirLexer': ('pygments.lexers.erlang', 'Elixir', ('elixir', 'ex', 'exs'), ('*.ex', '*.eex', '*.exs'), ('text/x-elixir',)),
+    'ElmLexer': ('pygments.lexers.elm', 'Elm', ('elm',), ('*.elm',), ('text/x-elm',)),
+    'EmacsLispLexer': ('pygments.lexers.lisp', 'EmacsLisp', ('emacs', 'elisp', 'emacs-lisp'), ('*.el',), ('text/x-elisp', 'application/x-elisp')),
+    'EmailLexer': ('pygments.lexers.email', 'E-mail', ('email', 'eml'), ('*.eml',), ('message/rfc822',)),
     'ErbLexer': ('pygments.lexers.templates', 'ERB', ('erb',), (), ('application/x-ruby-templating',)),
     'ErlangLexer': ('pygments.lexers.erlang', 'Erlang', ('erlang',), ('*.erl', '*.hrl', '*.es', '*.escript'), ('text/x-erlang',)),
     #'ErlangShellLexer': ('pygments.lexers.erlang', 'Erlang erl session', ('erl',), ('*.erl-sh',), ('text/x-erl-shellsession',)),
     #'EvoqueHtmlLexer': ('pygments.lexers.templates', 'HTML+Evoque', ('html+evoque',), ('*.html',), ('text/html+evoque',)),
     #'EvoqueLexer': ('pygments.lexers.templates', 'Evoque', ('evoque',), ('*.evoque',), ('application/x-evoque',)),
     #'EvoqueXmlLexer': ('pygments.lexers.templates', 'XML+Evoque', ('xml+evoque',), ('*.xml',), ('application/xml+evoque',)),
-    'FSharpLexer': ('pygments.lexers.dotnet', 'FSharp', ('fsharp',), ('*.fs', '*.fsi'), ('text/x-fsharp',)),
+    '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',)),
+    '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',)),
-    'FortranLexer': ('pygments.lexers.fortran', 'Fortran', ('fortran',), ('*.f', '*.f90', '*.F', '*.F90'), ('text/x-fortran',)),
+    'FennelLexer': ('pygments.lexers.lisp', 'Fennel', ('fennel', 'fnl'), ('*.fnl',), ()),
+    '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',), ()),
+    'ForthLexer': ('pygments.lexers.forth', 'Forth', ('forth',), ('*.frt', '*.fs'), ('application/x-forth',)),
+    'FortranFixedLexer': ('pygments.lexers.fortran', 'FortranFixed', ('fortranfixed',), ('*.f', '*.F'), ()),
+    'FortranLexer': ('pygments.lexers.fortran', 'Fortran', ('fortran',), ('*.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',)),
     #'GAPLexer': ('pygments.lexers.algebra', 'GAP', ('gap',), ('*.g', '*.gd', '*.gi', '*.gap'), ()),
-    #'GLShaderLexer': ('pygments.lexers.graphics', 'GLSL', ('glsl',), ('*.vert', '*.frag', '*.geo'), ('text/x-glslsrc',)),
+    #'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',)),
     'GasLexer': ('pygments.lexers.asm', 'GAS', ('gas', 'asm'), ('*.s', '*.S'), ('text/x-gas',)),
     #'GenshiLexer': ('pygments.lexers.templates', 'Genshi', ('genshi', 'kid', 'xml+genshi', 'xml+kid'), ('*.kid',), ('application/x-genshi', 'application/x-kid')),
     #'GenshiTextLexer': ('pygments.lexers.templates', 'Genshi Text', ('genshitext',), (), ('application/x-genshi-text', 'text/x-genshi')),
@@ -162,15 +191,19 @@
     #'GosuLexer': ('pygments.lexers.jvm', 'Gosu', ('gosu',), ('*.gs', '*.gsx', '*.gsp', '*.vark'), ('text/x-gosu',)),
     #'GosuTemplateLexer': ('pygments.lexers.jvm', 'Gosu Template', ('gst',), ('*.gst',), ('text/x-gosu-template',)),
     #'GroffLexer': ('pygments.lexers.markup', 'Groff', ('groff', 'nroff', 'man'), ('*.[1234567]', '*.man'), ('application/x-troff', 'text/troff')),
-    'GroovyLexer': ('pygments.lexers.jvm', 'Groovy', ('groovy',), ('*.groovy',), ('text/x-groovy',)),
+    'GroovyLexer': ('pygments.lexers.jvm', 'Groovy', ('groovy',), ('*.groovy', '*.gradle'), ('text/x-groovy',)),
+    'HLSLShaderLexer': ('pygments.lexers.graphics', 'HLSL', ('hlsl',), ('*.hlsl', '*.hlsli'), ('text/x-hlsl',)),
     #'HamlLexer': ('pygments.lexers.html', 'Haml', ('haml',), ('*.haml',), ('text/x-haml',)),
     #'HandlebarsHtmlLexer': ('pygments.lexers.templates', 'HTML+Handlebars', ('html+handlebars',), ('*.handlebars', '*.hbs'), ('text/html+handlebars', 'text/x-handlebars-template')),
     #'HandlebarsLexer': ('pygments.lexers.templates', 'Handlebars', ('handlebars',), (), ()),
     'HaskellLexer': ('pygments.lexers.haskell', 'Haskell', ('haskell', 'hs'), ('*.hs',), ('text/x-haskell',)),
     'HaxeLexer': ('pygments.lexers.haxe', 'Haxe', ('hx', 'haxe', 'hxsl'), ('*.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',), (), ()),
     #'HtmlDjangoLexer': ('pygments.lexers.templates', 'HTML+Django/Jinja', ('html+django', 'html+jinja', 'htmldjango'), (), ('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',), ('text/html', 'application/xhtml+xml')),
+    'HtmlLexer': ('pygments.lexers.html', 'HTML', ('html',), ('*.html', '*.htm', '*.xhtml', '*.xslt'), ('text/html', 'application/xhtml+xml')),
     #'HtmlPhpLexer': ('pygments.lexers.templates', 'HTML+PHP', ('html+php',), ('*.phtml',), ('application/x-php', 'application/x-httpd-php', 'application/x-httpd-php3', 'application/x-httpd-php4', 'application/x-httpd-php5')),
     #'HtmlSmartyLexer': ('pygments.lexers.templates', 'HTML+Smarty', ('html+smarty',), (), ('text/html+smarty',)),
     #'HttpLexer': ('pygments.lexers.textfmts', 'HTTP', ('http',), (), ()),
@@ -178,33 +211,39 @@
     #'HyLexer': ('pygments.lexers.lisp', 'Hy', ('hylang',), ('*.hy',), ('text/x-hy', 'application/x-hy')),
     #'HybrisLexer': ('pygments.lexers.scripting', 'Hybris', ('hybris', 'hy'), ('*.hy', '*.hyb'), ('text/x-hybris', 'application/x-hybris')),
     #'IDLLexer': ('pygments.lexers.idl', 'IDL', ('idl',), ('*.pro',), ('text/idl',)),
+    'IconLexer': ('pygments.lexers.unicon', 'Icon', ('icon',), ('*.icon', '*.ICON'), ()),
     #'IdrisLexer': ('pygments.lexers.haskell', 'Idris', ('idris', 'idr'), ('*.idr',), ('text/x-idris',)),
     #'IgorLexer': ('pygments.lexers.igor', 'Igor', ('igor', 'igorpro'), ('*.ipf',), ('text/ipf',)),
     #'Inform6Lexer': ('pygments.lexers.int_fiction', 'Inform 6', ('inform6', 'i6'), ('*.inf',), ()),
     #'Inform6TemplateLexer': ('pygments.lexers.int_fiction', 'Inform 6 template', ('i6t',), ('*.i6t',), ()),
     #'Inform7Lexer': ('pygments.lexers.int_fiction', 'Inform 7', ('inform7', 'i7'), ('*.ni', '*.i7x'), ()),
-    #'IniLexer': ('pygments.lexers.configs', 'INI', ('ini', 'cfg', 'dosini'), ('*.ini', '*.cfg'), ('text/x-ini',)),
+    #'IniLexer': ('pygments.lexers.configs', 'INI', ('ini', 'cfg', 'dosini'), ('*.ini', '*.cfg', '*.inf'), ('text/x-ini', 'text/inf')),
     #'IoLexer': ('pygments.lexers.iolang', 'Io', ('io',), ('*.io',), ('text/x-iosrc',)),
     #'IokeLexer': ('pygments.lexers.jvm', 'Ioke', ('ioke', 'ik'), ('*.ik',), ('text/x-iokesrc',)),
     #'IrcLogsLexer': ('pygments.lexers.textfmts', 'IRC logs', ('irc',), ('*.weechatlog',), ('text/x-irclog',)),
     #'IsabelleLexer': ('pygments.lexers.theorem', 'Isabelle', ('isabelle',), ('*.thy',), ('text/x-isabelle',)),
-    #'JadeLexer': ('pygments.lexers.html', 'Jade', ('jade',), ('*.jade',), ('text/x-jade',)),
+    'JLexer': ('pygments.lexers.j', 'J', ('j',), ('*.ijs',), ('text/x-j',)),
     #'JagsLexer': ('pygments.lexers.modeling', 'JAGS', ('jags',), ('*.jag', '*.bug'), ()),
     #'JasminLexer': ('pygments.lexers.jvm', 'Jasmin', ('jasmin', 'jasminxt'), ('*.j',), ()),
-    'JavaLexer': ('pygments.lexers.jvm', 'Java', ('java',), ('*.java', ), ('text/x-java',)),
+    'JavaLexer': ('pygments.lexers.jvm', 'Java', ('java',), ('*.java',), ('text/x-java',)),
     #'JavascriptDjangoLexer': ('pygments.lexers.templates', 'JavaScript+Django/Jinja', ('js+django', 'javascript+django', 'js+jinja', 'javascript+jinja'), (), ('application/x-javascript+django', 'application/x-javascript+jinja', 'text/x-javascript+django', 'text/x-javascript+jinja', 'text/javascript+django', 'text/javascript+jinja')),
     #'JavascriptErbLexer': ('pygments.lexers.templates', 'JavaScript+Ruby', ('js+erb', 'javascript+erb', 'js+ruby', 'javascript+ruby'), (), ('application/x-javascript+ruby', 'text/x-javascript+ruby', 'text/javascript+ruby')),
     #'JavascriptGenshiLexer': ('pygments.lexers.templates', 'JavaScript+Genshi Text', ('js+genshitext', 'js+genshi', 'javascript+genshitext', 'javascript+genshi'), (), ('application/x-javascript+genshi', 'text/x-javascript+genshi', 'text/javascript+genshi')),
-    'JavascriptLexer': ('pygments.lexers.javascript', 'JavaScript', ('js', 'javascript'), ('*.js',), ('application/javascript', 'application/x-javascript', 'text/x-javascript', 'text/javascript')),
+    'JavascriptLexer': ('pygments.lexers.javascript', 'JavaScript', ('js', 'javascript'), ('*.js', '*.jsm', '*.mjs'), ('application/javascript', 'application/x-javascript', 'text/x-javascript', 'text/javascript')),
     #'JavascriptPhpLexer': ('pygments.lexers.templates', 'JavaScript+PHP', ('js+php', 'javascript+php'), (), ('application/x-javascript+php', 'text/x-javascript+php', 'text/javascript+php')),
     #'JavascriptSmartyLexer': ('pygments.lexers.templates', 'JavaScript+Smarty', ('js+smarty', 'javascript+smarty'), (), ('application/x-javascript+smarty', 'text/x-javascript+smarty', 'text/javascript+smarty')),
+    'JclLexer': ('pygments.lexers.scripting', 'JCL', ('jcl',), ('*.jcl',), ('text/x-jcl',)),
+    'JsgfLexer': ('pygments.lexers.grammar_notation', 'JSGF', ('jsgf',), ('*.jsgf',), ('application/jsgf', 'application/x-jsgf', 'text/jsgf')),
+    'JsonBareObjectLexer': ('pygments.lexers.data', 'JSONBareObject', ('json-object',), (), ('application/json-object',)),
     'JsonLdLexer': ('pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
-    'JsonLexer': ('pygments.lexers.data', 'JSON', ('json',), ('*.json',), ('application/json',)),
+    'JsonLexer': ('pygments.lexers.data', 'JSON', ('json',), ('*.json', 'Pipfile.lock'), ('application/json',)),
     #'JspLexer': ('pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)),
     #'JuliaConsoleLexer': ('pygments.lexers.julia', 'Julia console', ('jlcon',), (), ()),
     #'JuliaLexer': ('pygments.lexers.julia', 'Julia', ('julia', 'jl'), ('*.jl',), ('text/x-julia', 'application/x-julia')),
+    'JuttleLexer': ('pygments.lexers.javascript', 'Juttle', ('juttle', 'juttle'), ('*.juttle',), ('application/juttle', 'application/x-juttle', 'text/x-juttle', 'text/juttle')),
     #'KalLexer': ('pygments.lexers.javascript', 'Kal', ('kal',), ('*.kal',), ('text/kal', 'application/kal')),
-    #'KconfigLexer': ('pygments.lexers.configs', 'Kconfig', ('kconfig', 'menuconfig', 'linux-config', 'kernel-config'), ('Kconfig', '*Config.in*', 'external.in*', 'standard-modules.in'), ('text/x-kconfig',)),
+    #'KconfigLexer': ('pygments.lexers.configs', 'Kconfig', ('kconfig', 'menuconfig', 'linux-config', 'kernel-config'), ('Kconfig*', '*Config.in*', 'external.in*', 'standard-modules.in'), ('text/x-kconfig',)),
+    'KernelLogLexer': ('pygments.lexers.textfmts', 'Kernel log', ('kmsg', 'dmesg'), ('*.kmsg', '*.dmesg'), ()),
     #'KokaLexer': ('pygments.lexers.haskell', 'Koka', ('koka',), ('*.kk', '*.kki'), ('text/x-koka',)),
     'KotlinLexer': ('pygments.lexers.jvm', 'Kotlin', ('kotlin',), ('*.kt',), ('text/x-kotlin',)),
     #'LSLLexer': ('pygments.lexers.scripting', 'LSL', ('lsl',), ('*.lsl',), ('text/x-lsl',)),
@@ -214,6 +253,7 @@
     #'LassoLexer': ('pygments.lexers.javascript', 'Lasso', ('lasso', 'lassoscript'), ('*.lasso', '*.lasso[89]'), ('text/x-lasso',)),
     #'LassoXmlLexer': ('pygments.lexers.templates', 'XML+Lasso', ('xml+lasso',), (), ('application/xml+lasso',)),
     #'LeanLexer': ('pygments.lexers.theorem', 'Lean', ('lean',), ('*.lean',), ('text/x-lean',)),
+    'LessCssLexer': ('pygments.lexers.css', 'LessCss', ('less',), ('*.less',), ('text/x-less-css',)),
     #'LighttpdConfLexer': ('pygments.lexers.configs', 'Lighttpd configuration file', ('lighty', 'lighttpd'), (), ('text/x-lighttpd-conf',)),
     #'LimboLexer': ('pygments.lexers.inferno', 'Limbo', ('limbo',), ('*.b',), ('text/limbo',)),
     #'LiquidLexer': ('pygments.lexers.templates', 'liquid', ('liquid',), ('*.liquid',), ()),
@@ -223,10 +263,14 @@
     #'LiterateIdrisLexer': ('pygments.lexers.haskell', 'Literate Idris', ('lidr', 'literate-idris', 'lidris'), ('*.lidr',), ('text/x-literate-idris',)),
     #'LiveScriptLexer': ('pygments.lexers.javascript', 'LiveScript', ('live-script', 'livescript'), ('*.ls',), ('text/livescript',)),
     #'LlvmLexer': ('pygments.lexers.asm', 'LLVM', ('llvm',), ('*.ll',), ('text/x-llvm',)),
+    'LlvmMirBodyLexer': ('pygments.lexers.asm', 'LLVM-MIR Body', ('llvm-mir-body',), (), ()),
+    'LlvmMirLexer': ('pygments.lexers.asm', 'LLVM-MIR', ('llvm-mir',), ('*.mir',), ()),
     #'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')),
+    'MIMELexer': ('pygments.lexers.mime', 'MIME', ('mime',), (), ('multipart/mixed', 'multipart/related', 'multipart/alternative')),
     #'MOOCodeLexer': ('pygments.lexers.scripting', 'MOOCode', ('moocode', 'moo'), ('*.moo',), ('text/x-moocode',)),
+    'MSDOSSessionLexer': ('pygments.lexers.shell', 'MSDOS Session', ('doscon',), (), ()),
     #'MakefileLexer': ('pygments.lexers.make', 'Makefile', ('make', 'makefile', 'mf', 'bsdmake'), ('*.mak', '*.mk', 'Makefile', 'makefile', 'Makefile.*', 'GNUmakefile'), ('text/x-makefile',)),
     #'MakoCssLexer': ('pygments.lexers.templates', 'CSS+Mako', ('css+mako',), (), ('text/css+mako',)),
     #'MakoHtmlLexer': ('pygments.lexers.templates', 'HTML+Mako', ('html+mako',), (), ('text/html+mako',)),
@@ -234,17 +278,21 @@
     #'MakoLexer': ('pygments.lexers.templates', 'Mako', ('mako',), ('*.mao',), ('application/x-mako',)),
     #'MakoXmlLexer': ('pygments.lexers.templates', 'XML+Mako', ('xml+mako',), (), ('application/xml+mako',)),
     #'MaqlLexer': ('pygments.lexers.business', 'MAQL', ('maql',), ('*.maql',), ('text/x-gooddata-maql', 'application/x-gooddata-maql')),
+    'MarkdownLexer': ('pygments.lexers.markup', 'markdown', ('md',), ('*.md', '*.markdown'), ('text/x-markdown',)),
     #'MaskLexer': ('pygments.lexers.javascript', 'Mask', ('mask',), ('*.mask',), ('text/x-mask',)),
     #'MasonLexer': ('pygments.lexers.templates', 'Mason', ('mason',), ('*.m', '*.mhtml', '*.mc', '*.mi', 'autohandler', 'dhandler'), ('application/x-mason',)),
     #'MathematicaLexer': ('pygments.lexers.algebra', 'Mathematica', ('mathematica', 'mma', 'nb'), ('*.nb', '*.cdf', '*.nbp', '*.ma'), ('application/mathematica', 'application/vnd.wolfram.mathematica', 'application/vnd.wolfram.mathematica.package', 'application/vnd.wolfram.cdf')),
     #'MatlabLexer': ('pygments.lexers.matlab', 'Matlab', ('matlab',), ('*.m',), ('text/matlab',)),
     #'MatlabSessionLexer': ('pygments.lexers.matlab', 'Matlab session', ('matlabsession',), (), ()),
     #'MiniDLexer': ('pygments.lexers.d', 'MiniD', ('minid',), (), ('text/x-minidsrc',)),
+    'MiniScriptLexer': ('pygments.lexers.scripting', 'MiniScript', ('ms', 'miniscript'), ('*.ms',), ('text/x-minicript', 'application/x-miniscript')),
     #'ModelicaLexer': ('pygments.lexers.modeling', 'Modelica', ('modelica',), ('*.mo',), ('text/x-modelica',)),
-    #'Modula2Lexer': ('pygments.lexers.pascal', 'Modula-2', ('modula2', 'm2'), ('*.def', '*.mod'), ('text/x-modula2',)),
+    #'Modula2Lexer': ('pygments.lexers.modula2', 'Modula-2', ('modula2', 'm2'), ('*.def', '*.mod'), ('text/x-modula2',)),
     #'MoinWikiLexer': ('pygments.lexers.markup', 'MoinMoin/Trac Wiki markup', ('trac-wiki', 'moin'), (), ('text/x-trac-wiki',)),
     #'MonkeyLexer': ('pygments.lexers.basic', 'Monkey', ('monkey',), ('*.monkey',), ('text/x-monkey',)),
+    'MonteLexer': ('pygments.lexers.monte', 'Monte', ('monte',), ('*.mt',), ()),
     #'MoonScriptLexer': ('pygments.lexers.scripting', 'MoonScript', ('moon', 'moonscript'), ('*.moon',), ('text/x-moonscript', 'application/x-moonscript')),
+    'MoselLexer': ('pygments.lexers.mosel', 'Mosel', ('mosel',), ('*.mos',), ()),
     #'MozPreprocCssLexer': ('pygments.lexers.markup', 'CSS+mozpreproc', ('css+mozpreproc',), ('*.css.in',), ()),
     #'MozPreprocHashLexer': ('pygments.lexers.markup', 'mozhashpreproc', ('mozhashpreproc',), (), ()),
     #'MozPreprocJavascriptLexer': ('pygments.lexers.markup', 'Javascript+mozpreproc', ('javascript+mozpreproc',), ('*.js.in',), ()),
@@ -260,17 +308,20 @@
     #'MyghtyJavascriptLexer': ('pygments.lexers.templates', 'JavaScript+Myghty', ('js+myghty', 'javascript+myghty'), (), ('application/x-javascript+myghty', 'text/x-javascript+myghty', 'text/javascript+mygthy')),
     #'MyghtyLexer': ('pygments.lexers.templates', 'Myghty', ('myghty',), ('*.myt', 'autodelegate'), ('application/x-myghty',)),
     #'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',)),
     #'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',)),
-    #'NewLispLexer': ('pygments.lexers.lisp', 'NewLisp', ('newlisp',), ('*.lsp', '*.nl'), ('text/x-newlisp', 'application/x-newlisp')),
+    #'NewLispLexer': ('pygments.lexers.lisp', 'NewLisp', ('newlisp',), ('*.lsp', '*.nl', '*.kif'), ('text/x-newlisp', 'application/x-newlisp')),
     #'NewspeakLexer': ('pygments.lexers.smalltalk', 'Newspeak', ('newspeak',), ('*.ns2',), ('text/x-newspeak',)),
-    #'NginxConfLexer': ('pygments.lexers.configs', 'Nginx configuration file', ('nginx',), (), ('text/x-nginx-conf',)),
-    #'NimrodLexer': ('pygments.lexers.nimrod', 'Nimrod', ('nimrod', 'nim'), ('*.nim', '*.nimrod'), ('text/x-nimrod',)),
+    #'NginxConfLexer': ('pygments.lexers.configs', 'Nginx configuration file', ('nginx',), ('nginx.conf',), ('text/x-nginx-conf',)),
+    #'NimrodLexer': ('pygments.lexers.nimrod', 'Nimrod', ('nim', 'nimrod'), ('*.nim', '*.nimrod'), ('text/x-nim',)),
     #'NitLexer': ('pygments.lexers.nit', 'Nit', ('nit',), ('*.nit',), ()),
     #'NixLexer': ('pygments.lexers.nix', 'Nix', ('nixos', 'nix'), ('*.nix',), ('text/x-nix',)),
+    'NotmuchLexer': ('pygments.lexers.textfmts', 'Notmuch', ('notmuch',), (), ()),
+    'NuSMVLexer': ('pygments.lexers.smv', 'NuSMV', ('nusmv',), ('*.smv',), ()),
     #'NumPyLexer': ('pygments.lexers.python', 'NumPy', ('numpy',), (), ()),
     #'ObjdumpLexer': ('pygments.lexers.asm', 'objdump', ('objdump',), ('*.objdump',), ('text/x-objdump',)),
     'ObjectiveCLexer': ('pygments.lexers.objective', 'Objective-C', ('objective-c', 'objectivec', 'obj-c', 'objc'), ('*.m', '*.h'), ('text/x-objective-c',)),
@@ -278,35 +329,49 @@
     'ObjectiveJLexer': ('pygments.lexers.javascript', 'Objective-J', ('objective-j', 'objectivej', 'obj-j', 'objj'), ('*.j',), ('text/x-objective-j',)),
     'OcamlLexer': ('pygments.lexers.ml', 'OCaml', ('ocaml',), ('*.ml', '*.mli', '*.mll', '*.mly'), ('text/x-ocaml',)),
     #'OctaveLexer': ('pygments.lexers.matlab', 'Octave', ('octave',), ('*.m',), ('text/octave',)),
+    'OdinLexer': ('pygments.lexers.archetype', 'ODIN', ('odin',), ('*.odin',), ('text/odin',)),
     #'OocLexer': ('pygments.lexers.ooc', 'Ooc', ('ooc',), ('*.ooc',), ('text/x-ooc',)),
     #'OpaLexer': ('pygments.lexers.ml', 'Opa', ('opa',), ('*.opa',), ('text/x-opa',)),
     #'OpenEdgeLexer': ('pygments.lexers.business', 'OpenEdge ABL', ('openedge', 'abl', 'progress'), ('*.p', '*.cls'), ('text/x-openedge', 'application/x-openedge')),
+    'PacmanConfLexer': ('pygments.lexers.configs', 'PacmanConf', ('pacmanconf',), ('pacman.conf',), ()),
     #'PanLexer': ('pygments.lexers.dsls', 'Pan', ('pan',), ('*.pan',), ()),
+    'ParaSailLexer': ('pygments.lexers.parasail', 'ParaSail', ('parasail',), ('*.psi', '*.psl'), ('text/x-parasail',)),
     #'PawnLexer': ('pygments.lexers.pawn', 'Pawn', ('pawn',), ('*.p', '*.pwn', '*.inc'), ('text/x-pawn',)),
-    'Perl6Lexer': ('pygments.lexers.perl', 'Perl6', ('perl6', 'pl6'), ('*.pl', '*.pm', '*.nqp', '*.p6', '*.6pl', '*.p6l', '*.pl6', '*.6pm', '*.p6m', '*.pm6', '*.t'), ('text/x-perl6', 'application/x-perl6')),
-    'PerlLexer': ('pygments.lexers.perl', 'Perl', ('perl', 'pl'), ('*.pl', '*.pm', '*.t'), ('text/x-perl', 'application/x-perl')),
-    'PhpLexer': ('pygments.lexers.php', 'PHP', ('php', 'php3', 'php4', 'php5'), ('*.php', '*.php[345]'), ('text/x-php',)),
+    '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')),
+    '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',)),
+    'PkgConfigLexer': ('pygments.lexers.configs', 'PkgConfig', ('pkgconfig',), ('*.pc',), ()),
     #'PlPgsqlLexer': ('pygments.lexers.sql', 'PL/pgSQL', ('plpgsql',), (), ('text/x-plpgsql',)),
+    'PointlessLexer': ('pygments.lexers.pointless', 'Pointless', ('pointless',), ('*.ptls',), ()),
+    'PonyLexer': ('pygments.lexers.pony', 'Pony', ('pony',), ('*.pony',), ()),
     #'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',)),
     #'PovrayLexer': ('pygments.lexers.graphics', 'POVRay', ('pov',), ('*.pov', '*.inc'), ('text/x-povray',)),
     'PowerShellLexer': ('pygments.lexers.shell', 'PowerShell', ('powershell', 'posh', 'ps1', 'psm1'), ('*.ps1', '*.psm1'), ('text/x-powershell',)),
+    'PowerShellSessionLexer': ('pygments.lexers.shell', 'PowerShell Session', ('ps1con',), (), ()),
+    'PraatLexer': ('pygments.lexers.praat', 'Praat', ('praat',), ('*.praat', '*.proc', '*.psc'), ()),
     'PrologLexer': ('pygments.lexers.prolog', 'Prolog', ('prolog',), ('*.ecl', '*.prolog', '*.pro', '*.pl'), ('text/x-prolog',)),
+    'PromQLLexer': ('pygments.lexers.promql', 'PromQL', ('promql',), ('*.promql',), ()),
     #'PropertiesLexer': ('pygments.lexers.configs', 'Properties', ('properties', 'jproperties'), ('*.properties',), ('text/x-java-properties',)),
     #'ProtoBufLexer': ('pygments.lexers.dsls', 'Protocol Buffer', ('protobuf', 'proto'), ('*.proto',), ()),
+    'PsyshConsoleLexer': ('pygments.lexers.php', 'PsySH console session for PHP', ('psysh',), (), ()),
+    'PugLexer': ('pygments.lexers.html', 'Pug', ('pug', 'jade'), ('*.pug', '*.jade'), ('text/x-pug', 'text/x-jade')),
     #'PuppetLexer': ('pygments.lexers.dsls', 'Puppet', ('puppet',), ('*.pp',), ()),
     #'PyPyLogLexer': ('pygments.lexers.console', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
-    'Python3Lexer': ('pygments.lexers.python', 'Python 3', ('python3', 'py3'), (), ('text/x-python3', 'application/x-python3')),
-    #'Python3TracebackLexer': ('pygments.lexers.python', 'Python 3.0 Traceback', ('py3tb',), ('*.py3tb',), ('text/x-python3-traceback',)),
+    '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'), ('*.py', '*.pyw', '*.sc', 'SConstruct', 'SConscript', '*.tac', '*.sage'), ('text/x-python', 'application/x-python')),
-    #'PythonTracebackLexer': ('pygments.lexers.python', 'Python Traceback', ('pytb',), ('*.pytb',), ('text/x-python-traceback',)),
+    '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')),
+    #'PythonTracebackLexer': ('pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
     #'QBasicLexer': ('pygments.lexers.basic', 'QBasic', ('qbasic', 'basic'), ('*.BAS', '*.bas'), ('text/basic',)),
-    #'QmlLexer': ('pygments.lexers.webmisc', 'QML', ('qml',), ('*.qml',), ('application/x-qml',)),
+    'QVToLexer': ('pygments.lexers.qvt', 'QVTO', ('qvto', 'qvt'), ('*.qvto',), ()),
+    #'QmlLexer': ('pygments.lexers.webmisc', 'QML', ('qml', 'qbs'), ('*.qml', '*.qbs'), ('application/x-qml', 'application/x-qt.qbs+qml')),
     #'RConsoleLexer': ('pygments.lexers.r', 'RConsole', ('rconsole', 'rout'), ('*.Rout',), ()),
+    'RNCCompactLexer': ('pygments.lexers.rnc', 'Relax-NG Compact', ('rnc', 'rng-compact'), ('*.rnc',), ()),
     #'RPMSpecLexer': ('pygments.lexers.installers', 'RPMSpec', ('spec',), ('*.spec',), ('text/x-rpm-spec',)),
     #'RacketLexer': ('pygments.lexers.lisp', 'Racket', ('racket', 'rkt'), ('*.rkt', '*.rktd', '*.rktl'), ('text/x-racket', 'application/x-racket')),
     #'RagelCLexer': ('pygments.lexers.parsers', 'Ragel in C Host', ('ragel-c',), ('*.rl',), ()),
@@ -319,34 +384,51 @@
     #'RagelRubyLexer': ('pygments.lexers.parsers', 'Ragel in Ruby Host', ('ragel-ruby', 'ragel-rb'), ('*.rl',), ()),
     #'RawTokenLexer': ('pygments.lexers.special', 'Raw token data', ('raw',), (), ('application/x-pygments-tokens',)),
     #'RdLexer': ('pygments.lexers.r', 'Rd', ('rd',), ('*.Rd',), ('text/x-r-doc',)),
+    'ReasonLexer': ('pygments.lexers.ml', 'ReasonML', ('reason', 'reasonml'), ('*.re', '*.rei'), ('text/x-reasonml',)),
     #'RebolLexer': ('pygments.lexers.rebol', 'REBOL', ('rebol',), ('*.r', '*.r3', '*.reb'), ('text/x-rebol',)),
     #'RedLexer': ('pygments.lexers.rebol', 'Red', ('red', 'red/system'), ('*.red', '*.reds'), ('text/x-red', 'text/x-red-system')),
     #'RedcodeLexer': ('pygments.lexers.esoteric', 'Redcode', ('redcode',), ('*.cw',), ()),
     #'RegeditLexer': ('pygments.lexers.configs', 'reg', ('registry',), ('*.reg',), ('text/x-windows-registry',)),
-    #'ResourceLexer': ('pygments.lexers.resource', 'ResourceBundle', ('resource', 'resourcebundle'), ('*.txt',), ()),
+    #'ResourceLexer': ('pygments.lexers.resource', 'ResourceBundle', ('resource', 'resourcebundle'), (), ()),
     #'RexxLexer': ('pygments.lexers.scripting', 'Rexx', ('rexx', 'arexx'), ('*.rexx', '*.rex', '*.rx', '*.arexx'), ('text/x-rexx',)),
     #'RhtmlLexer': ('pygments.lexers.templates', 'RHTML', ('rhtml', 'html+erb', 'html+ruby'), ('*.rhtml',), ('text/html+ruby',)),
-    #'RobotFrameworkLexer': ('pygments.lexers.robotframework', 'RobotFramework', ('robotframework',), ('*.txt', '*.robot'), ('text/x-robotframework',)),
+    'RideLexer': ('pygments.lexers.ride', 'Ride', ('ride',), ('*.ride',), ('text/x-ride',)),
+    'RoboconfGraphLexer': ('pygments.lexers.roboconf', 'Roboconf Graph', ('roboconf-graph',), ('*.graph',), ()),
+    'RoboconfInstancesLexer': ('pygments.lexers.roboconf', 'Roboconf Instances', ('roboconf-instances',), ('*.instances',), ()),
+    #'RobotFrameworkLexer': ('pygments.lexers.robotframework', 'RobotFramework', ('robotframework',), ('*.robot',), ('text/x-robotframework',)),
     #'RqlLexer': ('pygments.lexers.sql', 'RQL', ('rql',), ('*.rql',), ('text/x-rql',)),
     #'RslLexer': ('pygments.lexers.dsls', 'RSL', ('rsl',), ('*.rsl',), ('text/rsl',)),
     #'RstLexer': ('pygments.lexers.markup', 'reStructuredText', ('rst', 'rest', 'restructuredtext'), ('*.rst', '*.rest'), ('text/x-rst', 'text/prs.fallenstein.rst')),
+    'RtsLexer': ('pygments.lexers.trafficscript', 'TrafficScript', ('rts', 'trafficscript'), ('*.rts',), ()),
     #'RubyConsoleLexer': ('pygments.lexers.ruby', 'Ruby irb session', ('rbcon', 'irb'), (), ('text/x-ruby-shellsession',)),
-    'RubyLexer': ('pygments.lexers.ruby', 'Ruby', ('rb', 'ruby', 'duby'), ('*.rb', '*.rbw', 'Rakefile', '*.rake', '*.gemspec', '*.rbx', '*.duby'), ('text/x-ruby', 'application/x-ruby')),
-    'RustLexer': ('pygments.lexers.rust', 'Rust', ('rust',), ('*.rs',), ('text/x-rustsrc',)),
+    'RubyLexer': ('pygments.lexers.ruby', 'Ruby', ('rb', 'ruby', 'duby'), ('*.rb', '*.rbw', 'Rakefile', '*.rake', '*.gemspec', '*.rbx', '*.duby', 'Gemfile'), ('text/x-ruby', 'application/x-ruby')),
+    'RustLexer': ('pygments.lexers.rust', 'Rust', ('rust', 'rs'), ('*.rs', '*.rs.in'), ('text/rust', 'text/x-rust')),
+    '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')),
+    'SarlLexer': ('pygments.lexers.jvm', 'SARL', ('sarl',), ('*.sarl',), ('text/x-sarl',)),
     'SassLexer': ('pygments.lexers.css', 'Sass', ('sass',), ('*.sass',), ('text/x-sass',)),
     'ScalaLexer': ('pygments.lexers.jvm', 'Scala', ('scala',), ('*.scala',), ('text/x-scala',)),
     #'ScamlLexer': ('pygments.lexers.html', 'Scaml', ('scaml',), ('*.scaml',), ('text/x-scaml',)),
+    'ScdocLexer': ('pygments.lexers.scdoc', 'scdoc', ('scdoc', 'scd'), ('*.scd', '*.scdoc'), ()),
     #'SchemeLexer': ('pygments.lexers.lisp', 'Scheme', ('scheme', 'scm'), ('*.scm', '*.ss'), ('text/x-scheme', 'application/x-scheme')),
     #'ScilabLexer': ('pygments.lexers.matlab', 'Scilab', ('scilab',), ('*.sci', '*.sce', '*.tst'), ('text/scilab',)),
     'ScssLexer': ('pygments.lexers.css', 'SCSS', ('scss',), ('*.scss',), ('text/x-scss',)),
-    #'ShellSessionLexer': ('pygments.lexers.shell', 'Shell Session', ('shell-session',), ('*.shell-session',), ('application/x-sh-session',)),
+    'ShExCLexer': ('pygments.lexers.rdf', 'ShExC', ('shexc', 'shex'), ('*.shex',), ('text/shex',)),
+    'ShenLexer': ('pygments.lexers.lisp', 'Shen', ('shen',), ('*.shen',), ('text/x-shen', 'application/x-shen')),
+    'SieveLexer': ('pygments.lexers.sieve', 'Sieve', ('sieve',), ('*.siv', '*.sieve'), ()),
+    'SilverLexer': ('pygments.lexers.verification', 'Silver', ('silver',), ('*.sil', '*.vpr'), ()),
+    'SingularityLexer': ('pygments.lexers.configs', 'Singularity', ('singularity',), ('*.def', 'Singularity'), ()),
+    'SlashLexer': ('pygments.lexers.slash', 'Slash', ('slash',), ('*.sl',), ()),
     #'SlimLexer': ('pygments.lexers.webmisc', 'Slim', ('slim',), ('*.slim',), ('text/x-slim',)),
+    'SlurmBashLexer': ('pygments.lexers.shell', 'Slurm', ('slurm', 'sbatch'), ('*.sl',), ()),
     #'SmaliLexer': ('pygments.lexers.dalvik', 'Smali', ('smali',), ('*.smali',), ('text/smali',)),
     'SmalltalkLexer': ('pygments.lexers.smalltalk', 'Smalltalk', ('smalltalk', 'squeak', 'st'), ('*.st',), ('text/x-smalltalk',)),
+    'SmartGameFormatLexer': ('pygments.lexers.sgf', 'SmartGameFormat', ('sgf',), ('*.sgf',), ()),
     #'SmartyLexer': ('pygments.lexers.templates', 'Smarty', ('smarty',), ('*.tpl',), ('application/x-smarty',)),
     #'SnobolLexer': ('pygments.lexers.snobol', 'Snobol', ('snobol',), ('*.snobol',), ('text/x-snobol',)),
+    'SnowballLexer': ('pygments.lexers.dsls', 'Snowball', ('snowball',), ('*.sbl',), ()),
+    'SolidityLexer': ('pygments.lexers.solidity', 'Solidity', ('solidity',), ('*.sol',), ()),
     #'SourcePawnLexer': ('pygments.lexers.pawn', 'SourcePawn', ('sp',), ('*.sp',), ('text/x-sourcepawn',)),
     #'SourcesListLexer': ('pygments.lexers.installers', 'Debian Sourcelist', ('sourceslist', 'sources.list', 'debsources'), ('sources.list',), ()),
     #'SparqlLexer': ('pygments.lexers.rdf', 'SPARQL', ('sparql',), ('*.rq', '*.sparql'), ('application/sparql-query',)),
@@ -355,21 +437,45 @@
     #'SquidConfLexer': ('pygments.lexers.configs', 'SquidConf', ('squidconf', 'squid.conf', 'squid'), ('squid.conf',), ('text/x-squidconf',)),
     #'SspLexer': ('pygments.lexers.templates', 'Scalate Server Page', ('ssp',), ('*.ssp',), ('application/x-ssp',)),
     #'StanLexer': ('pygments.lexers.modeling', 'Stan', ('stan',), ('*.stan',), ()),
+    'StataLexer': ('pygments.lexers.stata', 'Stata', ('stata', 'do'), ('*.do', '*.ado'), ('text/x-stata', 'text/stata', 'application/x-stata')),
+    'SuperColliderLexer': ('pygments.lexers.supercollider', 'SuperCollider', ('sc', 'supercollider'), ('*.sc', '*.scd'), ('application/supercollider', 'text/supercollider')),
     'SwiftLexer': ('pygments.lexers.objective', 'Swift', ('swift',), ('*.swift',), ('text/x-swift',)),
     #'SwigLexer': ('pygments.lexers.c_like', 'SWIG', ('swig',), ('*.swg', '*.i'), ('text/swig',)),
     #'SystemVerilogLexer': ('pygments.lexers.hdl', 'systemverilog', ('systemverilog', 'sv'), ('*.sv', '*.svh'), ('text/x-systemverilog',)),
+    'TAPLexer': ('pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
+    'TNTLexer': ('pygments.lexers.tnt', 'Typographic Number Theory', ('tnt',), ('*.tnt',), ()),
+    'TOMLLexer': ('pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ()),
     #'Tads3Lexer': ('pygments.lexers.int_fiction', 'TADS 3', ('tads3',), ('*.t',), ()),
+    'TasmLexer': ('pygments.lexers.asm', 'TASM', ('tasm',), ('*.asm', '*.ASM', '*.tasm'), ('text/x-tasm',)),
     'TclLexer': ('pygments.lexers.tcl', 'Tcl', ('tcl',), ('*.tcl', '*.rvt'), ('text/x-tcl', 'text/x-script.tcl', 'application/x-tcl')),
     'TcshLexer': ('pygments.lexers.shell', 'Tcsh', ('tcsh', 'csh'), ('*.tcsh', '*.csh'), ('application/x-csh',)),
+    'TcshSessionLexer': ('pygments.lexers.shell', 'Tcsh Session', ('tcshcon',), (), ()),
     #'TeaTemplateLexer': ('pygments.lexers.templates', 'Tea', ('tea',), ('*.tea',), ('text/x-tea',)),
+    'TeraTermLexer': ('pygments.lexers.teraterm', 'Tera Term macro', ('ttl', 'teraterm', 'teratermmacro'), ('*.ttl',), ('text/x-teratermmacro',)),
+    'TermcapLexer': ('pygments.lexers.configs', 'Termcap', ('termcap',), ('termcap', 'termcap.src'), ()),
+    'TerminfoLexer': ('pygments.lexers.configs', 'Terminfo', ('terminfo',), ('terminfo', 'terminfo.src'), ()),
+    'TerraformLexer': ('pygments.lexers.configs', 'Terraform', ('terraform', 'tf'), ('*.tf',), ('application/x-tf', 'application/x-terraform')),
     #'TexLexer': ('pygments.lexers.markup', 'TeX', ('tex', 'latex'), ('*.tex', '*.aux', '*.toc'), ('text/x-tex', 'text/x-latex')),
     #'TextLexer': ('pygments.lexers.special', 'Text only', ('text',), ('*.txt',), ('text/plain',)),
+    'ThriftLexer': ('pygments.lexers.dsls', 'Thrift', ('thrift',), ('*.thrift',), ('application/x-thrift',)),
+    'TiddlyWiki5Lexer': ('pygments.lexers.markup', 'tiddler', ('tid',), ('*.tid',), ('text/vnd.tiddlywiki',)),
     #'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'), ()),
+    'TurtleLexer': ('pygments.lexers.rdf', 'Turtle', ('turtle',), ('*.ttl',), ('text/turtle', 'application/x-turtle')),
     #'TwigHtmlLexer': ('pygments.lexers.templates', 'HTML+Twig', ('html+twig',), ('*.twig',), ('text/html+twig',)),
     #'TwigLexer': ('pygments.lexers.templates', 'Twig', ('twig',), (), ('application/x-twig',)),
-    'TypeScriptLexer': ('pygments.lexers.javascript', 'TypeScript', ('ts',), ('*.ts',), ('text/x-typescript',)),
+    'TypeScriptLexer': ('pygments.lexers.javascript', 'TypeScript', ('ts', 'typescript'), ('*.ts', '*.tsx'), ('text/x-typescript',)),
+    'TypoScriptCssDataLexer': ('pygments.lexers.typoscript', 'TypoScriptCssData', ('typoscriptcssdata',), (), ()),
+    'TypoScriptHtmlDataLexer': ('pygments.lexers.typoscript', 'TypoScriptHtmlData', ('typoscripthtmldata',), (), ()),
+    'TypoScriptLexer': ('pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.typoscript',), ('text/x-typoscript',)),
+    'UcodeLexer': ('pygments.lexers.unicon', 'ucode', ('ucode',), ('*.u', '*.u1', '*.u2'), ()),
+    'UniconLexer': ('pygments.lexers.unicon', 'Unicon', ('unicon',), ('*.icn',), ('text/unicon',)),
     #'UrbiscriptLexer': ('pygments.lexers.urbi', 'UrbiScript', ('urbiscript',), ('*.u',), ('application/x-urbiscript',)),
+    'UsdLexer': ('pygments.lexers.usd', 'USD', ('usd', 'usda'), ('*.usd', '*.usda'), ()),
+    'VBScriptLexer': ('pygments.lexers.basic', 'VBScript', ('vbscript',), ('*.vbs', '*.VBS'), ()),
+    'VCLLexer': ('pygments.lexers.varnish', 'VCL', ('vcl',), ('*.vcl',), ('text/x-vclsrc',)),
+    'VCLSnippetLexer': ('pygments.lexers.varnish', 'VCLSnippets', ('vclsnippets', 'vclsnippet'), (), ('text/x-vclsnippet',)),
     #'VCTreeStatusLexer': ('pygments.lexers.console', 'VCTreeStatus', ('vctreestatus',), (), ()),
     #'VGLLexer': ('pygments.lexers.dsls', 'VGL', ('vgl',), ('*.rpf',), ()),
     #'ValaLexer': ('pygments.lexers.c_like', 'Vala', ('vala', 'vapi'), ('*.vala', '*.vapi'), ('text/x-vala',)),
@@ -381,15 +487,71 @@
     'VerilogLexer': ('pygments.lexers.hdl', 'verilog', ('verilog', 'v'), ('*.v',), ('text/x-verilog',)),
     'VhdlLexer': ('pygments.lexers.hdl', 'vhdl', ('vhdl',), ('*.vhdl', '*.vhd'), ('text/x-vhdl',)),
     #'VimLexer': ('pygments.lexers.textedit', 'VimL', ('vim',), ('*.vim', '.vimrc', '.exrc', '.gvimrc', '_vimrc', '_exrc', '_gvimrc', 'vimrc', 'gvimrc'), ('text/x-vim',)),
+    'WDiffLexer': ('pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
+    'WebIDLLexer': ('pygments.lexers.webidl', 'Web IDL', ('webidl',), ('*.webidl',), ()),
+    'WhileyLexer': ('pygments.lexers.whiley', 'Whiley', ('whiley',), ('*.whiley',), ('text/x-whiley',)),
+    'X10Lexer': ('pygments.lexers.x10', 'X10', ('x10', 'xten'), ('*.x10',), ('text/x-x10',)),
     #'XQueryLexer': ('pygments.lexers.webmisc', 'XQuery', ('xquery', 'xqy', 'xq', 'xql', 'xqm'), ('*.xqy', '*.xquery', '*.xq', '*.xql', '*.xqm'), ('text/xquery', 'application/xquery')),
     #'XmlDjangoLexer': ('pygments.lexers.templates', 'XML+Django/Jinja', ('xml+django', 'xml+jinja'), (), ('application/xml+django', 'application/xml+jinja')),
     #'XmlErbLexer': ('pygments.lexers.templates', 'XML+Ruby', ('xml+erb', 'xml+ruby'), (), ('application/xml+ruby',)),
     #'XmlLexer': ('pygments.lexers.html', 'XML', ('xml',), ('*.xml', '*.xsl', '*.rss', '*.xslt', '*.xsd', '*.wsdl', '*.wsf'), ('text/xml', 'application/xml', 'image/svg+xml', 'application/rss+xml', 'application/atom+xml')),
     #'XmlPhpLexer': ('pygments.lexers.templates', 'XML+PHP', ('xml+php',), (), ('application/xml+php',)),
     #'XmlSmartyLexer': ('pygments.lexers.templates', 'XML+Smarty', ('xml+smarty',), (), ('application/xml+smarty',)),
+    'XorgLexer': ('pygments.lexers.xorg', 'Xorg', ('xorg.conf',), ('xorg.conf',), ()),
     #'XsltLexer': ('pygments.lexers.html', 'XSLT', ('xslt',), ('*.xsl', '*.xslt', '*.xpl'), ('application/xsl+xml', 'application/xslt+xml')),
     #'XtendLexer': ('pygments.lexers.jvm', 'Xtend', ('xtend',), ('*.xtend',), ('text/x-xtend',)),
+    'XtlangLexer': ('pygments.lexers.lisp', 'xtlang', ('extempore',), ('*.xtm',), ()),
     #'YamlJinjaLexer': ('pygments.lexers.templates', 'YAML+Jinja', ('yaml+jinja', 'salt', 'sls'), ('*.sls',), ('text/x-yaml+jinja', 'text/x-sls')),
     #'YamlLexer': ('pygments.lexers.data', 'YAML', ('yaml',), ('*.yaml', '*.yml'), ('text/x-yaml',)),
+    'YangLexer': ('pygments.lexers.yang', 'YANG', ('yang',), ('*.yang',), ('application/yang',)),
+    'ZeekLexer': ('pygments.lexers.dsls', 'Zeek', ('zeek', 'bro'), ('*.zeek', '*.bro'), ()),
     #'ZephirLexer': ('pygments.lexers.php', 'Zephir', ('zephir',), ('*.zep',), ()),
+    'ZigLexer': ('pygments.lexers.zig', 'Zig', ('zig',), ('*.zig',), ('text/zig',)),
 }
+
+if __name__ == '__main__':  # pragma: no cover
+    import sys
+    import os
+
+    # lookup lexers
+    found_lexers = []
+    sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
+    for root, dirs, files in os.walk('.'):
+        for filename in files:
+            if filename.endswith('.py') and not filename.startswith('_'):
+                module_name = 'pygments.lexers%s.%s' % (
+                    root[1:].replace('/', '.'), filename[:-3])
+                print(module_name)
+                module = __import__(module_name, None, None, [''])
+                for lexer_name in module.__all__:
+                    lexer = getattr(module, lexer_name)
+                    found_lexers.append(
+                        '%r: %r' % (lexer_name,
+                                    (module_name,
+                                     lexer.name,
+                                     tuple(lexer.aliases),
+                                     tuple(lexer.filenames),
+                                     tuple(lexer.mimetypes))))
+    # sort them to make the diff minimal
+    found_lexers.sort()
+
+    # extract useful sourcecode from this file
+    with open(__file__) as fp:
+        content = fp.read()
+        # replace crnl to nl for Windows.
+        #
+        # Note that, originally, contributers should keep nl of master
+        # repository, for example by using some kind of automatic
+        # management EOL, like `EolExtension
+        #  <https://www.mercurial-scm.org/wiki/EolExtension>`.
+        content = content.replace("\r\n", "\n")
+    header = content[:content.find('LEXERS = {')]
+    footer = content[content.find("if __name__ == '__main__':"):]
+
+    # write new file
+    with open(__file__, 'w') as fp:
+        fp.write(header)
+        fp.write('LEXERS = {\n    %s,\n}\n\n' % ',\n    '.join(found_lexers))
+        fp.write(footer)
+
+    print ('=== %d lexers processed.' % len(found_lexers))
diff --git a/src/typecode/pygments_lexers.py b/src/typecode/pygments_lexers.py
index 509b30a..662f398 100644
--- a/src/typecode/pygments_lexers.py
+++ b/src/typecode/pygments_lexers.py
@@ -5,7 +5,7 @@
 
     Pygments lexers.
 
-    :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2020 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -16,11 +16,17 @@
 from os.path import basename
 
 from typecode.prog_lexers import LEXERS
-
 from pygments.modeline import get_filetype_from_buffer
 from pygments.plugin import find_plugin_lexers
-from pygments.util import ClassNotFound, itervalues, guess_decode
+from pygments.util import ClassNotFound, guess_decode
+
+COMPAT = {
+    'Python3Lexer': 'PythonLexer',
+    'Python3TracebackLexer': 'PythonTracebackLexer',
+}
 
+__all__ = ['get_lexer_by_name', 'get_lexer_for_filename', 'find_lexer_class',
+           'guess_lexer', 'load_lexer_from_file'] + list(LEXERS) + list(COMPAT)
 
 _lexer_cache = {}
 _pattern_cache = {}
@@ -29,7 +35,7 @@
 def _fn_matches(fn, glob):
     """Return whether the supplied file name fn matches pattern filename."""
     if glob not in _pattern_cache:
-        pattern = _pattern_cache[glob] = re.compile(fnmatch.translate(glob), re.IGNORECASE)
+        pattern = _pattern_cache[glob] = re.compile(fnmatch.translate(glob))
         return pattern.match(fn)
     return _pattern_cache[glob].match(fn)
 
@@ -46,7 +52,7 @@ def get_all_lexers():
     """Return a generator of tuples in the form ``(name, aliases,
     filenames, mimetypes)`` of all know lexers.
     """
-    for item in itervalues(LEXERS):
+    for item in LEXERS.values():
         yield item[1:]
     for lexer in find_plugin_lexers():
         yield lexer.name, lexer.aliases, lexer.filenames, lexer.mimetypes
@@ -60,7 +66,7 @@ def find_lexer_class(name):
     if name in _lexer_cache:
         return _lexer_cache[name]
     # lookup builtin lexers
-    for module_name, lname, aliases, _, _ in itervalues(LEXERS):
+    for module_name, lname, aliases, _, _ in LEXERS.values():
         if name == lname:
             _load_lexers(module_name)
             return _lexer_cache[name]
@@ -70,6 +76,28 @@ def find_lexer_class(name):
             return cls
 
 
+def find_lexer_class_by_name(_alias):
+    """Lookup a lexer class by alias.
+
+    Like `get_lexer_by_name`, but does not instantiate the class.
+
+    .. versionadded:: 2.2
+    """
+    if not _alias:
+        raise ClassNotFound('no lexer for alias %r found' % _alias)
+    # lookup builtin lexers
+    for module_name, name, aliases, _, _ in LEXERS.values():
+        if _alias.lower() in aliases:
+            if name not in _lexer_cache:
+                _load_lexers(module_name)
+            return _lexer_cache[name]
+    # continue with lexers from setuptools entrypoints
+    for cls in find_plugin_lexers():
+        if _alias.lower() in cls.aliases:
+            return cls
+    raise ClassNotFound('no lexer for alias %r found' % _alias)
+
+
 def get_lexer_by_name(_alias, **options):
     """Get a lexer by an alias.
 
@@ -79,18 +107,53 @@ def get_lexer_by_name(_alias, **options):
         raise ClassNotFound('no lexer for alias %r found' % _alias)
 
     # lookup builtin lexers
-    for module_name, name, aliases, _, _ in itervalues(LEXERS):
+    for module_name, name, aliases, _, _ in LEXERS.values():
         if _alias.lower() in aliases:
             if name not in _lexer_cache:
                 _load_lexers(module_name)
             return _lexer_cache[name](**options)
     # continue with lexers from setuptools entrypoints
     for cls in find_plugin_lexers():
-        if _alias in cls.aliases:
+        if _alias.lower() in cls.aliases:
             return cls(**options)
     raise ClassNotFound('no lexer for alias %r found' % _alias)
 
 
+def load_lexer_from_file(filename, lexername="CustomLexer", **options):
+    """Load a lexer from a file.
+
+    This method expects a file located relative to the current working
+    directory, which contains a Lexer class. By default, it expects the
+    Lexer to be name CustomLexer; you can specify your own class name
+    as the second argument to this function.
+
+    Users should be very careful with the input, because this method
+    is equivalent to running eval on the input file.
+
+    Raises ClassNotFound if there are any problems importing the Lexer.
+
+    .. versionadded:: 2.2
+    """
+    try:
+        # This empty dict will contain the namespace for the exec'd file
+        custom_namespace = {}
+        with open(filename, 'rb') as f:
+            exec(f.read(), custom_namespace)
+        # Retrieve the class `lexername` from that namespace
+        if lexername not in custom_namespace:
+            raise ClassNotFound('no valid %s class found in %s' %
+                                (lexername, filename))
+        lexer_class = custom_namespace[lexername]
+        # And finally instantiate it with the options
+        return lexer_class(**options)
+    except IOError as err:
+        raise ClassNotFound('cannot read %s: %s' % (filename, err))
+    except ClassNotFound:
+        raise
+    except Exception as err:
+        raise ClassNotFound('error when loading custom lexer: %s' % err)
+
+
 def find_lexer_class_for_filename(_fn, code=None):
     """Get a lexer for a filename.
 
@@ -101,7 +164,7 @@ def find_lexer_class_for_filename(_fn, code=None):
     """
     matches = []
     fn = basename(_fn)
-    for modname, name, _, filenames, _ in itervalues(LEXERS):
+    for modname, name, _, filenames, _ in LEXERS.values():
         for filename in filenames:
             if _fn_matches(fn, filename):
                 if name not in _lexer_cache:
@@ -112,7 +175,7 @@ def find_lexer_class_for_filename(_fn, code=None):
             if _fn_matches(fn, filename):
                 matches.append((cls, filename))
 
-    if sys.version_info > (3,) and isinstance(code, bytes):
+    if isinstance(code, bytes):
         # decode it, since all analyse_text functions expect unicode
         code = guess_decode(code)
 
@@ -125,8 +188,8 @@ def get_rating(info):
         # gets turned into 0.0.  Run scripts/detect_missing_analyse_text.py
         # to find lexers which need it overridden.
         if code:
-            return cls.analyse_text(code) + bonus
-        return cls.priority + bonus
+            return cls.analyse_text(code) + bonus, cls.__name__
+        return cls.priority + bonus, cls.__name__
 
     if matches:
         matches.sort(key=get_rating)
@@ -153,7 +216,7 @@ def get_lexer_for_mimetype(_mime, **options):
 
     Raises ClassNotFound if not found.
     """
-    for modname, name, _, _, mimetypes in itervalues(LEXERS):
+    for modname, name, _, _, mimetypes in LEXERS.values():
         if _mime in mimetypes:
             if name not in _lexer_cache:
                 _load_lexers(modname)
@@ -172,8 +235,7 @@ def _iter_lexerclasses(plugins=True):
             _load_lexers(module_name)
         yield _lexer_cache[name]
     if plugins:
-        for lexer in find_plugin_lexers():
-            yield lexer
+        yield from find_plugin_lexers()
 
 
 def guess_lexer_for_filename(_fn, _text, **options):
@@ -181,6 +243,16 @@ def guess_lexer_for_filename(_fn, _text, **options):
     Lookup all lexers that handle those filenames primary (``filenames``)
     or secondary (``alias_filenames``). Then run a text analysis for those
     lexers and choose the best result.
+
+    usage::
+
+        >>> from pygments.lexers import guess_lexer_for_filename
+        >>> guess_lexer_for_filename('hello.html', '<%= @foo %>')
+        <pygments.lexers.templates.RhtmlLexer object at 0xb7d2f32c>
+        >>> guess_lexer_for_filename('hello.html', '<h1>{{ title|e }}</h1>')
+        <pygments.lexers.templates.HtmlDjangoLexer object at 0xb7d2f2ac>
+        >>> guess_lexer_for_filename('style.css', 'a { color: <?= $link ?> }')
+        <pygments.lexers.templates.CssPhpLexer object at 0xb7ba518c>
     """
     fn = basename(_fn)
     primary = {}
@@ -220,6 +292,13 @@ def type_sort(t):
 def guess_lexer(_text, **options):
     """Guess a lexer by strong distinctions in the text (eg, shebang)."""
 
+    if not isinstance(_text, str):
+        inencoding = options.get('inencoding', options.get('encoding'))
+        if inencoding:
+            _text = _text.decode(inencoding or 'utf8')
+        else:
+            _text, _ = guess_decode(_text)
+
     # try to get a vim modeline first
     ft = get_filetype_from_buffer(_text)
 
@@ -251,6 +330,8 @@ def __getattr__(self, name):
             cls = _lexer_cache[info[1]]
             setattr(self, name, cls)
             return cls
+        if name in COMPAT:
+            return getattr(self, COMPAT[name])
         raise AttributeError(name)
 
 

From a6b64b6af9addfc4b96836dff87713fbc0f34f25 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Sat, 3 Oct 2020 20:56:45 +0200
Subject: [PATCH 2/8] Ensure failing tests do not futher re-fail

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/typecode/filetype_test_utils.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/typecode/filetype_test_utils.py b/tests/typecode/filetype_test_utils.py
index fa99787..d4a4d8d 100644
--- a/tests/typecode/filetype_test_utils.py
+++ b/tests/typecode/filetype_test_utils.py
@@ -180,6 +180,8 @@ def closure_test_function(*args, **kwargs):
                 test.dump()
 
             expected_yaml = results_yaml
+        else:
+            expected_yaml = test.dumps()
 
         passing = True
         for expected_key, expected_value in test.to_dict().items():

From 4321ab6a810e0c04fd0d30a97f64793c2a4fbbdb Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Sat, 3 Oct 2020 21:01:05 +0200
Subject: [PATCH 3/8] Make doctest pass

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/typecode/pygments_lexers.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/typecode/pygments_lexers.py b/src/typecode/pygments_lexers.py
index 662f398..9c5b123 100644
--- a/src/typecode/pygments_lexers.py
+++ b/src/typecode/pygments_lexers.py
@@ -247,12 +247,12 @@ def guess_lexer_for_filename(_fn, _text, **options):
     usage::
 
         >>> from pygments.lexers import guess_lexer_for_filename
-        >>> guess_lexer_for_filename('hello.html', '<%= @foo %>')
-        <pygments.lexers.templates.RhtmlLexer object at 0xb7d2f32c>
-        >>> guess_lexer_for_filename('hello.html', '<h1>{{ title|e }}</h1>')
-        <pygments.lexers.templates.HtmlDjangoLexer object at 0xb7d2f2ac>
-        >>> guess_lexer_for_filename('style.css', 'a { color: <?= $link ?> }')
-        <pygments.lexers.templates.CssPhpLexer object at 0xb7ba518c>
+        >>> guess_lexer_for_filename('hello.html', '<%= @foo %>').__class__.__name__
+        'RhtmlLexer'
+        >>> guess_lexer_for_filename('hello.html', '<h1>{{ title|e }}</h1>').__class__.__name__
+        'HtmlDjangoLexer'
+        >>> guess_lexer_for_filename('style.css', 'a { color: <?= $link ?> }').__class__.__name__
+        'CssPhpLexer'
     """
     fn = basename(_fn)
     primary = {}

From 176f246cc13b0a9eaa7f94baf1d7b19d649c3694 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Sat, 3 Oct 2020 21:01:30 +0200
Subject: [PATCH 4/8] Update tests for latest Pygments 2.7.x

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/typecode/test_contenttype.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/typecode/test_contenttype.py b/tests/typecode/test_contenttype.py
index 609efbf..d0e3416 100644
--- a/tests/typecode/test_contenttype.py
+++ b/tests/typecode/test_contenttype.py
@@ -195,7 +195,7 @@ def test_code_c_1(self):
             'c source, ascii text',
         )
         assert get_filetype(test_file) in expected
-        assert 'C++' == get_filetype_pygment(test_file)
+        assert 'C' == get_filetype_pygment(test_file)
         assert is_source(test_file)
         assert is_text(test_file)
 
@@ -209,7 +209,7 @@ def test_code_c_7(self):
         )
         assert get_filetype(test_file) in expected
         assert is_source(test_file)
-        assert 'C++' == get_filetype_pygment(test_file)
+        assert 'C' == get_filetype_pygment(test_file)
 
     def test_code_python_2(self):
         test_file = self.get_test_loc('contenttype/code/python/extract.py')

From af24eadf975d926d1e96edc5303d3c4522ee386e Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Sat, 3 Oct 2020 21:06:01 +0200
Subject: [PATCH 5/8] Update test expectations from latest Pygments

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/typecode/data/filetest/code/c/TEST_LOWERCASE.h.yml | 4 ++--
 tests/typecode/data/filetest/code/c/cpu.c.yml            | 4 ++--
 tests/typecode/data/filetest/code/c/main.c.yml           | 4 ++--
 tests/typecode/data/filetest/code/c/mm.c.yml             | 4 ++--
 tests/typecode/data/filetest/code/c/netdb.h.yml          | 4 ++--
 tests/typecode/data/filetest/code/c/pci.c.yml            | 4 ++--
 tests/typecode/data/filetest/code/c/pci_v3.c.yml         | 4 ++--
 tests/typecode/data/filetest/code/c/resource.h.yml       | 4 ++--
 tests/typecode/data/filetest/code/groff/example.ms.yml   | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/typecode/data/filetest/code/c/TEST_LOWERCASE.h.yml b/tests/typecode/data/filetest/code/c/TEST_LOWERCASE.h.yml
index 0ff0146..e137235 100644
--- a/tests/typecode/data/filetest/code/c/TEST_LOWERCASE.h.yml
+++ b/tests/typecode/data/filetest/code/c/TEST_LOWERCASE.h.yml
@@ -1,7 +1,7 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
-filetype_pygment: C++
-programming_language: C++
+filetype_pygment: C
+programming_language: C
 is_file: yes
 is_regular: yes
 size: 8440
diff --git a/tests/typecode/data/filetest/code/c/cpu.c.yml b/tests/typecode/data/filetest/code/c/cpu.c.yml
index 9dd1a05..955dcb0 100644
--- a/tests/typecode/data/filetest/code/c/cpu.c.yml
+++ b/tests/typecode/data/filetest/code/c/cpu.c.yml
@@ -1,7 +1,7 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
-filetype_pygment: C++
-programming_language: C++
+filetype_pygment: C
+programming_language: C
 is_file: yes
 is_regular: yes
 size: 3044
diff --git a/tests/typecode/data/filetest/code/c/main.c.yml b/tests/typecode/data/filetest/code/c/main.c.yml
index f8077d4..5c86023 100644
--- a/tests/typecode/data/filetest/code/c/main.c.yml
+++ b/tests/typecode/data/filetest/code/c/main.c.yml
@@ -1,7 +1,7 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
-filetype_pygment: C++
-programming_language: C++
+filetype_pygment: C
+programming_language: C
 is_file: yes
 is_regular: yes
 size: '1940'
diff --git a/tests/typecode/data/filetest/code/c/mm.c.yml b/tests/typecode/data/filetest/code/c/mm.c.yml
index b855ce4..76e5290 100644
--- a/tests/typecode/data/filetest/code/c/mm.c.yml
+++ b/tests/typecode/data/filetest/code/c/mm.c.yml
@@ -1,7 +1,7 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
-filetype_pygment: C++
-programming_language: C++
+filetype_pygment: C
+programming_language: C
 is_file: yes
 is_regular: yes
 size: 3297
diff --git a/tests/typecode/data/filetest/code/c/netdb.h.yml b/tests/typecode/data/filetest/code/c/netdb.h.yml
index e895b03..2d8c666 100644
--- a/tests/typecode/data/filetest/code/c/netdb.h.yml
+++ b/tests/typecode/data/filetest/code/c/netdb.h.yml
@@ -1,7 +1,7 @@
 filetype_file: very short file (no magic)
 mimetype_file: application/octet-stream
-filetype_pygment: C++
-programming_language: C++
+filetype_pygment: C
+programming_language: C
 is_file: yes
 is_regular: yes
 size: 1
diff --git a/tests/typecode/data/filetest/code/c/pci.c.yml b/tests/typecode/data/filetest/code/c/pci.c.yml
index 461bd02..e653c08 100644
--- a/tests/typecode/data/filetest/code/c/pci.c.yml
+++ b/tests/typecode/data/filetest/code/c/pci.c.yml
@@ -1,7 +1,7 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
-filetype_pygment: C++
-programming_language: C++
+filetype_pygment: C
+programming_language: C
 is_file: yes
 is_regular: yes
 size: 3220
diff --git a/tests/typecode/data/filetest/code/c/pci_v3.c.yml b/tests/typecode/data/filetest/code/c/pci_v3.c.yml
index ff986f9..29aae4e 100644
--- a/tests/typecode/data/filetest/code/c/pci_v3.c.yml
+++ b/tests/typecode/data/filetest/code/c/pci_v3.c.yml
@@ -1,7 +1,7 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
-filetype_pygment: C++
-programming_language: C++
+filetype_pygment: C
+programming_language: C
 is_file: yes
 is_regular: yes
 size: 18253
diff --git a/tests/typecode/data/filetest/code/c/resource.h.yml b/tests/typecode/data/filetest/code/c/resource.h.yml
index 8ccedb7..6e900f6 100644
--- a/tests/typecode/data/filetest/code/c/resource.h.yml
+++ b/tests/typecode/data/filetest/code/c/resource.h.yml
@@ -1,7 +1,7 @@
 filetype_file: ASCII text, with CRLF line terminators
 mimetype_file: text/plain
-filetype_pygment: C++
-programming_language: C++
+filetype_pygment: C
+programming_language: C
 is_file: yes
 is_regular: yes
 size: 91
diff --git a/tests/typecode/data/filetest/code/groff/example.ms.yml b/tests/typecode/data/filetest/code/groff/example.ms.yml
index 6e03797..c6cce31 100644
--- a/tests/typecode/data/filetest/code/groff/example.ms.yml
+++ b/tests/typecode/data/filetest/code/groff/example.ms.yml
@@ -1,7 +1,7 @@
 filetype_file: troff or preprocessor input, ASCII text
 mimetype_file: text/troff
-filetype_pygment: GAS
-programming_language: GAS
+filetype_pygment: MiniScript
+programming_language: MiniScript
 is_file: yes
 is_regular: yes
 size: 93

From 278818b39067e57f816708d7eb5b867e3f0f7b69 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Mon, 5 Oct 2020 09:12:42 +0200
Subject: [PATCH 6/8] Disable unused Pygments lexers

* disbale several less interesting Pygments lexers
* mimetype_python is now correctly collected
* is_media_with_meta is now not incorrectly reported


Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/typecode/contenttype.py                   | 150 ++++++----
 src/typecode/prog_lexers.py                   | 264 +++++++++---------
 .../data/filetest/archive/a.tar.gz.yml        |   1 -
 .../data/filetest/archive/dbase.fdt.yml       |   1 -
 .../data/filetest/archive/e.tar.bz2.yml       |   2 +-
 .../data/filetest/archive/e.tar.gz.yml        |   2 +-
 .../typecode/data/filetest/archive/e.tar.yml  |   2 +-
 .../filetest/archive/file_4.26-1.diff.gz.yml  |   1 -
 .../data/filetest/archive/posixnotgnu.tar.yml |   2 +-
 .../data/filetest/archive/test.tar.lzma.yml   |   1 -
 .../data/filetest/archive/test.tar.xz.yml     |   2 +-
 .../data/filetest/archive/test.zip.yml        |   2 +-
 .../data/filetest/archive/win-archive.lib.yml |   1 -
 .../binary-random/binary_random_0.yml         |   1 -
 .../binary-random/binary_random_1.yml         |   1 -
 .../binary-random/binary_random_2.yml         |   1 -
 .../binary-random/binary_random_3.yml         |   1 -
 .../binary-random/binary_random_4.yml         |   1 -
 .../binary-random/binary_random_5.yml         |   1 -
 .../binary-random/binary_random_6.yml         |   1 -
 .../binary-random/binary_random_7.yml         |   1 -
 .../binary-random/binary_random_8.yml         |   1 -
 .../data/filetest/binary/data.fdt.yml         |   1 -
 .../data/filetest/binary/dbase.fdt.yml        |   1 -
 .../binary/jruby_time_zone_TimeOfDay.dat.yml  |   1 -
 .../data/filetest/binary/pixelstream.rgb.yml  |   2 +-
 .../data/filetest/binary/windows.dll.yml      |   2 +-
 .../data/filetest/build/Makefile.inc.yml      |   3 +-
 .../typecode/data/filetest/build/Makefile.yml |   2 +-
 .../data/filetest/build/ar-ER.css.map.yml     |   1 -
 .../data/filetest/build/ar-ER.js.map.yml      |   1 -
 .../data/filetest/build/binary.js.map.yml     |   1 -
 .../data/filetest/build/build.xml.yml         |   2 +-
 .../data/filetest/build/documentation.dsp.yml |   1 -
 .../data/filetest/build/m/Makefile.yml        |   2 +-
 .../typecode/data/filetest/build/pom.pom.yml  |   1 -
 .../typecode/data/filetest/build/pom.xml.yml  |   2 +-
 .../data/filetest/certificate/ECLIPSE.RSA.yml |   1 -
 .../data/filetest/code/assembly/bcopy.s.yml   |   2 +-
 .../code/c/CcccDevStudioAddIn.rc2.yml         |   1 -
 .../data/filetest/code/c/SIMPLE.C.yml         |   2 +-
 .../typecode/data/filetest/code/c/TEST.H.yml  |   2 +-
 .../data/filetest/code/c/TEST_LOWERCASE.h.yml |   2 +-
 tests/typecode/data/filetest/code/c/cpu.c.yml |   2 +-
 .../typecode/data/filetest/code/c/main.c.yml  |   2 +-
 tests/typecode/data/filetest/code/c/mm.c.yml  |   2 +-
 .../typecode/data/filetest/code/c/netdb.h.yml |   2 +-
 tests/typecode/data/filetest/code/c/pci.c.yml |   2 +-
 .../data/filetest/code/c/pci_v3.c.yml         |   2 +-
 .../data/filetest/code/c/resource.h.yml       |   2 +-
 .../data/filetest/code/cpp/StdAfx.cpp.yml     |   2 +-
 .../data/filetest/code/cpp/non_ascii.cpp.yml  |   2 +-
 .../data/filetest/code/cpp/stacktrace.cpp.yml |   2 +-
 .../data/filetest/code/cpp/string.CPP.yml     |   2 +-
 .../data/filetest/code/groff/example.ms.yml   |   6 +-
 .../data/filetest/code/java/Appender.java.yml |   2 +-
 .../filetest/code/java/ChartTiming1.java.yml  |   2 +-
 .../code/java/CommonViewerSiteFactory.jad.yml |   5 +-
 .../data/filetest/code/java/Logger.JAVA.yml   |   2 +-
 .../filetest/code/java/contenttype.java.yml   |   2 +-
 tests/typecode/data/filetest/code/js/a.js.yml |   2 +-
 .../data/filetest/code/python/__init__.py.yml |   2 +-
 .../filetest/code/python/contenttype.py.yml   |   2 +-
 .../data/filetest/code/scala/ABOUT.yml        |   1 -
 .../filetest/code/scala/Applicative.scala.yml |   1 -
 .../data/filetest/compiled/flash/a.swf.yml    |   2 +-
 .../data/filetest/compiled/flash/b.swf.yml    |   2 +-
 .../flash/flash-haloclassic.swc.incr.yml      |   1 -
 .../filetest/compiled/linux/i686-shash.yml    |   3 +-
 .../filetest/compiled/linux/x86_64-shash.yml  |   3 +-
 .../data/filetest/compiled/win/file.exe.yml   |   2 +-
 .../data/filetest/compiled/win/zlib1.dll.yml  |   2 +-
 .../data/filetest/config/config.conf.yml      |   2 +-
 .../config/defconfig-ar531x-jffs2.yml         |   1 -
 .../config/eclipse_configuration_3u.cfs.yml   |   1 -
 .../data/filetest/config/wrapper.conf.yml     |   2 +-
 .../data/filetest/data/mysql-arch.ARM.yml     |   1 -
 .../data/filetest/data/mysql-arch.ARN.yml     |   1 -
 .../data/filetest/data/mysql-arch.ARZ.yml     |   3 +-
 .../data/filetest/data/mysql-arch.yml         |   3 +-
 .../typecode/data/filetest/data/nulls.txt.yml |   2 +-
 .../data/filetest/debug/QTMovieWin.pdb.yml    |   4 +-
 .../data/filetest/doc/html/Label.html.yml     |   2 +-
 .../typecode/data/filetest/doc/html/a.htm.yml |   2 +-
 .../doc/html/allclasses-frame.html.yml        |   2 +-
 .../filetest/doc/html/contenttype.html.yml    |   2 +-
 .../filetest/doc/office/Glitch-ERD.vsd.yml    |   4 +-
 .../data/filetest/doc/office/document.doc.yml |   2 +-
 .../data/filetest/doc/office/document.yml     |   1 -
 .../data/filetest/doc/office/excel.xls.yml    |   2 +-
 .../data/filetest/doc/office/excel.xlsx.yml   |   2 +-
 .../data/filetest/doc/office/power.ppt.yml    |   4 +-
 .../data/filetest/doc/office/power.pptx.yml   |   2 +-
 .../data/filetest/doc/office/word.doc.yml     |   2 +-
 .../data/filetest/doc/office/word.docx.yml    |   2 +-
 .../typecode/data/filetest/doc/pdf/a.pdf.yml  |   2 +-
 .../data/filetest/doc/pdf/notpdf.pdf.yml      |   2 +-
 .../data/filetest/doc/pdf/pdf.pdf.yml         |   2 +-
 .../data/filetest/doc/postscript/a.ps.yml     |   2 +-
 .../data/filetest/doc/postscript/doc.ps.yml   |   2 +-
 .../data/filetest/doc/xml/simple.xml.yml      |   2 +-
 .../data/filetest/doc/xml/some.xml.yml        |   2 +-
 .../data/filetest/doc/xml/somespring.xml.yml  |   2 +-
 .../data/filetest/media/Image-ascii.pgm.yml   |   3 +-
 .../data/filetest/media/Image.pgm.yml         |   3 +-
 .../data/filetest/media/Image1.bmp.yml        |   4 +-
 .../data/filetest/media/Image1.gif.yml        |   3 +-
 .../data/filetest/media/Image1.ico.yml        |   3 +-
 .../data/filetest/media/Image1.jpeg.yml       |   4 +-
 .../data/filetest/media/Image1.jpg.yml        |   4 +-
 .../data/filetest/media/Image1.pbm.yml        |   3 +-
 .../data/filetest/media/Image1.pcx.yml        |   4 +-
 .../data/filetest/media/Image1.ppm.yml        |   3 +-
 .../data/filetest/media/Image1.psd.yml        |   3 +-
 .../data/filetest/media/Image1.ras.yml        |   3 +-
 .../data/filetest/media/Image1.tif.yml        |   4 +-
 .../data/filetest/media/Image1.wmf.yml        |   1 +
 .../data/filetest/media/Movie.wmv.yml         |   7 +-
 .../data/filetest/media/Movie_0001.wmv.yml    |   8 +-
 .../data/filetest/media/Movie_0002.wmv.yml    |   7 +-
 .../data/filetest/media/TBarLrge.bmp.yml      |   4 +-
 .../data/filetest/media/TBarMedm.bmp.yml      |   4 +-
 tests/typecode/data/filetest/media/a.aif.yml  |   1 +
 tests/typecode/data/filetest/media/a.aiff.yml |   1 +
 tests/typecode/data/filetest/media/a.au.yml   |   1 +
 tests/typecode/data/filetest/media/a.avi.yml  |   1 +
 tests/typecode/data/filetest/media/a.mp2.yml  |   3 +-
 tests/typecode/data/filetest/media/a.mp3.yml  |   3 +-
 tests/typecode/data/filetest/media/a.ogg.yml  |   4 +-
 tests/typecode/data/filetest/media/a.pdf.yml  |   2 +-
 tests/typecode/data/filetest/media/a.png.yml  |   3 +-
 .../data/filetest/media/a.theo.ogg.yml        |   1 +
 tests/typecode/data/filetest/media/a.wav.yml  |   3 +-
 tests/typecode/data/filetest/media/a4.mp4.yml |   1 +
 tests/typecode/data/filetest/media/a4.mpg.yml |   1 +
 .../data/filetest/media/drawing.svg.yml       |   1 +
 .../data/filetest/media/mov.wvm.wmv.yml       |   7 +-
 .../package/TicketImport-0.7a-py2.5.egg.yml   |   1 -
 .../filetest/package/ant-jsch-1.7.0.jar.yml   |   2 +-
 .../data/filetest/package/ant.zip.yml         |   2 +-
 .../typecode/data/filetest/package/c.war.yml  |   1 -
 .../package/rubygems-update-1.4.1.gem.yml     |   1 -
 .../package/wget-1.11.4-3.fc11.i586.rpm.yml   |   1 -
 .../data/filetest/script/build_w32vc.bat.yml  |   2 +-
 .../typecode/data/filetest/script/install.yml |   1 -
 .../data/filetest/script/makelinks.yml        |   1 -
 .../typecode/data/filetest/script/test.sh.yml |   2 +-
 .../data/filetest/script/zip_src.bat.yml      |   2 +-
 tests/typecode/data/filetest/test.sh.yml      |   2 +-
 tests/typecode/data/filetest/text/COPYING.yml |   1 -
 tests/typecode/data/filetest/text/CREDITS.yml |   1 -
 .../typecode/data/filetest/text/ChangeLog.yml |   1 -
 tests/typecode/data/filetest/text/GPL.txt.yml |   2 +-
 .../data/filetest/text/crashing-a.txt.yml     |   2 +-
 .../data/filetest/text/crashing-z.txt.yml     |   2 +-
 .../data/filetest/text/windowserver.log.yml   |   2 +-
 .../text/x11-xconsortium_text.txt.yml         |   2 +-
 tests/typecode/filetype_test_utils.py         |  97 ++++---
 tests/typecode/test_types.py                  |   7 +-
 159 files changed, 465 insertions(+), 380 deletions(-)

diff --git a/src/typecode/contenttype.py b/src/typecode/contenttype.py
index 15f82f5..a6fc90b 100644
--- a/src/typecode/contenttype.py
+++ b/src/typecode/contenttype.py
@@ -106,6 +106,30 @@ def as_bytes(items):
 ELF_UNKNOWN = 'unknown'
 elf_types = (ELF_EXE, ELF_SHARED, ELF_RELOC,)
 
+
+PLAIN_TEXT_EXTENSIONS = (
+    # docs
+    '.rst', '.rest', '.md',
+    '.txt',
+    # This one is actually not handled by Pygments. There are probably more.
+    '.log',
+    # various data
+    '.json',
+    '.xml',
+)
+
+if on_linux and py2:
+    PLAIN_TEXT_EXTENSIONS = as_bytes(PLAIN_TEXT_EXTENSIONS)
+
+
+MAKEFILE_EXTENSIONS = (
+    'Makefile',
+    'Makefile.inc',
+)
+
+if on_linux and py2:
+    MAKEFILE_EXTENSIONS = as_bytes(MAKEFILE_EXTENSIONS)
+
 # TODO:
 # http://svn.zope.org/z3c.mimetype/trunk/?pathrev=103648
 # http://svn.zope.org/z3c.sharedmimeinfo/trunk/TODO.txt?revision=103668&view=markup
@@ -157,7 +181,7 @@ class Type(object):
         '_mimetype_python',
         '_filetype_file',
         '_mimetype_file',
-        '_filetype_pygments',
+        '_filetype_pygment',
         '_is_pdf_with_text',
         '_is_text',
         '_is_text_with_long_lines',
@@ -178,18 +202,19 @@ class Type(object):
         'filetype_pygment',
         'elf_type',
         'programming_language',
+        'link_target',
     ]
 
-    exportable_attributes = text_attributes + [
+    numeric_attributes = ['size', ]
+    date_attributes = ['date', ]
+
+    boolean_attributes = [
         'is_file',
         'is_dir',
         'is_regular',
         'is_special',
-        'date',
         'is_link',
         'is_broken_link',
-        'link_target',
-        'size',
         'is_pdf_with_text',
         'is_text',
         'is_text_with_long_lines',
@@ -216,7 +241,10 @@ class Type(object):
         'is_source',
         'is_stripped_elf',
         'is_winexe',
+        'is_makefile',
     ]
+    exportable_attributes = (
+        text_attributes + numeric_attributes + date_attributes + boolean_attributes)
 
     def __init__(self, location):
         if (not location
@@ -234,7 +262,7 @@ def __init__(self, location):
         self.date = filetype.get_last_modified_date(location)
 
         self.is_link = filetype.is_link(location)
-        self.is_broken_link = filetype.is_broken_link(location)
+        self.is_broken_link = bool(filetype.is_broken_link(location))
 
         # FIXME: the way the True and False values are checked in properties is verbose and contrived at best
         # and is due to use None/True/False as different values
@@ -245,7 +273,7 @@ def __init__(self, location):
         self._mimetype_python = None
         self._filetype_file = None
         self._mimetype_file = None
-        self._filetype_pygments = None
+        self._filetype_pygment = None
         self._is_pdf_with_text = None
         self._is_text = None
         self._is_text_with_long_lines = None
@@ -267,7 +295,8 @@ def to_dict(self, include_date=True):
         """
         nv = ((n, getattr(self, n)) for n in self.exportable_attributes)
         if not include_date:
-            nv = ((n,v) for n,v in nv if n != 'date')
+            nv = ((n, v) for n, v in nv if n not in self.date_attributes)
+
         return OrderedDict(nv)
 
     @property
@@ -303,8 +332,8 @@ def mimetype_python(self):
             if self.is_file is True:
                 if not mimetype_python.inited:
                     mimetype_python.init([APACHE_MIME_TYPES])
-                    val = mimetype_python.guess_type(self.location)[0]
-                    self._mimetype_python = val
+                val = mimetype_python.guess_type(self.location)[0]
+                self._mimetype_python = val or ''
         return self._mimetype_python
 
     @property
@@ -334,15 +363,15 @@ def filetype_pygment(self):
         """
         Return the filetype guessed using Pygments lexer, mostly for source code.
         """
-        if self._filetype_pygments is None:
-            self._filetype_pygments = ''
+        if self._filetype_pygment is None:
+            self._filetype_pygment = ''
             if self.is_text and not self.is_media:
                 lexer = get_pygments_lexer(self.location)
                 if lexer and not lexer.name.startswith('JSON'):
-                    self._filetype_pygments = lexer.name or ''
+                    self._filetype_pygment = lexer.name or ''
                 else:
-                    self._filetype_pygments = ''
-        return self._filetype_pygments
+                    self._filetype_pygment = ''
+        return self._filetype_pygment
 
     # FIXME: we way we use tri booleans is a tad ugly
 
@@ -585,8 +614,11 @@ def is_media_with_meta(self):
         # but we exclude some.
 
         # FIXME: only include types that are known to have metadata
-        if (self.is_media and self.filetype_file.lower().startswith(
-                ('gif image', 'png image', 'jpeg image', 'netpbm', 'mpeg'))):
+        if not self.is_media:
+            return False
+        if self.filetype_file.lower().startswith(
+            ('gif image', 'png image', 'jpeg image', 'netpbm', 'mpeg')
+        ):
             return False
         else:
             return True
@@ -596,8 +628,7 @@ def is_pdf(self):
         """
         Return True if the file is highly likely to be a pdf file.
         """
-        ft = self.mimetype_file
-        if 'pdf' in ft:
+        if 'pdf' in self.mimetype_file:
             return True
         else:
             return False
@@ -699,6 +730,13 @@ def is_script(self):
         else:
             return False
 
+    def _is_plain_text(self, _pte=PLAIN_TEXT_EXTENSIONS):
+        return self.location.endswith(_pte)
+
+    @property
+    def is_makefile(self):
+        return self.location.endswith(MAKEFILE_EXTENSIONS)
+
     @property
     def is_source(self):
         """
@@ -706,18 +744,19 @@ def is_source(self):
         """
         if self.is_text is False:
             return False
-        PLAIN_TEXT_EXTENSIONS = (
-            '.rst', '.rest', '.txt', '.md',
-            # This one is actually not handled by Pygments. There are probably more.
-            '.log')
-        if on_linux and py2:
-            PLAIN_TEXT_EXTENSIONS = as_bytes(PLAIN_TEXT_EXTENSIONS)
 
-        if self.location.endswith(PLAIN_TEXT_EXTENSIONS):
+        elif self._is_plain_text():
+            return False
+
+        elif self.is_makefile or self.is_js_map:
             return False
 
-        if self.filetype_pygment or self.is_script is True:
+        elif self.is_java_source is True or self.is_c_source is True:
+            return True
+
+        elif self.filetype_pygment or self.is_script is True:
             return True
+
         else:
             return False
 
@@ -727,7 +766,9 @@ def programming_language(self):
         Return the programming language if the file is source code or an empty
         string.
         """
-        return self.filetype_pygment or ''
+        if self.is_source:
+            return self.filetype_pygment or ''
+        return ''
 
     @property
     def is_c_source(self):
@@ -797,6 +838,7 @@ def is_java_source(self):
 
             if (fnmatch.fnmatch(name, b'*.java' if on_linux and py2 else u'*.java')
              or fnmatch.fnmatch(name, b'*.aj' if on_linux and py2 else u'*.aj')
+             or fnmatch.fnmatch(name, b'*.jad' if on_linux and py2 else u'*.jad')
              or fnmatch.fnmatch(name, b'*.ajt' if on_linux and py2 else u'*.ajt')):
                 return True
             else:
@@ -889,31 +931,43 @@ def get_pygments_lexer(location):
     except KeyError:
         if is_binary(location):
             return
-    try:
-        # FIXME: Latest Pygments versions should work fine
-        # win32_bug_on_s_files = dejacode.on_windows and location.endswith('.s')
 
-        # NOTE: we use only the location for its file name here, we could use
-        # lowercase location may be
-        lexer = get_lexer_for_filename(location, stripnl=False, stripall=False)
-        return lexer
+    # We first try to get a lexer using
+    #  - the filename
+    #  - then the lowercased filename
+    #  - and finally the begining of the file content.
+    # We try with lowercase as detection is skewed otherwise (e.g. .java vs .JAVA)
 
+    try:
+        return get_lexer_for_filename(location)
     except LexerClassNotFound:
         try:
-            # if Pygments does not guess we should not carry forward
-            # read the first 4K of the file
-            try:
-                with io.open(location, 'r') as f:
-                    content = f.read(4096)
-            except:
-                # try again as bytes and force unicode
-                with open(location, 'rb') as f:
-                    content = text.as_unicode(f.read(4096))
-
-            guessed = guess_lexer(content)
-            return guessed
+            return get_lexer_for_filename(location.lower())
         except LexerClassNotFound:
-            return
+            try:
+                # if Pygments does not guess we should not carry forward
+                content = get_text_file_start(location)
+                return guess_lexer(content)
+            except LexerClassNotFound:
+                return
+
+
+def get_text_file_start(location, length=4096):
+    """
+    Return a unicode string with up the first "length" characters from the text
+    file at location.
+    """
+    content = None
+    # read the first 4K of the file
+    try:
+        with io.open(location, 'r') as f:
+            content = f.read(length)
+    except:
+        # try again as bytes and force unicode
+        with open(location, 'rb') as f:
+            content = text.as_unicode(f.read(length))
+    finally:
+        return content
 
 
 def get_filetype(location):
diff --git a/src/typecode/prog_lexers.py b/src/typecode/prog_lexers.py
index f541f19..8fae322 100644
--- a/src/typecode/prog_lexers.py
+++ b/src/typecode/prog_lexers.py
@@ -22,16 +22,16 @@
 LEXERS = {
     'ABAPLexer': ('pygments.lexers.business', 'ABAP', ('abap',), ('*.abap', '*.ABAP'), ('text/x-abap',)),
     # 'APLLexer': ('pygments.lexers.apl', 'APL', ('apl',), ('*.apl',), ()),
-    'AbnfLexer': ('pygments.lexers.grammar_notation', 'ABNF', ('abnf',), ('*.abnf',), ('text/x-abnf',)),
+    #'AbnfLexer': ('pygments.lexers.grammar_notation', 'ABNF', ('abnf',), ('*.abnf',), ('text/x-abnf',)),
     'ActionScript3Lexer': ('pygments.lexers.actionscript', 'ActionScript 3', ('as3', 'actionscript3'), ('*.as',), ('application/x-actionscript3', 'text/x-actionscript3', 'text/actionscript3')),
     'ActionScriptLexer': ('pygments.lexers.actionscript', 'ActionScript', ('as', 'actionscript'), ('*.as',), ('application/x-actionscript', 'text/x-actionscript', 'text/actionscript')),
     #'AdaLexer': ('pygments.lexers.pascal', 'Ada', ('ada', 'ada95', 'ada2005'), ('*.adb', '*.ads', '*.ada'), ('text/x-ada',)),
-    'AdlLexer': ('pygments.lexers.archetype', 'ADL', ('adl',), ('*.adl', '*.adls', '*.adlf', '*.adlx'), ()),
+    #'AdlLexer': ('pygments.lexers.archetype', 'ADL', ('adl',), ('*.adl', '*.adls', '*.adlf', '*.adlx'), ()),
     #'AgdaLexer': ('pygments.lexers.haskell', 'Agda', ('agda',), ('*.agda',), ('text/x-agda',)),
-    'AheuiLexer': ('pygments.lexers.esoteric', 'Aheui', ('aheui',), ('*.aheui',), ()),
+    #'AheuiLexer': ('pygments.lexers.esoteric', 'Aheui', ('aheui',), ('*.aheui',), ()),
     #'AlloyLexer': ('pygments.lexers.dsls', 'Alloy', ('alloy',), ('*.als',), ('text/x-alloy',)),
     #'AmbientTalkLexer': ('pygments.lexers.ambient', 'AmbientTalk', ('at', 'ambienttalk', 'ambienttalk/2'), ('*.at',), ('text/x-ambienttalk',)),
-    'AmplLexer': ('pygments.lexers.ampl', 'Ampl', ('ampl',), ('*.run',), ()),
+    #'AmplLexer': ('pygments.lexers.ampl', 'Ampl', ('ampl',), ('*.run',), ()),
     'Angular2HtmlLexer': ('pygments.lexers.templates', 'HTML + Angular2', ('html+ng2',), ('*.ng2',), ()),
     'Angular2Lexer': ('pygments.lexers.templates', 'Angular2', ('ng2',), (), ()),
     #'AntlrActionScriptLexer': ('pygments.lexers.parsers', 'ANTLR With ActionScript Target', ('antlr-as', 'antlr-actionscript'), ('*.G', '*.g'), ()),
@@ -45,8 +45,8 @@
     #'AntlrRubyLexer': ('pygments.lexers.parsers', 'ANTLR With Ruby Target', ('antlr-ruby', 'antlr-rb'), ('*.G', '*.g'), ()),
     #'ApacheConfLexer': ('pygments.lexers.configs', 'ApacheConf', ('apacheconf', 'aconf', 'apache'), ('.htaccess', 'apache.conf', 'apache2.conf'), ('text/x-apacheconf',)),
     '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',), ()),
+    #'ArduinoLexer': ('pygments.lexers.c_like', 'Arduino', ('arduino',), ('*.ino',), ('text/x-arduino',)),
+    #'ArrowLexer': ('pygments.lexers.arrow', 'Arrow', ('arrow',), ('*.arw',), ()),
     'AspectJLexer': ('pygments.lexers.jvm', 'AspectJ', ('aspectj',), ('*.aj',), ('text/x-aspectj',)),
     #'AsymptoteLexer': ('pygments.lexers.graphics', 'Asymptote', ('asy', 'asymptote'), ('*.asy',), ('text/x-asymptote',)),
     #'AugeasLexer': ('pygments.lexers.configs', 'Augeas', ('augeas',), ('*.aug',), ()),
@@ -55,47 +55,47 @@
     #'AwkLexer': ('pygments.lexers.textedit', 'Awk', ('awk', 'gawk', 'mawk', 'nawk'), ('*.awk',), ('application/x-awk',)),
     #'BBCBasicLexer': ('pygments.lexers.basic', 'BBC Basic', ('bbcbasic',), ('*.bbc',), ()),
     #'BBCodeLexer': ('pygments.lexers.markup', 'BBCode', ('bbcode',), (), ('text/x-bbcode',)),
-    'BCLexer': ('pygments.lexers.algebra', 'BC', ('bc',), ('*.bc',), ()),
-    'BSTLexer': ('pygments.lexers.bibtex', 'BST', ('bst', 'bst-pybtex'), ('*.bst',), ()),
-    'BareLexer': ('pygments.lexers.bare', 'BARE', ('bare',), ('*.bare',), ()),
-    'BaseMakefileLexer': ('pygments.lexers.make', 'Base Makefile', ('basemake',), (), ()),
+    #'BCLexer': ('pygments.lexers.algebra', 'BC', ('bc',), ('*.bc',), ()),
+    #'BSTLexer': ('pygments.lexers.bibtex', 'BST', ('bst', 'bst-pybtex'), ('*.bst',), ()),
+    #'BareLexer': ('pygments.lexers.bare', 'BARE', ('bare',), ('*.bare',), ()),
+    #'BaseMakefileLexer': ('pygments.lexers.make', 'Base Makefile', ('basemake',), (), ()),
     'BashLexer': ('pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript', 'text/x-shellscript')),
     #'BashSessionLexer': ('pygments.lexers.shell', 'Bash Session', ('console', 'shell-session'), ('*.sh-session', '*.shell-session'), ('application/x-shell-session', 'application/x-sh-session')),
     'BatchLexer': ('pygments.lexers.shell', 'Batchfile', ('bat', 'batch', 'dosbatch', 'winbatch'), ('*.bat', '*.cmd'), ('application/x-dos-batch',)),
     #'BefungeLexer': ('pygments.lexers.esoteric', 'Befunge', ('befunge',), ('*.befunge',), ('application/x-befunge',)),
-    'BibTeXLexer': ('pygments.lexers.bibtex', 'BibTeX', ('bib', 'bibtex'), ('*.bib',), ('text/x-bibtex',)),
+    #'BibTeXLexer': ('pygments.lexers.bibtex', 'BibTeX', ('bib', 'bibtex'), ('*.bib',), ('text/x-bibtex',)),
     #'BlitzBasicLexer': ('pygments.lexers.basic', 'BlitzBasic', ('blitzbasic', 'b3d', 'bplus'), ('*.bb', '*.decls'), ('text/x-bb',)),
     #'BlitzMaxLexer': ('pygments.lexers.basic', 'BlitzMax', ('blitzmax', 'bmax'), ('*.bmx',), ('text/x-bmx',)),
-    'BnfLexer': ('pygments.lexers.grammar_notation', 'BNF', ('bnf',), ('*.bnf',), ('text/x-bnf',)),
-    'BoaLexer': ('pygments.lexers.boa', 'Boa', ('boa',), ('*.boa',), ()),
+    #'BnfLexer': ('pygments.lexers.grammar_notation', 'BNF', ('bnf',), ('*.bnf',), ('text/x-bnf',)),
+    #'BoaLexer': ('pygments.lexers.boa', 'Boa', ('boa',), ('*.boa',), ()),
     #'BooLexer': ('pygments.lexers.dotnet', 'Boo', ('boo',), ('*.boo',), ('text/x-boo',)),
-    'BoogieLexer': ('pygments.lexers.verification', 'Boogie', ('boogie',), ('*.bpl',), ()),
+    #'BoogieLexer': ('pygments.lexers.verification', 'Boogie', ('boogie',), ('*.bpl',), ()),
     #'BrainfuckLexer': ('pygments.lexers.esoteric', 'Brainfuck', ('brainfuck', 'bf'), ('*.bf', '*.b'), ('application/x-brainfuck',)),
     #'BugsLexer': ('pygments.lexers.modeling', 'BUGS', ('bugs', 'winbugs', 'openbugs'), ('*.bug',), ()),
-    'CAmkESLexer': ('pygments.lexers.esoteric', 'CAmkES', ('camkes', 'idl4'), ('*.camkes', '*.idl4'), ()),
+    #'CAmkESLexer': ('pygments.lexers.esoteric', 'CAmkES', ('camkes', 'idl4'), ('*.camkes', '*.idl4'), ()),
     'CLexer': ('pygments.lexers.c_cpp', 'C', ('c',), ('*.c', '*.h', '*.idc'), ('text/x-chdr', 'text/x-csrc')),
     'CMakeLexer': ('pygments.lexers.make', 'CMake', ('cmake',), ('*.cmake', 'CMakeLists.txt'), ('text/x-cmake',)),
     #'CObjdumpLexer': ('pygments.lexers.asm', 'c-objdump', ('c-objdump',), ('*.c-objdump',), ('text/x-c-objdump',)),
-    'CPSALexer': ('pygments.lexers.lisp', 'CPSA', ('cpsa',), ('*.cpsa',), ()),
+    #'CPSALexer': ('pygments.lexers.lisp', 'CPSA', ('cpsa',), ('*.cpsa',), ()),
     'CSharpAspxLexer': ('pygments.lexers.dotnet', 'aspx-cs', ('aspx-cs',), ('*.aspx', '*.asax', '*.ascx', '*.ashx', '*.asmx', '*.axd'), ()),
     'CSharpLexer': ('pygments.lexers.dotnet', 'C#', ('csharp', 'c#'), ('*.cs',), ('text/x-csharp',)),
     #'Ca65Lexer': ('pygments.lexers.asm', 'ca65 assembler', ('ca65',), ('*.s',), ()),
-    'CadlLexer': ('pygments.lexers.archetype', 'cADL', ('cadl',), ('*.cadl',), ()),
-    'CapDLLexer': ('pygments.lexers.esoteric', 'CapDL', ('capdl',), ('*.cdl',), ()),
-    'CapnProtoLexer': ('pygments.lexers.capnproto', "Cap'n Proto", ('capnp',), ('*.capnp',), ()),
+    #'CadlLexer': ('pygments.lexers.archetype', 'cADL', ('cadl',), ('*.cadl',), ()),
+    #'CapDLLexer': ('pygments.lexers.esoteric', 'CapDL', ('capdl',), ('*.cdl',), ()),
+    #'CapnProtoLexer': ('pygments.lexers.capnproto', "Cap'n Proto", ('capnp',), ('*.capnp',), ()),
     #'CbmBasicV2Lexer': ('pygments.lexers.basic', 'CBM BASIC V2', ('cbmbas',), ('*.bas',), ()),
     #'CeylonLexer': ('pygments.lexers.jvm', 'Ceylon', ('ceylon',), ('*.ceylon',), ('text/x-ceylon',)),
     #'Cfengine3Lexer': ('pygments.lexers.configs', 'CFEngine3', ('cfengine3', 'cf3'), ('*.cf',), ()),
     #'ChaiscriptLexer': ('pygments.lexers.scripting', 'ChaiScript', ('chai', 'chaiscript'), ('*.chai',), ('text/x-chaiscript', 'application/x-chaiscript')),
     #'ChapelLexer': ('pygments.lexers.chapel', 'Chapel', ('chapel', 'chpl'), ('*.chpl',), ()),
-    'CharmciLexer': ('pygments.lexers.c_like', 'Charmci', ('charmci',), ('*.ci',), ()),
+    #'CharmciLexer': ('pygments.lexers.c_like', 'Charmci', ('charmci',), ('*.ci',), ()),
     #'CheetahHtmlLexer': ('pygments.lexers.templates', 'HTML+Cheetah', ('html+cheetah', 'html+spitfire', 'htmlcheetah'), (), ('text/html+cheetah', 'text/html+spitfire')),
     #'CheetahJavascriptLexer': ('pygments.lexers.templates', 'JavaScript+Cheetah', ('js+cheetah', 'javascript+cheetah', 'js+spitfire', 'javascript+spitfire'), (), ('application/x-javascript+cheetah', 'text/x-javascript+cheetah', 'text/javascript+cheetah', 'application/x-javascript+spitfire', 'text/x-javascript+spitfire', 'text/javascript+spitfire')),
     #'CheetahLexer': ('pygments.lexers.templates', 'Cheetah', ('cheetah', 'spitfire'), ('*.tmpl', '*.spt'), ('application/x-cheetah', 'application/x-spitfire')),
     #'CheetahXmlLexer': ('pygments.lexers.templates', 'XML+Cheetah', ('xml+cheetah', 'xml+spitfire'), (), ('application/xml+cheetah', 'application/xml+spitfire')),
     #'CirruLexer': ('pygments.lexers.webmisc', 'Cirru', ('cirru',), ('*.cirru',), ('text/x-cirru',)),
     #'ClayLexer': ('pygments.lexers.c_like', 'Clay', ('clay',), ('*.clay',), ('text/x-clay',)),
-    'CleanLexer': ('pygments.lexers.clean', 'Clean', ('clean',), ('*.icl', '*.dcl'), ()),
+    #'CleanLexer': ('pygments.lexers.clean', 'Clean', ('clean',), ('*.icl', '*.dcl'), ()),
     'ClojureLexer': ('pygments.lexers.jvm', 'Clojure', ('clojure', 'clj'), ('*.clj',), ('text/x-clojure', 'application/x-clojure')),
     'ClojureScriptLexer': ('pygments.lexers.jvm', 'ClojureScript', ('clojurescript', 'cljs'), ('*.cljs',), ('text/x-clojurescript', 'application/x-clojurescript')),
     'CobolFreeformatLexer': ('pygments.lexers.business', 'COBOLFree', ('cobolfree',), ('*.cbl', '*.CBL'), ()),
@@ -105,17 +105,17 @@
     #'ColdfusionHtmlLexer': ('pygments.lexers.templates', 'Coldfusion HTML', ('cfm',), ('*.cfm', '*.cfml'), ('application/x-coldfusion',)),
     #'ColdfusionLexer': ('pygments.lexers.templates', 'cfstatement', ('cfs',), (), ()),
     'CommonLispLexer': ('pygments.lexers.lisp', 'Common Lisp', ('common-lisp', 'cl', 'lisp'), ('*.cl', '*.lisp'), ('text/x-common-lisp',)),
-    'ComponentPascalLexer': ('pygments.lexers.oberon', 'Component Pascal', ('componentpascal', 'cp'), ('*.cp', '*.cps'), ('text/x-component-pascal',)),
+    #'ComponentPascalLexer': ('pygments.lexers.oberon', 'Component Pascal', ('componentpascal', 'cp'), ('*.cp', '*.cps'), ('text/x-component-pascal',)),
     #'CoqLexer': ('pygments.lexers.theorem', 'Coq', ('coq',), ('*.v',), ('text/x-coq',)),
     'CppLexer': ('pygments.lexers.c_cpp', 'C++', ('cpp', 'c++'), ('*.cpp', '*.hpp', '*.c++', '*.h++', '*.cc', '*.hh', '*.cxx', '*.hxx', '*.C', '*.H', '*.cp', '*.CPP'), ('text/x-c++hdr', 'text/x-c++src')),
     #'CppObjdumpLexer': ('pygments.lexers.asm', 'cpp-objdump', ('cpp-objdump', 'c++-objdumb', 'cxx-objdump'), ('*.cpp-objdump', '*.c++-objdump', '*.cxx-objdump'), ('text/x-cpp-objdump',)),
-    'CrmshLexer': ('pygments.lexers.dsls', 'Crmsh', ('crmsh', 'pcmk'), ('*.crmsh', '*.pcmk'), ()),
+    #'CrmshLexer': ('pygments.lexers.dsls', 'Crmsh', ('crmsh', 'pcmk'), ('*.crmsh', '*.pcmk'), ()),
     #'CrocLexer': ('pygments.lexers.d', 'Croc', ('croc',), ('*.croc',), ('text/x-crocsrc',)),
     #'CryptolLexer': ('pygments.lexers.haskell', 'Cryptol', ('cryptol', 'cry'), ('*.cry',), ('text/x-cryptol',)),
-    'CrystalLexer': ('pygments.lexers.crystal', 'Crystal', ('cr', 'crystal'), ('*.cr',), ('text/x-crystal',)),
-    'CsoundDocumentLexer': ('pygments.lexers.csound', 'Csound Document', ('csound-document', 'csound-csd'), ('*.csd',), ()),
-    'CsoundOrchestraLexer': ('pygments.lexers.csound', 'Csound Orchestra', ('csound', 'csound-orc'), ('*.orc', '*.udo'), ()),
-    'CsoundScoreLexer': ('pygments.lexers.csound', 'Csound Score', ('csound-score', 'csound-sco'), ('*.sco',), ()),
+    #'CrystalLexer': ('pygments.lexers.crystal', 'Crystal', ('cr', 'crystal'), ('*.cr',), ('text/x-crystal',)),
+    #'CsoundDocumentLexer': ('pygments.lexers.csound', 'Csound Document', ('csound-document', 'csound-csd'), ('*.csd',), ()),
+    #'CsoundOrchestraLexer': ('pygments.lexers.csound', 'Csound Orchestra', ('csound', 'csound-orc'), ('*.orc', '*.udo'), ()),
+    #'CsoundScoreLexer': ('pygments.lexers.csound', 'Csound Score', ('csound-score', 'csound-sco'), ('*.sco',), ()),
     #'CssDjangoLexer': ('pygments.lexers.templates', 'CSS+Django/Jinja', ('css+django', 'css+jinja'), (), ('text/css+django', 'text/css+jinja')),
     #'CssErbLexer': ('pygments.lexers.templates', 'CSS+Ruby', ('css+erb', 'css+ruby'), (), ('text/css+ruby',)),
     #'CssGenshiLexer': ('pygments.lexers.templates', 'CSS+Genshi Text', ('css+genshitext', 'css+genshi'), (), ('text/css+genshi',)),
@@ -132,7 +132,7 @@
     'Dasm16Lexer': ('pygments.lexers.asm', 'DASM16', ('dasm16',), ('*.dasm16', '*.dasm'), ('text/x-dasm16',)),
     #'DebianControlLexer': ('pygments.lexers.installers', 'Debian Control file', ('control', 'debcontrol'), ('control',), ()),
     'DelphiLexer': ('pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
-    'DevicetreeLexer': ('pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
+    #'DevicetreeLexer': ('pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
     #'DgLexer': ('pygments.lexers.python', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
     #'DiffLexer': ('pygments.lexers.diff', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
     #'DjangoLexer': ('pygments.lexers.templates', 'Django/Jinja', ('django', 'jinja'), (), ('application/x-django-templating', 'application/x-jinja')),
@@ -144,41 +144,41 @@
     #'DylanLidLexer': ('pygments.lexers.dylan', 'DylanLID', ('dylan-lid', 'lid'), ('*.lid', '*.hdp'), ('text/x-dylan-lid',)),
     #'ECLLexer': ('pygments.lexers.ecl', 'ECL', ('ecl',), ('*.ecl',), ('application/x-ecl',)),
     #'ECLexer': ('pygments.lexers.c_like', 'eC', ('ec',), ('*.ec', '*.eh'), ('text/x-echdr', 'text/x-ecsrc')),
-    'EarlGreyLexer': ('pygments.lexers.javascript', 'Earl Grey', ('earl-grey', 'earlgrey', 'eg'), ('*.eg',), ('text/x-earl-grey',)),
-    'EasytrieveLexer': ('pygments.lexers.scripting', 'Easytrieve', ('easytrieve',), ('*.ezt', '*.mac'), ('text/x-easytrieve',)),
+    #'EarlGreyLexer': ('pygments.lexers.javascript', 'Earl Grey', ('earl-grey', 'earlgrey', 'eg'), ('*.eg',), ('text/x-earl-grey',)),
+    #'EasytrieveLexer': ('pygments.lexers.scripting', 'Easytrieve', ('easytrieve',), ('*.ezt', '*.mac'), ('text/x-easytrieve',)),
     #'EbnfLexer': ('pygments.lexers.parsers', 'EBNF', ('ebnf',), ('*.ebnf',), ('text/x-ebnf',)),
     #'EiffelLexer': ('pygments.lexers.eiffel', 'Eiffel', ('eiffel',), ('*.e',), ('text/x-eiffel',)),
     #'ElixirConsoleLexer': ('pygments.lexers.erlang', 'Elixir iex session', ('iex',), (), ('text/x-elixir-shellsession',)),
     'ElixirLexer': ('pygments.lexers.erlang', 'Elixir', ('elixir', 'ex', 'exs'), ('*.ex', '*.eex', '*.exs'), ('text/x-elixir',)),
     'ElmLexer': ('pygments.lexers.elm', 'Elm', ('elm',), ('*.elm',), ('text/x-elm',)),
-    'EmacsLispLexer': ('pygments.lexers.lisp', 'EmacsLisp', ('emacs', 'elisp', 'emacs-lisp'), ('*.el',), ('text/x-elisp', 'application/x-elisp')),
-    'EmailLexer': ('pygments.lexers.email', 'E-mail', ('email', 'eml'), ('*.eml',), ('message/rfc822',)),
+    #'EmacsLispLexer': ('pygments.lexers.lisp', 'EmacsLisp', ('emacs', 'elisp', 'emacs-lisp'), ('*.el',), ('text/x-elisp', 'application/x-elisp')),
+    #'EmailLexer': ('pygments.lexers.email', 'E-mail', ('email', 'eml'), ('*.eml',), ('message/rfc822',)),
     'ErbLexer': ('pygments.lexers.templates', 'ERB', ('erb',), (), ('application/x-ruby-templating',)),
     'ErlangLexer': ('pygments.lexers.erlang', 'Erlang', ('erlang',), ('*.erl', '*.hrl', '*.es', '*.escript'), ('text/x-erlang',)),
     #'ErlangShellLexer': ('pygments.lexers.erlang', 'Erlang erl session', ('erl',), ('*.erl-sh',), ('text/x-erl-shellsession',)),
     #'EvoqueHtmlLexer': ('pygments.lexers.templates', 'HTML+Evoque', ('html+evoque',), ('*.html',), ('text/html+evoque',)),
     #'EvoqueLexer': ('pygments.lexers.templates', 'Evoque', ('evoque',), ('*.evoque',), ('application/x-evoque',)),
     #'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',)),
+    #'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',)),
-    'FStarLexer': ('pygments.lexers.ml', 'FStar', ('fstar',), ('*.fst', '*.fsti'), ('text/x-fstar',)),
+    #'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',), ()),
-    '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',), ()),
+    #'FennelLexer': ('pygments.lexers.lisp', 'Fennel', ('fennel', 'fnl'), ('*.fnl',), ()),
+    #'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',), ()),
     'ForthLexer': ('pygments.lexers.forth', 'Forth', ('forth',), ('*.frt', '*.fs'), ('application/x-forth',)),
     'FortranFixedLexer': ('pygments.lexers.fortran', 'FortranFixed', ('fortranfixed',), ('*.f', '*.F'), ()),
     'FortranLexer': ('pygments.lexers.fortran', 'Fortran', ('fortran',), ('*.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',)),
+    #'FreeFemLexer': ('pygments.lexers.freefem', 'Freefem', ('freefem',), ('*.edp',), ('text/x-freefem',)),
     #'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',)),
+    #'GLShaderLexer': ('pygments.lexers.graphics', 'GLSL', ('glsl',), ('*.vert', '*.frag', '*.geo'), ('text/x-glslsrc',)),
     'GasLexer': ('pygments.lexers.asm', 'GAS', ('gas', 'asm'), ('*.s', '*.S'), ('text/x-gas',)),
     #'GenshiLexer': ('pygments.lexers.templates', 'Genshi', ('genshi', 'kid', 'xml+genshi', 'xml+kid'), ('*.kid',), ('application/x-genshi', 'application/x-kid')),
     #'GenshiTextLexer': ('pygments.lexers.templates', 'Genshi Text', ('genshitext',), (), ('application/x-genshi-text', 'text/x-genshi')),
@@ -192,15 +192,15 @@
     #'GosuTemplateLexer': ('pygments.lexers.jvm', 'Gosu Template', ('gst',), ('*.gst',), ('text/x-gosu-template',)),
     #'GroffLexer': ('pygments.lexers.markup', 'Groff', ('groff', 'nroff', 'man'), ('*.[1234567]', '*.man'), ('application/x-troff', 'text/troff')),
     'GroovyLexer': ('pygments.lexers.jvm', 'Groovy', ('groovy',), ('*.groovy', '*.gradle'), ('text/x-groovy',)),
-    'HLSLShaderLexer': ('pygments.lexers.graphics', 'HLSL', ('hlsl',), ('*.hlsl', '*.hlsli'), ('text/x-hlsl',)),
+    #'HLSLShaderLexer': ('pygments.lexers.graphics', 'HLSL', ('hlsl',), ('*.hlsl', '*.hlsli'), ('text/x-hlsl',)),
     #'HamlLexer': ('pygments.lexers.html', 'Haml', ('haml',), ('*.haml',), ('text/x-haml',)),
     #'HandlebarsHtmlLexer': ('pygments.lexers.templates', 'HTML+Handlebars', ('html+handlebars',), ('*.handlebars', '*.hbs'), ('text/html+handlebars', 'text/x-handlebars-template')),
     #'HandlebarsLexer': ('pygments.lexers.templates', 'Handlebars', ('handlebars',), (), ()),
     'HaskellLexer': ('pygments.lexers.haskell', 'Haskell', ('haskell', 'hs'), ('*.hs',), ('text/x-haskell',)),
     'HaxeLexer': ('pygments.lexers.haxe', 'Haxe', ('hx', 'haxe', 'hxsl'), ('*.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',), (), ()),
+    #'HexdumpLexer': ('pygments.lexers.hexdump', 'Hexdump', ('hexdump',), (), ()),
+    #'HsailLexer': ('pygments.lexers.asm', 'HSAIL', ('hsail', 'hsa'), ('*.hsail',), ('text/x-hsail',)),
+    #'HspecLexer': ('pygments.lexers.haskell', 'Hspec', ('hspec',), (), ()),
     #'HtmlDjangoLexer': ('pygments.lexers.templates', 'HTML+Django/Jinja', ('html+django', 'html+jinja', 'htmldjango'), (), ('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')),
@@ -211,7 +211,7 @@
     #'HyLexer': ('pygments.lexers.lisp', 'Hy', ('hylang',), ('*.hy',), ('text/x-hy', 'application/x-hy')),
     #'HybrisLexer': ('pygments.lexers.scripting', 'Hybris', ('hybris', 'hy'), ('*.hy', '*.hyb'), ('text/x-hybris', 'application/x-hybris')),
     #'IDLLexer': ('pygments.lexers.idl', 'IDL', ('idl',), ('*.pro',), ('text/idl',)),
-    'IconLexer': ('pygments.lexers.unicon', 'Icon', ('icon',), ('*.icon', '*.ICON'), ()),
+    #'IconLexer': ('pygments.lexers.unicon', 'Icon', ('icon',), ('*.icon', '*.ICON'), ()),
     #'IdrisLexer': ('pygments.lexers.haskell', 'Idris', ('idris', 'idr'), ('*.idr',), ('text/x-idris',)),
     #'IgorLexer': ('pygments.lexers.igor', 'Igor', ('igor', 'igorpro'), ('*.ipf',), ('text/ipf',)),
     #'Inform6Lexer': ('pygments.lexers.int_fiction', 'Inform 6', ('inform6', 'i6'), ('*.inf',), ()),
@@ -222,7 +222,7 @@
     #'IokeLexer': ('pygments.lexers.jvm', 'Ioke', ('ioke', 'ik'), ('*.ik',), ('text/x-iokesrc',)),
     #'IrcLogsLexer': ('pygments.lexers.textfmts', 'IRC logs', ('irc',), ('*.weechatlog',), ('text/x-irclog',)),
     #'IsabelleLexer': ('pygments.lexers.theorem', 'Isabelle', ('isabelle',), ('*.thy',), ('text/x-isabelle',)),
-    'JLexer': ('pygments.lexers.j', 'J', ('j',), ('*.ijs',), ('text/x-j',)),
+    #'JLexer': ('pygments.lexers.j', 'J', ('j',), ('*.ijs',), ('text/x-j',)),
     #'JagsLexer': ('pygments.lexers.modeling', 'JAGS', ('jags',), ('*.jag', '*.bug'), ()),
     #'JasminLexer': ('pygments.lexers.jvm', 'Jasmin', ('jasmin', 'jasminxt'), ('*.j',), ()),
     'JavaLexer': ('pygments.lexers.jvm', 'Java', ('java',), ('*.java',), ('text/x-java',)),
@@ -232,18 +232,18 @@
     'JavascriptLexer': ('pygments.lexers.javascript', 'JavaScript', ('js', 'javascript'), ('*.js', '*.jsm', '*.mjs'), ('application/javascript', 'application/x-javascript', 'text/x-javascript', 'text/javascript')),
     #'JavascriptPhpLexer': ('pygments.lexers.templates', 'JavaScript+PHP', ('js+php', 'javascript+php'), (), ('application/x-javascript+php', 'text/x-javascript+php', 'text/javascript+php')),
     #'JavascriptSmartyLexer': ('pygments.lexers.templates', 'JavaScript+Smarty', ('js+smarty', 'javascript+smarty'), (), ('application/x-javascript+smarty', 'text/x-javascript+smarty', 'text/javascript+smarty')),
-    'JclLexer': ('pygments.lexers.scripting', 'JCL', ('jcl',), ('*.jcl',), ('text/x-jcl',)),
-    'JsgfLexer': ('pygments.lexers.grammar_notation', 'JSGF', ('jsgf',), ('*.jsgf',), ('application/jsgf', 'application/x-jsgf', 'text/jsgf')),
-    'JsonBareObjectLexer': ('pygments.lexers.data', 'JSONBareObject', ('json-object',), (), ('application/json-object',)),
-    'JsonLdLexer': ('pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
+    #'JclLexer': ('pygments.lexers.scripting', 'JCL', ('jcl',), ('*.jcl',), ('text/x-jcl',)),
+    #'JsgfLexer': ('pygments.lexers.grammar_notation', 'JSGF', ('jsgf',), ('*.jsgf',), ('application/jsgf', 'application/x-jsgf', 'text/jsgf')),
+    #'JsonBareObjectLexer': ('pygments.lexers.data', 'JSONBareObject', ('json-object',), (), ('application/json-object',)),
+    #'JsonLdLexer': ('pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
     'JsonLexer': ('pygments.lexers.data', 'JSON', ('json',), ('*.json', 'Pipfile.lock'), ('application/json',)),
     #'JspLexer': ('pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)),
     #'JuliaConsoleLexer': ('pygments.lexers.julia', 'Julia console', ('jlcon',), (), ()),
     #'JuliaLexer': ('pygments.lexers.julia', 'Julia', ('julia', 'jl'), ('*.jl',), ('text/x-julia', 'application/x-julia')),
-    'JuttleLexer': ('pygments.lexers.javascript', 'Juttle', ('juttle', 'juttle'), ('*.juttle',), ('application/juttle', 'application/x-juttle', 'text/x-juttle', 'text/juttle')),
+    #'JuttleLexer': ('pygments.lexers.javascript', 'Juttle', ('juttle', 'juttle'), ('*.juttle',), ('application/juttle', 'application/x-juttle', 'text/x-juttle', 'text/juttle')),
     #'KalLexer': ('pygments.lexers.javascript', 'Kal', ('kal',), ('*.kal',), ('text/kal', 'application/kal')),
     #'KconfigLexer': ('pygments.lexers.configs', 'Kconfig', ('kconfig', 'menuconfig', 'linux-config', 'kernel-config'), ('Kconfig*', '*Config.in*', 'external.in*', 'standard-modules.in'), ('text/x-kconfig',)),
-    'KernelLogLexer': ('pygments.lexers.textfmts', 'Kernel log', ('kmsg', 'dmesg'), ('*.kmsg', '*.dmesg'), ()),
+    #'KernelLogLexer': ('pygments.lexers.textfmts', 'Kernel log', ('kmsg', 'dmesg'), ('*.kmsg', '*.dmesg'), ()),
     #'KokaLexer': ('pygments.lexers.haskell', 'Koka', ('koka',), ('*.kk', '*.kki'), ('text/x-koka',)),
     'KotlinLexer': ('pygments.lexers.jvm', 'Kotlin', ('kotlin',), ('*.kt',), ('text/x-kotlin',)),
     #'LSLLexer': ('pygments.lexers.scripting', 'LSL', ('lsl',), ('*.lsl',), ('text/x-lsl',)),
@@ -263,14 +263,14 @@
     #'LiterateIdrisLexer': ('pygments.lexers.haskell', 'Literate Idris', ('lidr', 'literate-idris', 'lidris'), ('*.lidr',), ('text/x-literate-idris',)),
     #'LiveScriptLexer': ('pygments.lexers.javascript', 'LiveScript', ('live-script', 'livescript'), ('*.ls',), ('text/livescript',)),
     #'LlvmLexer': ('pygments.lexers.asm', 'LLVM', ('llvm',), ('*.ll',), ('text/x-llvm',)),
-    'LlvmMirBodyLexer': ('pygments.lexers.asm', 'LLVM-MIR Body', ('llvm-mir-body',), (), ()),
-    'LlvmMirLexer': ('pygments.lexers.asm', 'LLVM-MIR', ('llvm-mir',), ('*.mir',), ()),
+    #'LlvmMirBodyLexer': ('pygments.lexers.asm', 'LLVM-MIR Body', ('llvm-mir-body',), (), ()),
+    #'LlvmMirLexer': ('pygments.lexers.asm', 'LLVM-MIR', ('llvm-mir',), ('*.mir',), ()),
     #'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')),
-    'MIMELexer': ('pygments.lexers.mime', 'MIME', ('mime',), (), ('multipart/mixed', 'multipart/related', 'multipart/alternative')),
+    #'MIMELexer': ('pygments.lexers.mime', 'MIME', ('mime',), (), ('multipart/mixed', 'multipart/related', 'multipart/alternative')),
     #'MOOCodeLexer': ('pygments.lexers.scripting', 'MOOCode', ('moocode', 'moo'), ('*.moo',), ('text/x-moocode',)),
-    'MSDOSSessionLexer': ('pygments.lexers.shell', 'MSDOS Session', ('doscon',), (), ()),
+    #'MSDOSSessionLexer': ('pygments.lexers.shell', 'MSDOS Session', ('doscon',), (), ()),
     #'MakefileLexer': ('pygments.lexers.make', 'Makefile', ('make', 'makefile', 'mf', 'bsdmake'), ('*.mak', '*.mk', 'Makefile', 'makefile', 'Makefile.*', 'GNUmakefile'), ('text/x-makefile',)),
     #'MakoCssLexer': ('pygments.lexers.templates', 'CSS+Mako', ('css+mako',), (), ('text/css+mako',)),
     #'MakoHtmlLexer': ('pygments.lexers.templates', 'HTML+Mako', ('html+mako',), (), ('text/html+mako',)),
@@ -278,21 +278,21 @@
     #'MakoLexer': ('pygments.lexers.templates', 'Mako', ('mako',), ('*.mao',), ('application/x-mako',)),
     #'MakoXmlLexer': ('pygments.lexers.templates', 'XML+Mako', ('xml+mako',), (), ('application/xml+mako',)),
     #'MaqlLexer': ('pygments.lexers.business', 'MAQL', ('maql',), ('*.maql',), ('text/x-gooddata-maql', 'application/x-gooddata-maql')),
-    'MarkdownLexer': ('pygments.lexers.markup', 'markdown', ('md',), ('*.md', '*.markdown'), ('text/x-markdown',)),
+    #'MarkdownLexer': ('pygments.lexers.markup', 'markdown', ('md',), ('*.md', '*.markdown'), ('text/x-markdown',)),
     #'MaskLexer': ('pygments.lexers.javascript', 'Mask', ('mask',), ('*.mask',), ('text/x-mask',)),
     #'MasonLexer': ('pygments.lexers.templates', 'Mason', ('mason',), ('*.m', '*.mhtml', '*.mc', '*.mi', 'autohandler', 'dhandler'), ('application/x-mason',)),
     #'MathematicaLexer': ('pygments.lexers.algebra', 'Mathematica', ('mathematica', 'mma', 'nb'), ('*.nb', '*.cdf', '*.nbp', '*.ma'), ('application/mathematica', 'application/vnd.wolfram.mathematica', 'application/vnd.wolfram.mathematica.package', 'application/vnd.wolfram.cdf')),
     #'MatlabLexer': ('pygments.lexers.matlab', 'Matlab', ('matlab',), ('*.m',), ('text/matlab',)),
     #'MatlabSessionLexer': ('pygments.lexers.matlab', 'Matlab session', ('matlabsession',), (), ()),
     #'MiniDLexer': ('pygments.lexers.d', 'MiniD', ('minid',), (), ('text/x-minidsrc',)),
-    'MiniScriptLexer': ('pygments.lexers.scripting', 'MiniScript', ('ms', 'miniscript'), ('*.ms',), ('text/x-minicript', 'application/x-miniscript')),
+    #'MiniScriptLexer': ('pygments.lexers.scripting', 'MiniScript', ('ms', 'miniscript'), ('*.ms',), ('text/x-minicript', 'application/x-miniscript')),
     #'ModelicaLexer': ('pygments.lexers.modeling', 'Modelica', ('modelica',), ('*.mo',), ('text/x-modelica',)),
     #'Modula2Lexer': ('pygments.lexers.modula2', 'Modula-2', ('modula2', 'm2'), ('*.def', '*.mod'), ('text/x-modula2',)),
     #'MoinWikiLexer': ('pygments.lexers.markup', 'MoinMoin/Trac Wiki markup', ('trac-wiki', 'moin'), (), ('text/x-trac-wiki',)),
     #'MonkeyLexer': ('pygments.lexers.basic', 'Monkey', ('monkey',), ('*.monkey',), ('text/x-monkey',)),
-    'MonteLexer': ('pygments.lexers.monte', 'Monte', ('monte',), ('*.mt',), ()),
+    #'MonteLexer': ('pygments.lexers.monte', 'Monte', ('monte',), ('*.mt',), ()),
     #'MoonScriptLexer': ('pygments.lexers.scripting', 'MoonScript', ('moon', 'moonscript'), ('*.moon',), ('text/x-moonscript', 'application/x-moonscript')),
-    'MoselLexer': ('pygments.lexers.mosel', 'Mosel', ('mosel',), ('*.mos',), ()),
+    #'MoselLexer': ('pygments.lexers.mosel', 'Mosel', ('mosel',), ('*.mos',), ()),
     #'MozPreprocCssLexer': ('pygments.lexers.markup', 'CSS+mozpreproc', ('css+mozpreproc',), ('*.css.in',), ()),
     #'MozPreprocHashLexer': ('pygments.lexers.markup', 'mozhashpreproc', ('mozhashpreproc',), (), ()),
     #'MozPreprocJavascriptLexer': ('pygments.lexers.markup', 'Javascript+mozpreproc', ('javascript+mozpreproc',), ('*.js.in',), ()),
@@ -308,7 +308,7 @@
     #'MyghtyJavascriptLexer': ('pygments.lexers.templates', 'JavaScript+Myghty', ('js+myghty', 'javascript+myghty'), (), ('application/x-javascript+myghty', 'text/x-javascript+myghty', 'text/javascript+mygthy')),
     #'MyghtyLexer': ('pygments.lexers.templates', 'Myghty', ('myghty',), ('*.myt', 'autodelegate'), ('application/x-myghty',)),
     #'MyghtyXmlLexer': ('pygments.lexers.templates', 'XML+Myghty', ('xml+myghty',), (), ('application/xml+myghty',)),
-    'NCLLexer': ('pygments.lexers.ncl', 'NCL', ('ncl',), ('*.ncl',), ('text/ncl',)),
+    #'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',)),
     #'NasmObjdumpLexer': ('pygments.lexers.asm', 'objdump-nasm', ('objdump-nasm',), ('*.objdump-intel',), ('text/x-nasm-objdump',)),
@@ -320,58 +320,58 @@
     #'NimrodLexer': ('pygments.lexers.nimrod', 'Nimrod', ('nim', 'nimrod'), ('*.nim', '*.nimrod'), ('text/x-nim',)),
     #'NitLexer': ('pygments.lexers.nit', 'Nit', ('nit',), ('*.nit',), ()),
     #'NixLexer': ('pygments.lexers.nix', 'Nix', ('nixos', 'nix'), ('*.nix',), ('text/x-nix',)),
-    'NotmuchLexer': ('pygments.lexers.textfmts', 'Notmuch', ('notmuch',), (), ()),
-    'NuSMVLexer': ('pygments.lexers.smv', 'NuSMV', ('nusmv',), ('*.smv',), ()),
+    #'NotmuchLexer': ('pygments.lexers.textfmts', 'Notmuch', ('notmuch',), (), ()),
+    #'NuSMVLexer': ('pygments.lexers.smv', 'NuSMV', ('nusmv',), ('*.smv',), ()),
     #'NumPyLexer': ('pygments.lexers.python', 'NumPy', ('numpy',), (), ()),
     #'ObjdumpLexer': ('pygments.lexers.asm', 'objdump', ('objdump',), ('*.objdump',), ('text/x-objdump',)),
     'ObjectiveCLexer': ('pygments.lexers.objective', 'Objective-C', ('objective-c', 'objectivec', 'obj-c', 'objc'), ('*.m', '*.h'), ('text/x-objective-c',)),
     'ObjectiveCppLexer': ('pygments.lexers.objective', 'Objective-C++', ('objective-c++', 'objectivec++', 'obj-c++', 'objc++'), ('*.mm', '*.hh'), ('text/x-objective-c++',)),
-    'ObjectiveJLexer': ('pygments.lexers.javascript', 'Objective-J', ('objective-j', 'objectivej', 'obj-j', 'objj'), ('*.j',), ('text/x-objective-j',)),
+    #'ObjectiveJLexer': ('pygments.lexers.javascript', 'Objective-J', ('objective-j', 'objectivej', 'obj-j', 'objj'), ('*.j',), ('text/x-objective-j',)),
     'OcamlLexer': ('pygments.lexers.ml', 'OCaml', ('ocaml',), ('*.ml', '*.mli', '*.mll', '*.mly'), ('text/x-ocaml',)),
     #'OctaveLexer': ('pygments.lexers.matlab', 'Octave', ('octave',), ('*.m',), ('text/octave',)),
-    'OdinLexer': ('pygments.lexers.archetype', 'ODIN', ('odin',), ('*.odin',), ('text/odin',)),
+    #'OdinLexer': ('pygments.lexers.archetype', 'ODIN', ('odin',), ('*.odin',), ('text/odin',)),
     #'OocLexer': ('pygments.lexers.ooc', 'Ooc', ('ooc',), ('*.ooc',), ('text/x-ooc',)),
     #'OpaLexer': ('pygments.lexers.ml', 'Opa', ('opa',), ('*.opa',), ('text/x-opa',)),
     #'OpenEdgeLexer': ('pygments.lexers.business', 'OpenEdge ABL', ('openedge', 'abl', 'progress'), ('*.p', '*.cls'), ('text/x-openedge', 'application/x-openedge')),
-    'PacmanConfLexer': ('pygments.lexers.configs', 'PacmanConf', ('pacmanconf',), ('pacman.conf',), ()),
+    #'PacmanConfLexer': ('pygments.lexers.configs', 'PacmanConf', ('pacmanconf',), ('pacman.conf',), ()),
     #'PanLexer': ('pygments.lexers.dsls', 'Pan', ('pan',), ('*.pan',), ()),
-    'ParaSailLexer': ('pygments.lexers.parasail', 'ParaSail', ('parasail',), ('*.psi', '*.psl'), ('text/x-parasail',)),
+    #'ParaSailLexer': ('pygments.lexers.parasail', 'ParaSail', ('parasail',), ('*.psi', '*.psl'), ('text/x-parasail',)),
     #'PawnLexer': ('pygments.lexers.pawn', 'Pawn', ('pawn',), ('*.p', '*.pwn', '*.inc'), ('text/x-pawn',)),
-    'PegLexer': ('pygments.lexers.grammar_notation', 'PEG', ('peg',), ('*.peg',), ('text/x-peg',)),
+    #'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')),
     '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',)),
-    'PkgConfigLexer': ('pygments.lexers.configs', 'PkgConfig', ('pkgconfig',), ('*.pc',), ()),
+    #'PkgConfigLexer': ('pygments.lexers.configs', 'PkgConfig', ('pkgconfig',), ('*.pc',), ()),
     #'PlPgsqlLexer': ('pygments.lexers.sql', 'PL/pgSQL', ('plpgsql',), (), ('text/x-plpgsql',)),
-    'PointlessLexer': ('pygments.lexers.pointless', 'Pointless', ('pointless',), ('*.ptls',), ()),
-    'PonyLexer': ('pygments.lexers.pony', 'Pony', ('pony',), ('*.pony',), ()),
+    #'PointlessLexer': ('pygments.lexers.pointless', 'Pointless', ('pointless',), ('*.ptls',), ()),
+    #'PonyLexer': ('pygments.lexers.pony', 'Pony', ('pony',), ('*.pony',), ()),
     #'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',)),
     #'PovrayLexer': ('pygments.lexers.graphics', 'POVRay', ('pov',), ('*.pov', '*.inc'), ('text/x-povray',)),
     'PowerShellLexer': ('pygments.lexers.shell', 'PowerShell', ('powershell', 'posh', 'ps1', 'psm1'), ('*.ps1', '*.psm1'), ('text/x-powershell',)),
-    'PowerShellSessionLexer': ('pygments.lexers.shell', 'PowerShell Session', ('ps1con',), (), ()),
-    'PraatLexer': ('pygments.lexers.praat', 'Praat', ('praat',), ('*.praat', '*.proc', '*.psc'), ()),
-    'PrologLexer': ('pygments.lexers.prolog', 'Prolog', ('prolog',), ('*.ecl', '*.prolog', '*.pro', '*.pl'), ('text/x-prolog',)),
-    'PromQLLexer': ('pygments.lexers.promql', 'PromQL', ('promql',), ('*.promql',), ()),
+    #'PowerShellSessionLexer': ('pygments.lexers.shell', 'PowerShell Session', ('ps1con',), (), ()),
+    #'PraatLexer': ('pygments.lexers.praat', 'Praat', ('praat',), ('*.praat', '*.proc', '*.psc'), ()),
+    #'PrologLexer': ('pygments.lexers.prolog', 'Prolog', ('prolog',), ('*.ecl', '*.prolog', '*.pro', '*.pl'), ('text/x-prolog',)),
+    #'PromQLLexer': ('pygments.lexers.promql', 'PromQL', ('promql',), ('*.promql',), ()),
     #'PropertiesLexer': ('pygments.lexers.configs', 'Properties', ('properties', 'jproperties'), ('*.properties',), ('text/x-java-properties',)),
     #'ProtoBufLexer': ('pygments.lexers.dsls', 'Protocol Buffer', ('protobuf', 'proto'), ('*.proto',), ()),
-    'PsyshConsoleLexer': ('pygments.lexers.php', 'PsySH console session for PHP', ('psysh',), (), ()),
-    'PugLexer': ('pygments.lexers.html', 'Pug', ('pug', 'jade'), ('*.pug', '*.jade'), ('text/x-pug', 'text/x-jade')),
+    #'PsyshConsoleLexer': ('pygments.lexers.php', 'PsySH console session for PHP', ('psysh',), (), ()),
+    #'PugLexer': ('pygments.lexers.html', 'Pug', ('pug', 'jade'), ('*.pug', '*.jade'), ('text/x-pug', 'text/x-jade')),
     #'PuppetLexer': ('pygments.lexers.dsls', 'Puppet', ('puppet',), ('*.pp',), ()),
     #'PyPyLogLexer': ('pygments.lexers.console', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
-    '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',)),
+    #'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')),
     #'PythonTracebackLexer': ('pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
     #'QBasicLexer': ('pygments.lexers.basic', 'QBasic', ('qbasic', 'basic'), ('*.BAS', '*.bas'), ('text/basic',)),
-    'QVToLexer': ('pygments.lexers.qvt', 'QVTO', ('qvto', 'qvt'), ('*.qvto',), ()),
+    #'QVToLexer': ('pygments.lexers.qvt', 'QVTO', ('qvto', 'qvt'), ('*.qvto',), ()),
     #'QmlLexer': ('pygments.lexers.webmisc', 'QML', ('qml', 'qbs'), ('*.qml', '*.qbs'), ('application/x-qml', 'application/x-qt.qbs+qml')),
     #'RConsoleLexer': ('pygments.lexers.r', 'RConsole', ('rconsole', 'rout'), ('*.Rout',), ()),
-    'RNCCompactLexer': ('pygments.lexers.rnc', 'Relax-NG Compact', ('rnc', 'rng-compact'), ('*.rnc',), ()),
+    #'RNCCompactLexer': ('pygments.lexers.rnc', 'Relax-NG Compact', ('rnc', 'rng-compact'), ('*.rnc',), ()),
     #'RPMSpecLexer': ('pygments.lexers.installers', 'RPMSpec', ('spec',), ('*.spec',), ('text/x-rpm-spec',)),
     #'RacketLexer': ('pygments.lexers.lisp', 'Racket', ('racket', 'rkt'), ('*.rkt', '*.rktd', '*.rktl'), ('text/x-racket', 'application/x-racket')),
     #'RagelCLexer': ('pygments.lexers.parsers', 'Ragel in C Host', ('ragel-c',), ('*.rl',), ()),
@@ -384,7 +384,7 @@
     #'RagelRubyLexer': ('pygments.lexers.parsers', 'Ragel in Ruby Host', ('ragel-ruby', 'ragel-rb'), ('*.rl',), ()),
     #'RawTokenLexer': ('pygments.lexers.special', 'Raw token data', ('raw',), (), ('application/x-pygments-tokens',)),
     #'RdLexer': ('pygments.lexers.r', 'Rd', ('rd',), ('*.Rd',), ('text/x-r-doc',)),
-    'ReasonLexer': ('pygments.lexers.ml', 'ReasonML', ('reason', 'reasonml'), ('*.re', '*.rei'), ('text/x-reasonml',)),
+    #'ReasonLexer': ('pygments.lexers.ml', 'ReasonML', ('reason', 'reasonml'), ('*.re', '*.rei'), ('text/x-reasonml',)),
     #'RebolLexer': ('pygments.lexers.rebol', 'REBOL', ('rebol',), ('*.r', '*.r3', '*.reb'), ('text/x-rebol',)),
     #'RedLexer': ('pygments.lexers.rebol', 'Red', ('red', 'red/system'), ('*.red', '*.reds'), ('text/x-red', 'text/x-red-system')),
     #'RedcodeLexer': ('pygments.lexers.esoteric', 'Redcode', ('redcode',), ('*.cw',), ()),
@@ -392,90 +392,90 @@
     #'ResourceLexer': ('pygments.lexers.resource', 'ResourceBundle', ('resource', 'resourcebundle'), (), ()),
     #'RexxLexer': ('pygments.lexers.scripting', 'Rexx', ('rexx', 'arexx'), ('*.rexx', '*.rex', '*.rx', '*.arexx'), ('text/x-rexx',)),
     #'RhtmlLexer': ('pygments.lexers.templates', 'RHTML', ('rhtml', 'html+erb', 'html+ruby'), ('*.rhtml',), ('text/html+ruby',)),
-    'RideLexer': ('pygments.lexers.ride', 'Ride', ('ride',), ('*.ride',), ('text/x-ride',)),
-    'RoboconfGraphLexer': ('pygments.lexers.roboconf', 'Roboconf Graph', ('roboconf-graph',), ('*.graph',), ()),
-    'RoboconfInstancesLexer': ('pygments.lexers.roboconf', 'Roboconf Instances', ('roboconf-instances',), ('*.instances',), ()),
+    #'RideLexer': ('pygments.lexers.ride', 'Ride', ('ride',), ('*.ride',), ('text/x-ride',)),
+    #'RoboconfGraphLexer': ('pygments.lexers.roboconf', 'Roboconf Graph', ('roboconf-graph',), ('*.graph',), ()),
+    #'RoboconfInstancesLexer': ('pygments.lexers.roboconf', 'Roboconf Instances', ('roboconf-instances',), ('*.instances',), ()),
     #'RobotFrameworkLexer': ('pygments.lexers.robotframework', 'RobotFramework', ('robotframework',), ('*.robot',), ('text/x-robotframework',)),
     #'RqlLexer': ('pygments.lexers.sql', 'RQL', ('rql',), ('*.rql',), ('text/x-rql',)),
     #'RslLexer': ('pygments.lexers.dsls', 'RSL', ('rsl',), ('*.rsl',), ('text/rsl',)),
     #'RstLexer': ('pygments.lexers.markup', 'reStructuredText', ('rst', 'rest', 'restructuredtext'), ('*.rst', '*.rest'), ('text/x-rst', 'text/prs.fallenstein.rst')),
-    'RtsLexer': ('pygments.lexers.trafficscript', 'TrafficScript', ('rts', 'trafficscript'), ('*.rts',), ()),
+    #'RtsLexer': ('pygments.lexers.trafficscript', 'TrafficScript', ('rts', 'trafficscript'), ('*.rts',), ()),
     #'RubyConsoleLexer': ('pygments.lexers.ruby', 'Ruby irb session', ('rbcon', 'irb'), (), ('text/x-ruby-shellsession',)),
     'RubyLexer': ('pygments.lexers.ruby', 'Ruby', ('rb', 'ruby', 'duby'), ('*.rb', '*.rbw', 'Rakefile', '*.rake', '*.gemspec', '*.rbx', '*.duby', 'Gemfile'), ('text/x-ruby', 'application/x-ruby')),
     'RustLexer': ('pygments.lexers.rust', 'Rust', ('rust', 'rs'), ('*.rs', '*.rs.in'), ('text/rust', 'text/x-rust')),
-    'SASLexer': ('pygments.lexers.sas', 'SAS', ('sas',), ('*.SAS', '*.sas'), ('text/x-sas', 'text/sas', 'application/x-sas')),
+    #'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')),
-    'SarlLexer': ('pygments.lexers.jvm', 'SARL', ('sarl',), ('*.sarl',), ('text/x-sarl',)),
+    #'SarlLexer': ('pygments.lexers.jvm', 'SARL', ('sarl',), ('*.sarl',), ('text/x-sarl',)),
     'SassLexer': ('pygments.lexers.css', 'Sass', ('sass',), ('*.sass',), ('text/x-sass',)),
     'ScalaLexer': ('pygments.lexers.jvm', 'Scala', ('scala',), ('*.scala',), ('text/x-scala',)),
     #'ScamlLexer': ('pygments.lexers.html', 'Scaml', ('scaml',), ('*.scaml',), ('text/x-scaml',)),
-    'ScdocLexer': ('pygments.lexers.scdoc', 'scdoc', ('scdoc', 'scd'), ('*.scd', '*.scdoc'), ()),
+    #'ScdocLexer': ('pygments.lexers.scdoc', 'scdoc', ('scdoc', 'scd'), ('*.scd', '*.scdoc'), ()),
     #'SchemeLexer': ('pygments.lexers.lisp', 'Scheme', ('scheme', 'scm'), ('*.scm', '*.ss'), ('text/x-scheme', 'application/x-scheme')),
     #'ScilabLexer': ('pygments.lexers.matlab', 'Scilab', ('scilab',), ('*.sci', '*.sce', '*.tst'), ('text/scilab',)),
     'ScssLexer': ('pygments.lexers.css', 'SCSS', ('scss',), ('*.scss',), ('text/x-scss',)),
-    'ShExCLexer': ('pygments.lexers.rdf', 'ShExC', ('shexc', 'shex'), ('*.shex',), ('text/shex',)),
-    'ShenLexer': ('pygments.lexers.lisp', 'Shen', ('shen',), ('*.shen',), ('text/x-shen', 'application/x-shen')),
-    'SieveLexer': ('pygments.lexers.sieve', 'Sieve', ('sieve',), ('*.siv', '*.sieve'), ()),
-    'SilverLexer': ('pygments.lexers.verification', 'Silver', ('silver',), ('*.sil', '*.vpr'), ()),
-    'SingularityLexer': ('pygments.lexers.configs', 'Singularity', ('singularity',), ('*.def', 'Singularity'), ()),
-    'SlashLexer': ('pygments.lexers.slash', 'Slash', ('slash',), ('*.sl',), ()),
+    #'ShExCLexer': ('pygments.lexers.rdf', 'ShExC', ('shexc', 'shex'), ('*.shex',), ('text/shex',)),
+    #'ShenLexer': ('pygments.lexers.lisp', 'Shen', ('shen',), ('*.shen',), ('text/x-shen', 'application/x-shen')),
+    #'SieveLexer': ('pygments.lexers.sieve', 'Sieve', ('sieve',), ('*.siv', '*.sieve'), ()),
+    #'SilverLexer': ('pygments.lexers.verification', 'Silver', ('silver',), ('*.sil', '*.vpr'), ()),
+    #'SingularityLexer': ('pygments.lexers.configs', 'Singularity', ('singularity',), ('*.def', 'Singularity'), ()),
+    #'SlashLexer': ('pygments.lexers.slash', 'Slash', ('slash',), ('*.sl',), ()),
     #'SlimLexer': ('pygments.lexers.webmisc', 'Slim', ('slim',), ('*.slim',), ('text/x-slim',)),
-    'SlurmBashLexer': ('pygments.lexers.shell', 'Slurm', ('slurm', 'sbatch'), ('*.sl',), ()),
+    #'SlurmBashLexer': ('pygments.lexers.shell', 'Slurm', ('slurm', 'sbatch'), ('*.sl',), ()),
     #'SmaliLexer': ('pygments.lexers.dalvik', 'Smali', ('smali',), ('*.smali',), ('text/smali',)),
-    'SmalltalkLexer': ('pygments.lexers.smalltalk', 'Smalltalk', ('smalltalk', 'squeak', 'st'), ('*.st',), ('text/x-smalltalk',)),
-    'SmartGameFormatLexer': ('pygments.lexers.sgf', 'SmartGameFormat', ('sgf',), ('*.sgf',), ()),
+    #'SmalltalkLexer': ('pygments.lexers.smalltalk', 'Smalltalk', ('smalltalk', 'squeak', 'st'), ('*.st',), ('text/x-smalltalk',)),
+    #'SmartGameFormatLexer': ('pygments.lexers.sgf', 'SmartGameFormat', ('sgf',), ('*.sgf',), ()),
     #'SmartyLexer': ('pygments.lexers.templates', 'Smarty', ('smarty',), ('*.tpl',), ('application/x-smarty',)),
     #'SnobolLexer': ('pygments.lexers.snobol', 'Snobol', ('snobol',), ('*.snobol',), ('text/x-snobol',)),
-    'SnowballLexer': ('pygments.lexers.dsls', 'Snowball', ('snowball',), ('*.sbl',), ()),
-    'SolidityLexer': ('pygments.lexers.solidity', 'Solidity', ('solidity',), ('*.sol',), ()),
+    #'SnowballLexer': ('pygments.lexers.dsls', 'Snowball', ('snowball',), ('*.sbl',), ()),
+    #'SolidityLexer': ('pygments.lexers.solidity', 'Solidity', ('solidity',), ('*.sol',), ()),
     #'SourcePawnLexer': ('pygments.lexers.pawn', 'SourcePawn', ('sp',), ('*.sp',), ('text/x-sourcepawn',)),
     #'SourcesListLexer': ('pygments.lexers.installers', 'Debian Sourcelist', ('sourceslist', 'sources.list', 'debsources'), ('sources.list',), ()),
     #'SparqlLexer': ('pygments.lexers.rdf', 'SPARQL', ('sparql',), ('*.rq', '*.sparql'), ('application/sparql-query',)),
-    'SqlLexer': ('pygments.lexers.sql', 'SQL', ('sql',), ('*.sql',), ('text/x-sql',)),
+    #'SqlLexer': ('pygments.lexers.sql', 'SQL', ('sql',), ('*.sql',), ('text/x-sql',)),
     #'SqliteConsoleLexer': ('pygments.lexers.sql', 'sqlite3con', ('sqlite3',), ('*.sqlite3-console',), ('text/x-sqlite3-console',)),
     #'SquidConfLexer': ('pygments.lexers.configs', 'SquidConf', ('squidconf', 'squid.conf', 'squid'), ('squid.conf',), ('text/x-squidconf',)),
     #'SspLexer': ('pygments.lexers.templates', 'Scalate Server Page', ('ssp',), ('*.ssp',), ('application/x-ssp',)),
     #'StanLexer': ('pygments.lexers.modeling', 'Stan', ('stan',), ('*.stan',), ()),
-    'StataLexer': ('pygments.lexers.stata', 'Stata', ('stata', 'do'), ('*.do', '*.ado'), ('text/x-stata', 'text/stata', 'application/x-stata')),
-    'SuperColliderLexer': ('pygments.lexers.supercollider', 'SuperCollider', ('sc', 'supercollider'), ('*.sc', '*.scd'), ('application/supercollider', 'text/supercollider')),
+    #'StataLexer': ('pygments.lexers.stata', 'Stata', ('stata', 'do'), ('*.do', '*.ado'), ('text/x-stata', 'text/stata', 'application/x-stata')),
+    #'SuperColliderLexer': ('pygments.lexers.supercollider', 'SuperCollider', ('sc', 'supercollider'), ('*.sc', '*.scd'), ('application/supercollider', 'text/supercollider')),
     'SwiftLexer': ('pygments.lexers.objective', 'Swift', ('swift',), ('*.swift',), ('text/x-swift',)),
     #'SwigLexer': ('pygments.lexers.c_like', 'SWIG', ('swig',), ('*.swg', '*.i'), ('text/swig',)),
     #'SystemVerilogLexer': ('pygments.lexers.hdl', 'systemverilog', ('systemverilog', 'sv'), ('*.sv', '*.svh'), ('text/x-systemverilog',)),
-    'TAPLexer': ('pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
-    'TNTLexer': ('pygments.lexers.tnt', 'Typographic Number Theory', ('tnt',), ('*.tnt',), ()),
-    'TOMLLexer': ('pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ()),
+    #'TAPLexer': ('pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
+    #'TNTLexer': ('pygments.lexers.tnt', 'Typographic Number Theory', ('tnt',), ('*.tnt',), ()),
+    #'TOMLLexer': ('pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ()),
     #'Tads3Lexer': ('pygments.lexers.int_fiction', 'TADS 3', ('tads3',), ('*.t',), ()),
     'TasmLexer': ('pygments.lexers.asm', 'TASM', ('tasm',), ('*.asm', '*.ASM', '*.tasm'), ('text/x-tasm',)),
     'TclLexer': ('pygments.lexers.tcl', 'Tcl', ('tcl',), ('*.tcl', '*.rvt'), ('text/x-tcl', 'text/x-script.tcl', 'application/x-tcl')),
     'TcshLexer': ('pygments.lexers.shell', 'Tcsh', ('tcsh', 'csh'), ('*.tcsh', '*.csh'), ('application/x-csh',)),
-    'TcshSessionLexer': ('pygments.lexers.shell', 'Tcsh Session', ('tcshcon',), (), ()),
+    #'TcshSessionLexer': ('pygments.lexers.shell', 'Tcsh Session', ('tcshcon',), (), ()),
     #'TeaTemplateLexer': ('pygments.lexers.templates', 'Tea', ('tea',), ('*.tea',), ('text/x-tea',)),
-    'TeraTermLexer': ('pygments.lexers.teraterm', 'Tera Term macro', ('ttl', 'teraterm', 'teratermmacro'), ('*.ttl',), ('text/x-teratermmacro',)),
-    'TermcapLexer': ('pygments.lexers.configs', 'Termcap', ('termcap',), ('termcap', 'termcap.src'), ()),
-    'TerminfoLexer': ('pygments.lexers.configs', 'Terminfo', ('terminfo',), ('terminfo', 'terminfo.src'), ()),
-    'TerraformLexer': ('pygments.lexers.configs', 'Terraform', ('terraform', 'tf'), ('*.tf',), ('application/x-tf', 'application/x-terraform')),
+    #'TeraTermLexer': ('pygments.lexers.teraterm', 'Tera Term macro', ('ttl', 'teraterm', 'teratermmacro'), ('*.ttl',), ('text/x-teratermmacro',)),
+    #'TermcapLexer': ('pygments.lexers.configs', 'Termcap', ('termcap',), ('termcap', 'termcap.src'), ()),
+    #'TerminfoLexer': ('pygments.lexers.configs', 'Terminfo', ('terminfo',), ('terminfo', 'terminfo.src'), ()),
+    #'TerraformLexer': ('pygments.lexers.configs', 'Terraform', ('terraform', 'tf'), ('*.tf',), ('application/x-tf', 'application/x-terraform')),
     #'TexLexer': ('pygments.lexers.markup', 'TeX', ('tex', 'latex'), ('*.tex', '*.aux', '*.toc'), ('text/x-tex', 'text/x-latex')),
     #'TextLexer': ('pygments.lexers.special', 'Text only', ('text',), ('*.txt',), ('text/plain',)),
     'ThriftLexer': ('pygments.lexers.dsls', 'Thrift', ('thrift',), ('*.thrift',), ('application/x-thrift',)),
-    'TiddlyWiki5Lexer': ('pygments.lexers.markup', 'tiddler', ('tid',), ('*.tid',), ('text/vnd.tiddlywiki',)),
+    #'TiddlyWiki5Lexer': ('pygments.lexers.markup', 'tiddler', ('tid',), ('*.tid',), ('text/vnd.tiddlywiki',)),
     #'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',)),
+    #'TransactSqlLexer': ('pygments.lexers.sql', 'Transact-SQL', ('tsql', 't-sql'), ('*.sql',), ('text/x-tsql',)),
     #'TreetopLexer': ('pygments.lexers.parsers', 'Treetop', ('treetop',), ('*.treetop', '*.tt'), ()),
-    'TurtleLexer': ('pygments.lexers.rdf', 'Turtle', ('turtle',), ('*.ttl',), ('text/turtle', 'application/x-turtle')),
+    #'TurtleLexer': ('pygments.lexers.rdf', 'Turtle', ('turtle',), ('*.ttl',), ('text/turtle', 'application/x-turtle')),
     #'TwigHtmlLexer': ('pygments.lexers.templates', 'HTML+Twig', ('html+twig',), ('*.twig',), ('text/html+twig',)),
     #'TwigLexer': ('pygments.lexers.templates', 'Twig', ('twig',), (), ('application/x-twig',)),
     'TypeScriptLexer': ('pygments.lexers.javascript', 'TypeScript', ('ts', 'typescript'), ('*.ts', '*.tsx'), ('text/x-typescript',)),
-    'TypoScriptCssDataLexer': ('pygments.lexers.typoscript', 'TypoScriptCssData', ('typoscriptcssdata',), (), ()),
-    'TypoScriptHtmlDataLexer': ('pygments.lexers.typoscript', 'TypoScriptHtmlData', ('typoscripthtmldata',), (), ()),
-    'TypoScriptLexer': ('pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.typoscript',), ('text/x-typoscript',)),
-    'UcodeLexer': ('pygments.lexers.unicon', 'ucode', ('ucode',), ('*.u', '*.u1', '*.u2'), ()),
-    'UniconLexer': ('pygments.lexers.unicon', 'Unicon', ('unicon',), ('*.icn',), ('text/unicon',)),
+    #'TypoScriptCssDataLexer': ('pygments.lexers.typoscript', 'TypoScriptCssData', ('typoscriptcssdata',), (), ()),
+    #'TypoScriptHtmlDataLexer': ('pygments.lexers.typoscript', 'TypoScriptHtmlData', ('typoscripthtmldata',), (), ()),
+    #'TypoScriptLexer': ('pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.typoscript',), ('text/x-typoscript',)),
+    #'UcodeLexer': ('pygments.lexers.unicon', 'ucode', ('ucode',), ('*.u', '*.u1', '*.u2'), ()),
+    #'UniconLexer': ('pygments.lexers.unicon', 'Unicon', ('unicon',), ('*.icn',), ('text/unicon',)),
     #'UrbiscriptLexer': ('pygments.lexers.urbi', 'UrbiScript', ('urbiscript',), ('*.u',), ('application/x-urbiscript',)),
-    'UsdLexer': ('pygments.lexers.usd', 'USD', ('usd', 'usda'), ('*.usd', '*.usda'), ()),
+    #'UsdLexer': ('pygments.lexers.usd', 'USD', ('usd', 'usda'), ('*.usd', '*.usda'), ()),
     'VBScriptLexer': ('pygments.lexers.basic', 'VBScript', ('vbscript',), ('*.vbs', '*.VBS'), ()),
-    'VCLLexer': ('pygments.lexers.varnish', 'VCL', ('vcl',), ('*.vcl',), ('text/x-vclsrc',)),
-    'VCLSnippetLexer': ('pygments.lexers.varnish', 'VCLSnippets', ('vclsnippets', 'vclsnippet'), (), ('text/x-vclsnippet',)),
+    #'VCLLexer': ('pygments.lexers.varnish', 'VCL', ('vcl',), ('*.vcl',), ('text/x-vclsrc',)),
+    #'VCLSnippetLexer': ('pygments.lexers.varnish', 'VCLSnippets', ('vclsnippets', 'vclsnippet'), (), ('text/x-vclsnippet',)),
     #'VCTreeStatusLexer': ('pygments.lexers.console', 'VCTreeStatus', ('vctreestatus',), (), ()),
     #'VGLLexer': ('pygments.lexers.dsls', 'VGL', ('vgl',), ('*.rpf',), ()),
     #'ValaLexer': ('pygments.lexers.c_like', 'Vala', ('vala', 'vapi'), ('*.vala', '*.vapi'), ('text/x-vala',)),
@@ -487,26 +487,26 @@
     'VerilogLexer': ('pygments.lexers.hdl', 'verilog', ('verilog', 'v'), ('*.v',), ('text/x-verilog',)),
     'VhdlLexer': ('pygments.lexers.hdl', 'vhdl', ('vhdl',), ('*.vhdl', '*.vhd'), ('text/x-vhdl',)),
     #'VimLexer': ('pygments.lexers.textedit', 'VimL', ('vim',), ('*.vim', '.vimrc', '.exrc', '.gvimrc', '_vimrc', '_exrc', '_gvimrc', 'vimrc', 'gvimrc'), ('text/x-vim',)),
-    'WDiffLexer': ('pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
-    'WebIDLLexer': ('pygments.lexers.webidl', 'Web IDL', ('webidl',), ('*.webidl',), ()),
-    'WhileyLexer': ('pygments.lexers.whiley', 'Whiley', ('whiley',), ('*.whiley',), ('text/x-whiley',)),
-    'X10Lexer': ('pygments.lexers.x10', 'X10', ('x10', 'xten'), ('*.x10',), ('text/x-x10',)),
+    #'WDiffLexer': ('pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
+    #'WebIDLLexer': ('pygments.lexers.webidl', 'Web IDL', ('webidl',), ('*.webidl',), ()),
+    #'WhileyLexer': ('pygments.lexers.whiley', 'Whiley', ('whiley',), ('*.whiley',), ('text/x-whiley',)),
+    #'X10Lexer': ('pygments.lexers.x10', 'X10', ('x10', 'xten'), ('*.x10',), ('text/x-x10',)),
     #'XQueryLexer': ('pygments.lexers.webmisc', 'XQuery', ('xquery', 'xqy', 'xq', 'xql', 'xqm'), ('*.xqy', '*.xquery', '*.xq', '*.xql', '*.xqm'), ('text/xquery', 'application/xquery')),
     #'XmlDjangoLexer': ('pygments.lexers.templates', 'XML+Django/Jinja', ('xml+django', 'xml+jinja'), (), ('application/xml+django', 'application/xml+jinja')),
     #'XmlErbLexer': ('pygments.lexers.templates', 'XML+Ruby', ('xml+erb', 'xml+ruby'), (), ('application/xml+ruby',)),
     #'XmlLexer': ('pygments.lexers.html', 'XML', ('xml',), ('*.xml', '*.xsl', '*.rss', '*.xslt', '*.xsd', '*.wsdl', '*.wsf'), ('text/xml', 'application/xml', 'image/svg+xml', 'application/rss+xml', 'application/atom+xml')),
     #'XmlPhpLexer': ('pygments.lexers.templates', 'XML+PHP', ('xml+php',), (), ('application/xml+php',)),
     #'XmlSmartyLexer': ('pygments.lexers.templates', 'XML+Smarty', ('xml+smarty',), (), ('application/xml+smarty',)),
-    'XorgLexer': ('pygments.lexers.xorg', 'Xorg', ('xorg.conf',), ('xorg.conf',), ()),
+    #'XorgLexer': ('pygments.lexers.xorg', 'Xorg', ('xorg.conf',), ('xorg.conf',), ()),
     #'XsltLexer': ('pygments.lexers.html', 'XSLT', ('xslt',), ('*.xsl', '*.xslt', '*.xpl'), ('application/xsl+xml', 'application/xslt+xml')),
     #'XtendLexer': ('pygments.lexers.jvm', 'Xtend', ('xtend',), ('*.xtend',), ('text/x-xtend',)),
-    'XtlangLexer': ('pygments.lexers.lisp', 'xtlang', ('extempore',), ('*.xtm',), ()),
+    #'XtlangLexer': ('pygments.lexers.lisp', 'xtlang', ('extempore',), ('*.xtm',), ()),
     #'YamlJinjaLexer': ('pygments.lexers.templates', 'YAML+Jinja', ('yaml+jinja', 'salt', 'sls'), ('*.sls',), ('text/x-yaml+jinja', 'text/x-sls')),
     #'YamlLexer': ('pygments.lexers.data', 'YAML', ('yaml',), ('*.yaml', '*.yml'), ('text/x-yaml',)),
-    'YangLexer': ('pygments.lexers.yang', 'YANG', ('yang',), ('*.yang',), ('application/yang',)),
-    'ZeekLexer': ('pygments.lexers.dsls', 'Zeek', ('zeek', 'bro'), ('*.zeek', '*.bro'), ()),
+    #'YangLexer': ('pygments.lexers.yang', 'YANG', ('yang',), ('*.yang',), ('application/yang',)),
+    #'ZeekLexer': ('pygments.lexers.dsls', 'Zeek', ('zeek', 'bro'), ('*.zeek', '*.bro'), ()),
     #'ZephirLexer': ('pygments.lexers.php', 'Zephir', ('zephir',), ('*.zep',), ()),
-    'ZigLexer': ('pygments.lexers.zig', 'Zig', ('zig',), ('*.zig',), ('text/zig',)),
+    #'ZigLexer': ('pygments.lexers.zig', 'Zig', ('zig',), ('*.zig',), ('text/zig',)),
 }
 
 if __name__ == '__main__':  # pragma: no cover
diff --git a/tests/typecode/data/filetest/archive/a.tar.gz.yml b/tests/typecode/data/filetest/archive/a.tar.gz.yml
index 2588695..deb884d 100644
--- a/tests/typecode/data/filetest/archive/a.tar.gz.yml
+++ b/tests/typecode/data/filetest/archive/a.tar.gz.yml
@@ -7,4 +7,3 @@ size: 225
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/archive/dbase.fdt.yml b/tests/typecode/data/filetest/archive/dbase.fdt.yml
index 7770dfb..48a2200 100644
--- a/tests/typecode/data/filetest/archive/dbase.fdt.yml
+++ b/tests/typecode/data/filetest/archive/dbase.fdt.yml
@@ -6,4 +6,3 @@ size: 183
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/archive/e.tar.bz2.yml b/tests/typecode/data/filetest/archive/e.tar.bz2.yml
index a71e053..681efae 100644
--- a/tests/typecode/data/filetest/archive/e.tar.bz2.yml
+++ b/tests/typecode/data/filetest/archive/e.tar.bz2.yml
@@ -1,9 +1,9 @@
 filetype_file: bzip2 compressed data, block size = 900k
 mimetype_file: application/x-bzip2
+mimetype_python: application/x-tar
 is_file: yes
 is_regular: yes
 size: 216
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/archive/e.tar.gz.yml b/tests/typecode/data/filetest/archive/e.tar.gz.yml
index 119015e..d06757a 100644
--- a/tests/typecode/data/filetest/archive/e.tar.gz.yml
+++ b/tests/typecode/data/filetest/archive/e.tar.gz.yml
@@ -1,9 +1,9 @@
 filetype_file: gzip compressed data
 mimetype_file: application/gzip
+mimetype_python: application/x-tar
 is_file: yes
 is_regular: yes
 size: 217
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/archive/e.tar.yml b/tests/typecode/data/filetest/archive/e.tar.yml
index cfbcead..707ecca 100644
--- a/tests/typecode/data/filetest/archive/e.tar.yml
+++ b/tests/typecode/data/filetest/archive/e.tar.yml
@@ -1,5 +1,6 @@
 filetype_file: POSIX tar archive (GNU)
 mimetype_file: application/x-tar
+mimetype_python: application/x-tar
 is_file: yes
 is_regular: yes
 size: 10240
@@ -7,4 +8,3 @@ is_binary: yes
 is_data: yes
 is_archive: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/archive/file_4.26-1.diff.gz.yml b/tests/typecode/data/filetest/archive/file_4.26-1.diff.gz.yml
index 331e27a..39c83fb 100644
--- a/tests/typecode/data/filetest/archive/file_4.26-1.diff.gz.yml
+++ b/tests/typecode/data/filetest/archive/file_4.26-1.diff.gz.yml
@@ -6,4 +6,3 @@ size: 42754
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/archive/posixnotgnu.tar.yml b/tests/typecode/data/filetest/archive/posixnotgnu.tar.yml
index 99eb932..c34470d 100644
--- a/tests/typecode/data/filetest/archive/posixnotgnu.tar.yml
+++ b/tests/typecode/data/filetest/archive/posixnotgnu.tar.yml
@@ -1,9 +1,9 @@
 filetype_file: POSIX tar archive
 mimetype_file: application/x-tar
+mimetype_python: application/x-tar
 is_file: yes
 is_regular: yes
 size: 35328
 is_binary: yes
 is_archive: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/archive/test.tar.lzma.yml b/tests/typecode/data/filetest/archive/test.tar.lzma.yml
index 3dc4d8c..6e4a166 100644
--- a/tests/typecode/data/filetest/archive/test.tar.lzma.yml
+++ b/tests/typecode/data/filetest/archive/test.tar.lzma.yml
@@ -6,4 +6,3 @@ size: '198'
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/archive/test.tar.xz.yml b/tests/typecode/data/filetest/archive/test.tar.xz.yml
index 9802c32..147c702 100644
--- a/tests/typecode/data/filetest/archive/test.tar.xz.yml
+++ b/tests/typecode/data/filetest/archive/test.tar.xz.yml
@@ -1,9 +1,9 @@
 filetype_file: XZ compressed data
 mimetype_file: application/x-xz
+mimetype_python: application/x-tar
 is_file: yes
 is_regular: yes
 size: 2916
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/archive/test.zip.yml b/tests/typecode/data/filetest/archive/test.zip.yml
index a7ee8d4..eb437d2 100644
--- a/tests/typecode/data/filetest/archive/test.zip.yml
+++ b/tests/typecode/data/filetest/archive/test.zip.yml
@@ -1,10 +1,10 @@
 filetype_file: Zip archive data, at least v1.0 to extract
 mimetype_file: application/zip
+mimetype_python: application/zip
 is_file: yes
 is_regular: yes
 size: 177
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_package: yes
diff --git a/tests/typecode/data/filetest/archive/win-archive.lib.yml b/tests/typecode/data/filetest/archive/win-archive.lib.yml
index ad973fd..a79945d 100644
--- a/tests/typecode/data/filetest/archive/win-archive.lib.yml
+++ b/tests/typecode/data/filetest/archive/win-archive.lib.yml
@@ -6,4 +6,3 @@ size: 8845
 is_binary: yes
 is_archive: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary-random/binary_random_0.yml b/tests/typecode/data/filetest/binary-random/binary_random_0.yml
index 5ae2a6e..af73856 100644
--- a/tests/typecode/data/filetest/binary-random/binary_random_0.yml
+++ b/tests/typecode/data/filetest/binary-random/binary_random_0.yml
@@ -6,4 +6,3 @@ size: 1000
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary-random/binary_random_1.yml b/tests/typecode/data/filetest/binary-random/binary_random_1.yml
index 5ae2a6e..af73856 100644
--- a/tests/typecode/data/filetest/binary-random/binary_random_1.yml
+++ b/tests/typecode/data/filetest/binary-random/binary_random_1.yml
@@ -6,4 +6,3 @@ size: 1000
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary-random/binary_random_2.yml b/tests/typecode/data/filetest/binary-random/binary_random_2.yml
index 5ae2a6e..af73856 100644
--- a/tests/typecode/data/filetest/binary-random/binary_random_2.yml
+++ b/tests/typecode/data/filetest/binary-random/binary_random_2.yml
@@ -6,4 +6,3 @@ size: 1000
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary-random/binary_random_3.yml b/tests/typecode/data/filetest/binary-random/binary_random_3.yml
index 5ae2a6e..af73856 100644
--- a/tests/typecode/data/filetest/binary-random/binary_random_3.yml
+++ b/tests/typecode/data/filetest/binary-random/binary_random_3.yml
@@ -6,4 +6,3 @@ size: 1000
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary-random/binary_random_4.yml b/tests/typecode/data/filetest/binary-random/binary_random_4.yml
index 5ae2a6e..af73856 100644
--- a/tests/typecode/data/filetest/binary-random/binary_random_4.yml
+++ b/tests/typecode/data/filetest/binary-random/binary_random_4.yml
@@ -6,4 +6,3 @@ size: 1000
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary-random/binary_random_5.yml b/tests/typecode/data/filetest/binary-random/binary_random_5.yml
index 5ae2a6e..af73856 100644
--- a/tests/typecode/data/filetest/binary-random/binary_random_5.yml
+++ b/tests/typecode/data/filetest/binary-random/binary_random_5.yml
@@ -6,4 +6,3 @@ size: 1000
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary-random/binary_random_6.yml b/tests/typecode/data/filetest/binary-random/binary_random_6.yml
index 5ae2a6e..af73856 100644
--- a/tests/typecode/data/filetest/binary-random/binary_random_6.yml
+++ b/tests/typecode/data/filetest/binary-random/binary_random_6.yml
@@ -6,4 +6,3 @@ size: 1000
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary-random/binary_random_7.yml b/tests/typecode/data/filetest/binary-random/binary_random_7.yml
index 5ae2a6e..af73856 100644
--- a/tests/typecode/data/filetest/binary-random/binary_random_7.yml
+++ b/tests/typecode/data/filetest/binary-random/binary_random_7.yml
@@ -6,4 +6,3 @@ size: 1000
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary-random/binary_random_8.yml b/tests/typecode/data/filetest/binary-random/binary_random_8.yml
index 5ae2a6e..af73856 100644
--- a/tests/typecode/data/filetest/binary-random/binary_random_8.yml
+++ b/tests/typecode/data/filetest/binary-random/binary_random_8.yml
@@ -6,4 +6,3 @@ size: 1000
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary/data.fdt.yml b/tests/typecode/data/filetest/binary/data.fdt.yml
index 7770dfb..48a2200 100644
--- a/tests/typecode/data/filetest/binary/data.fdt.yml
+++ b/tests/typecode/data/filetest/binary/data.fdt.yml
@@ -6,4 +6,3 @@ size: 183
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary/dbase.fdt.yml b/tests/typecode/data/filetest/binary/dbase.fdt.yml
index 7770dfb..48a2200 100644
--- a/tests/typecode/data/filetest/binary/dbase.fdt.yml
+++ b/tests/typecode/data/filetest/binary/dbase.fdt.yml
@@ -6,4 +6,3 @@ size: 183
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary/jruby_time_zone_TimeOfDay.dat.yml b/tests/typecode/data/filetest/binary/jruby_time_zone_TimeOfDay.dat.yml
index a702a0f..387d427 100644
--- a/tests/typecode/data/filetest/binary/jruby_time_zone_TimeOfDay.dat.yml
+++ b/tests/typecode/data/filetest/binary/jruby_time_zone_TimeOfDay.dat.yml
@@ -5,4 +5,3 @@ is_regular: yes
 size: 299
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary/pixelstream.rgb.yml b/tests/typecode/data/filetest/binary/pixelstream.rgb.yml
index 0a2e6da..d118411 100644
--- a/tests/typecode/data/filetest/binary/pixelstream.rgb.yml
+++ b/tests/typecode/data/filetest/binary/pixelstream.rgb.yml
@@ -1,9 +1,9 @@
 filetype_file: data
 mimetype_file: application/octet-stream
+mimetype_python: image/x-rgb
 is_file: yes
 is_regular: yes
 size: 129600
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/binary/windows.dll.yml b/tests/typecode/data/filetest/binary/windows.dll.yml
index cb1c3cd..a25f02a 100644
--- a/tests/typecode/data/filetest/binary/windows.dll.yml
+++ b/tests/typecode/data/filetest/binary/windows.dll.yml
@@ -1,9 +1,9 @@
 filetype_file: PE32+ executable (DLL) x86-64, for MS Windows
 mimetype_file: application/x-dosexec
+mimetype_python: application/x-msdownload
 is_file: yes
 is_regular: yes
 size: 3394
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
 is_winexe: yes
diff --git a/tests/typecode/data/filetest/build/Makefile.inc.yml b/tests/typecode/data/filetest/build/Makefile.inc.yml
index d7040c7..1687ca0 100644
--- a/tests/typecode/data/filetest/build/Makefile.inc.yml
+++ b/tests/typecode/data/filetest/build/Makefile.inc.yml
@@ -1,8 +1,9 @@
 filetype_file: makefile script, ASCII text, with CRLF line terminators
 mimetype_file: text/x-makefile
+filetype_pygment: PHP
 is_file: yes
 is_regular: yes
 size: 2888
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
+is_makefile: yes
diff --git a/tests/typecode/data/filetest/build/Makefile.yml b/tests/typecode/data/filetest/build/Makefile.yml
index 4cad45f..7e2500a 100644
--- a/tests/typecode/data/filetest/build/Makefile.yml
+++ b/tests/typecode/data/filetest/build/Makefile.yml
@@ -5,4 +5,4 @@ is_regular: yes
 size: 502
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
+is_makefile: yes
diff --git a/tests/typecode/data/filetest/build/ar-ER.css.map.yml b/tests/typecode/data/filetest/build/ar-ER.css.map.yml
index 47d4b9c..0a08b75 100644
--- a/tests/typecode/data/filetest/build/ar-ER.css.map.yml
+++ b/tests/typecode/data/filetest/build/ar-ER.css.map.yml
@@ -7,4 +7,3 @@ is_text: yes
 is_compact_js: yes
 is_js_map: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/build/ar-ER.js.map.yml b/tests/typecode/data/filetest/build/ar-ER.js.map.yml
index 47d4b9c..0a08b75 100644
--- a/tests/typecode/data/filetest/build/ar-ER.js.map.yml
+++ b/tests/typecode/data/filetest/build/ar-ER.js.map.yml
@@ -7,4 +7,3 @@ is_text: yes
 is_compact_js: yes
 is_js_map: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/build/binary.js.map.yml b/tests/typecode/data/filetest/build/binary.js.map.yml
index 674b621..5ff5f00 100644
--- a/tests/typecode/data/filetest/build/binary.js.map.yml
+++ b/tests/typecode/data/filetest/build/binary.js.map.yml
@@ -6,4 +6,3 @@ size: 880
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/build/build.xml.yml b/tests/typecode/data/filetest/build/build.xml.yml
index db0f452..6cd44e1 100644
--- a/tests/typecode/data/filetest/build/build.xml.yml
+++ b/tests/typecode/data/filetest/build/build.xml.yml
@@ -1,8 +1,8 @@
 filetype_file: exported SGML document, ASCII text, with CRLF line terminators
 mimetype_file: text/plain
+mimetype_python: application/xml
 is_file: yes
 is_regular: yes
 size: 4161
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/build/documentation.dsp.yml b/tests/typecode/data/filetest/build/documentation.dsp.yml
index fdbb888..1d12644 100644
--- a/tests/typecode/data/filetest/build/documentation.dsp.yml
+++ b/tests/typecode/data/filetest/build/documentation.dsp.yml
@@ -5,4 +5,3 @@ is_regular: yes
 size: 2492
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/build/m/Makefile.yml b/tests/typecode/data/filetest/build/m/Makefile.yml
index d7040c7..4bdecb6 100644
--- a/tests/typecode/data/filetest/build/m/Makefile.yml
+++ b/tests/typecode/data/filetest/build/m/Makefile.yml
@@ -5,4 +5,4 @@ is_regular: yes
 size: 2888
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
+is_makefile: yes
diff --git a/tests/typecode/data/filetest/build/pom.pom.yml b/tests/typecode/data/filetest/build/pom.pom.yml
index 66cdf6a..8f523fb 100644
--- a/tests/typecode/data/filetest/build/pom.pom.yml
+++ b/tests/typecode/data/filetest/build/pom.pom.yml
@@ -5,4 +5,3 @@ is_regular: yes
 size: 2994
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/build/pom.xml.yml b/tests/typecode/data/filetest/build/pom.xml.yml
index b327438..1ace2c1 100644
--- a/tests/typecode/data/filetest/build/pom.xml.yml
+++ b/tests/typecode/data/filetest/build/pom.xml.yml
@@ -1,8 +1,8 @@
 filetype_file: exported SGML document, ASCII text
 mimetype_file: text/plain
+mimetype_python: application/xml
 is_file: yes
 is_regular: yes
 size: 6129
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/certificate/ECLIPSE.RSA.yml b/tests/typecode/data/filetest/certificate/ECLIPSE.RSA.yml
index 622748e..33de057 100644
--- a/tests/typecode/data/filetest/certificate/ECLIPSE.RSA.yml
+++ b/tests/typecode/data/filetest/certificate/ECLIPSE.RSA.yml
@@ -6,4 +6,3 @@ size: 3487
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/code/assembly/bcopy.s.yml b/tests/typecode/data/filetest/code/assembly/bcopy.s.yml
index 067d903..78cd1c8 100644
--- a/tests/typecode/data/filetest/code/assembly/bcopy.s.yml
+++ b/tests/typecode/data/filetest/code/assembly/bcopy.s.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text, with CRLF line terminators
 mimetype_file: text/x-c
+mimetype_python: text/x-asm
 filetype_pygment: GAS
 programming_language: GAS
 is_file: yes
@@ -8,5 +9,4 @@ size: 32452
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/CcccDevStudioAddIn.rc2.yml b/tests/typecode/data/filetest/code/c/CcccDevStudioAddIn.rc2.yml
index f9bc526..d759ed0 100644
--- a/tests/typecode/data/filetest/code/c/CcccDevStudioAddIn.rc2.yml
+++ b/tests/typecode/data/filetest/code/c/CcccDevStudioAddIn.rc2.yml
@@ -7,5 +7,4 @@ is_regular: yes
 size: 397
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/SIMPLE.C.yml b/tests/typecode/data/filetest/code/c/SIMPLE.C.yml
index 27c14fe..205cf68 100644
--- a/tests/typecode/data/filetest/code/c/SIMPLE.C.yml
+++ b/tests/typecode/data/filetest/code/c/SIMPLE.C.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C++
 programming_language: C++
 is_file: yes
@@ -8,5 +9,4 @@ size: 125
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/TEST.H.yml b/tests/typecode/data/filetest/code/c/TEST.H.yml
index 0ff0146..a61e07a 100644
--- a/tests/typecode/data/filetest/code/c/TEST.H.yml
+++ b/tests/typecode/data/filetest/code/c/TEST.H.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C++
 programming_language: C++
 is_file: yes
@@ -8,5 +9,4 @@ size: 8440
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/TEST_LOWERCASE.h.yml b/tests/typecode/data/filetest/code/c/TEST_LOWERCASE.h.yml
index e137235..acc02cf 100644
--- a/tests/typecode/data/filetest/code/c/TEST_LOWERCASE.h.yml
+++ b/tests/typecode/data/filetest/code/c/TEST_LOWERCASE.h.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C
 programming_language: C
 is_file: yes
@@ -8,5 +9,4 @@ size: 8440
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/cpu.c.yml b/tests/typecode/data/filetest/code/c/cpu.c.yml
index 955dcb0..49af5e1 100644
--- a/tests/typecode/data/filetest/code/c/cpu.c.yml
+++ b/tests/typecode/data/filetest/code/c/cpu.c.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C
 programming_language: C
 is_file: yes
@@ -8,5 +9,4 @@ size: 3044
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/main.c.yml b/tests/typecode/data/filetest/code/c/main.c.yml
index 5c86023..6cbdff1 100644
--- a/tests/typecode/data/filetest/code/c/main.c.yml
+++ b/tests/typecode/data/filetest/code/c/main.c.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C
 programming_language: C
 is_file: yes
@@ -8,5 +9,4 @@ size: '1940'
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/mm.c.yml b/tests/typecode/data/filetest/code/c/mm.c.yml
index 76e5290..ef64034 100644
--- a/tests/typecode/data/filetest/code/c/mm.c.yml
+++ b/tests/typecode/data/filetest/code/c/mm.c.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C
 programming_language: C
 is_file: yes
@@ -8,5 +9,4 @@ size: 3297
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/netdb.h.yml b/tests/typecode/data/filetest/code/c/netdb.h.yml
index 2d8c666..0e8352c 100644
--- a/tests/typecode/data/filetest/code/c/netdb.h.yml
+++ b/tests/typecode/data/filetest/code/c/netdb.h.yml
@@ -1,5 +1,6 @@
 filetype_file: very short file (no magic)
 mimetype_file: application/octet-stream
+mimetype_python: text/x-c
 filetype_pygment: C
 programming_language: C
 is_file: yes
@@ -9,5 +10,4 @@ is_text: yes
 is_data: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/pci.c.yml b/tests/typecode/data/filetest/code/c/pci.c.yml
index e653c08..5e52bb6 100644
--- a/tests/typecode/data/filetest/code/c/pci.c.yml
+++ b/tests/typecode/data/filetest/code/c/pci.c.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C
 programming_language: C
 is_file: yes
@@ -8,5 +9,4 @@ size: 3220
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/pci_v3.c.yml b/tests/typecode/data/filetest/code/c/pci_v3.c.yml
index 29aae4e..fbc0bf3 100644
--- a/tests/typecode/data/filetest/code/c/pci_v3.c.yml
+++ b/tests/typecode/data/filetest/code/c/pci_v3.c.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C
 programming_language: C
 is_file: yes
@@ -8,5 +9,4 @@ size: 18253
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/c/resource.h.yml b/tests/typecode/data/filetest/code/c/resource.h.yml
index 6e900f6..227f489 100644
--- a/tests/typecode/data/filetest/code/c/resource.h.yml
+++ b/tests/typecode/data/filetest/code/c/resource.h.yml
@@ -1,5 +1,6 @@
 filetype_file: ASCII text, with CRLF line terminators
 mimetype_file: text/plain
+mimetype_python: text/x-c
 filetype_pygment: C
 programming_language: C
 is_file: yes
@@ -8,5 +9,4 @@ size: 91
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/cpp/StdAfx.cpp.yml b/tests/typecode/data/filetest/code/cpp/StdAfx.cpp.yml
index faad34c..76123d1 100644
--- a/tests/typecode/data/filetest/code/cpp/StdAfx.cpp.yml
+++ b/tests/typecode/data/filetest/code/cpp/StdAfx.cpp.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C++
 programming_language: C++
 is_file: yes
@@ -8,5 +9,4 @@ size: 233
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/cpp/non_ascii.cpp.yml b/tests/typecode/data/filetest/code/cpp/non_ascii.cpp.yml
index b85b11a..71dae2f 100644
--- a/tests/typecode/data/filetest/code/cpp/non_ascii.cpp.yml
+++ b/tests/typecode/data/filetest/code/cpp/non_ascii.cpp.yml
@@ -1,5 +1,6 @@
 filetype_file: data
 mimetype_file: application/octet-stream
+mimetype_python: text/x-c
 filetype_pygment: C++
 programming_language: C++
 is_file: yes
@@ -9,5 +10,4 @@ is_text: yes
 is_data: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/cpp/stacktrace.cpp.yml b/tests/typecode/data/filetest/code/cpp/stacktrace.cpp.yml
index 64e6305..79ed736 100644
--- a/tests/typecode/data/filetest/code/cpp/stacktrace.cpp.yml
+++ b/tests/typecode/data/filetest/code/cpp/stacktrace.cpp.yml
@@ -1,5 +1,6 @@
 filetype_file: C source, ASCII text
 mimetype_file: text/x-c
+mimetype_python: text/x-c
 filetype_pygment: C++
 programming_language: C++
 is_file: yes
@@ -8,5 +9,4 @@ size: 13670
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/cpp/string.CPP.yml b/tests/typecode/data/filetest/code/cpp/string.CPP.yml
index 0bf8034..4e9543d 100644
--- a/tests/typecode/data/filetest/code/cpp/string.CPP.yml
+++ b/tests/typecode/data/filetest/code/cpp/string.CPP.yml
@@ -1,5 +1,6 @@
 filetype_file: C++ source, ASCII text
 mimetype_file: text/x-c++
+mimetype_python: text/x-c
 filetype_pygment: C++
 programming_language: C++
 is_file: yes
@@ -8,5 +9,4 @@ size: 69358
 is_text: yes
 contains_text: yes
 is_c_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/groff/example.ms.yml b/tests/typecode/data/filetest/code/groff/example.ms.yml
index c6cce31..250f6d2 100644
--- a/tests/typecode/data/filetest/code/groff/example.ms.yml
+++ b/tests/typecode/data/filetest/code/groff/example.ms.yml
@@ -1,11 +1,11 @@
 filetype_file: troff or preprocessor input, ASCII text
 mimetype_file: text/troff
-filetype_pygment: MiniScript
-programming_language: MiniScript
+mimetype_python: text/troff
+filetype_pygment: GAS
+programming_language: GAS
 is_file: yes
 is_regular: yes
 size: 93
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/java/Appender.java.yml b/tests/typecode/data/filetest/code/java/Appender.java.yml
index 02221aa..e398034 100644
--- a/tests/typecode/data/filetest/code/java/Appender.java.yml
+++ b/tests/typecode/data/filetest/code/java/Appender.java.yml
@@ -1,5 +1,6 @@
 filetype_file: Java source, ASCII text
 mimetype_file: text/x-java
+mimetype_python: text/x-java-source
 filetype_pygment: Java
 programming_language: Java
 is_file: yes
@@ -8,5 +9,4 @@ size: 3647
 is_text: yes
 contains_text: yes
 is_java_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/java/ChartTiming1.java.yml b/tests/typecode/data/filetest/code/java/ChartTiming1.java.yml
index a3a4e87..141f920 100644
--- a/tests/typecode/data/filetest/code/java/ChartTiming1.java.yml
+++ b/tests/typecode/data/filetest/code/java/ChartTiming1.java.yml
@@ -1,5 +1,6 @@
 filetype_file: data
 mimetype_file: application/octet-stream
+mimetype_python: text/x-java-source
 filetype_pygment: Java
 programming_language: Java
 is_file: yes
@@ -9,5 +10,4 @@ is_text: yes
 is_data: yes
 contains_text: yes
 is_java_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/java/CommonViewerSiteFactory.jad.yml b/tests/typecode/data/filetest/code/java/CommonViewerSiteFactory.jad.yml
index cc1aae6..7a50e2b 100644
--- a/tests/typecode/data/filetest/code/java/CommonViewerSiteFactory.jad.yml
+++ b/tests/typecode/data/filetest/code/java/CommonViewerSiteFactory.jad.yml
@@ -1,11 +1,10 @@
 filetype_file: Java source, ASCII text
 mimetype_file: text/x-java
-filetype_pygment: Python
-programming_language: Python
+mimetype_python: text/vnd.sun.j2me.app-descriptor
 is_file: yes
 is_regular: yes
 size: 1447
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
+is_java_source: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/java/Logger.JAVA.yml b/tests/typecode/data/filetest/code/java/Logger.JAVA.yml
index 2e5e040..1d5db7d 100644
--- a/tests/typecode/data/filetest/code/java/Logger.JAVA.yml
+++ b/tests/typecode/data/filetest/code/java/Logger.JAVA.yml
@@ -1,5 +1,6 @@
 filetype_file: Java source, ASCII text
 mimetype_file: text/x-java
+mimetype_python: text/x-java-source
 filetype_pygment: Java
 programming_language: Java
 is_file: yes
@@ -7,5 +8,4 @@ is_regular: yes
 size: 6800
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/java/contenttype.java.yml b/tests/typecode/data/filetest/code/java/contenttype.java.yml
index 4e5c6f6..862f80c 100644
--- a/tests/typecode/data/filetest/code/java/contenttype.java.yml
+++ b/tests/typecode/data/filetest/code/java/contenttype.java.yml
@@ -1,5 +1,6 @@
 filetype_file: Java source, ASCII text
 mimetype_file: text/x-java
+mimetype_python: text/x-java-source
 filetype_pygment: Java
 programming_language: Java
 is_file: yes
@@ -8,5 +9,4 @@ size: 4763
 is_text: yes
 contains_text: yes
 is_java_source: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/js/a.js.yml b/tests/typecode/data/filetest/code/js/a.js.yml
index f21213c..b77dfc2 100644
--- a/tests/typecode/data/filetest/code/js/a.js.yml
+++ b/tests/typecode/data/filetest/code/js/a.js.yml
@@ -1,5 +1,6 @@
 filetype_file: ASCII text, with CRLF line terminators
 mimetype_file: text/plain
+mimetype_python: application/javascript
 filetype_pygment: JavaScript
 programming_language: JavaScript
 is_file: yes
@@ -7,5 +8,4 @@ is_regular: yes
 size: 118
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/python/__init__.py.yml b/tests/typecode/data/filetest/code/python/__init__.py.yml
index aaae4a0..bb9f21e 100644
--- a/tests/typecode/data/filetest/code/python/__init__.py.yml
+++ b/tests/typecode/data/filetest/code/python/__init__.py.yml
@@ -1,5 +1,6 @@
 filetype_file: Python script, ASCII text executable
 mimetype_file: text/x-script.python
+mimetype_python: text/x-python
 filetype_pygment: Python
 programming_language: Python
 is_file: yes
@@ -7,6 +8,5 @@ is_regular: yes
 size: 215
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_script: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/python/contenttype.py.yml b/tests/typecode/data/filetest/code/python/contenttype.py.yml
index 7e6fa56..dcc6114 100644
--- a/tests/typecode/data/filetest/code/python/contenttype.py.yml
+++ b/tests/typecode/data/filetest/code/python/contenttype.py.yml
@@ -1,5 +1,6 @@
 filetype_file: Python script, ASCII text executable
 mimetype_file: text/x-script.python
+mimetype_python: text/x-python
 filetype_pygment: Python
 programming_language: Python
 is_file: yes
@@ -7,6 +8,5 @@ is_regular: yes
 size: 94
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_script: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/code/scala/ABOUT.yml b/tests/typecode/data/filetest/code/scala/ABOUT.yml
index 3c7a990..e55c401 100644
--- a/tests/typecode/data/filetest/code/scala/ABOUT.yml
+++ b/tests/typecode/data/filetest/code/scala/ABOUT.yml
@@ -5,4 +5,3 @@ is_regular: yes
 size: 152
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/code/scala/Applicative.scala.yml b/tests/typecode/data/filetest/code/scala/Applicative.scala.yml
index 50b7662..00951b7 100644
--- a/tests/typecode/data/filetest/code/scala/Applicative.scala.yml
+++ b/tests/typecode/data/filetest/code/scala/Applicative.scala.yml
@@ -7,5 +7,4 @@ is_regular: yes
 size: 4500
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/compiled/flash/a.swf.yml b/tests/typecode/data/filetest/compiled/flash/a.swf.yml
index 94d93eb..fdcff27 100644
--- a/tests/typecode/data/filetest/compiled/flash/a.swf.yml
+++ b/tests/typecode/data/filetest/compiled/flash/a.swf.yml
@@ -1,8 +1,8 @@
 filetype_file: Macromedia Flash data, version 7
 mimetype_file: application/x-shockwave-flash
+mimetype_python: application/x-shockwave-flash
 is_file: yes
 is_regular: yes
 size: 2288
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/compiled/flash/b.swf.yml b/tests/typecode/data/filetest/compiled/flash/b.swf.yml
index 8e08bc7..95bf14e 100644
--- a/tests/typecode/data/filetest/compiled/flash/b.swf.yml
+++ b/tests/typecode/data/filetest/compiled/flash/b.swf.yml
@@ -1,8 +1,8 @@
 filetype_file: Macromedia Flash data, version 7
 mimetype_file: application/x-shockwave-flash
+mimetype_python: application/x-shockwave-flash
 is_file: yes
 is_regular: yes
 size: 2386
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/compiled/flash/flash-haloclassic.swc.incr.yml b/tests/typecode/data/filetest/compiled/flash/flash-haloclassic.swc.incr.yml
index 4154a88..5f0a4e7 100644
--- a/tests/typecode/data/filetest/compiled/flash/flash-haloclassic.swc.incr.yml
+++ b/tests/typecode/data/filetest/compiled/flash/flash-haloclassic.swc.incr.yml
@@ -6,4 +6,3 @@ size: 207900
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/compiled/linux/i686-shash.yml b/tests/typecode/data/filetest/compiled/linux/i686-shash.yml
index 490dab6..0e91bc0 100644
--- a/tests/typecode/data/filetest/compiled/linux/i686-shash.yml
+++ b/tests/typecode/data/filetest/compiled/linux/i686-shash.yml
@@ -1,4 +1,4 @@
-filetype_file: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV)
+filetype_file: ELF 32-bit LSB executable, Intel 80386
 mimetype_file: application/x-executable
 elf_type: executable
 is_file: yes
@@ -7,4 +7,3 @@ size: 22887
 is_binary: yes
 contains_text: yes
 is_elf: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/compiled/linux/x86_64-shash.yml b/tests/typecode/data/filetest/compiled/linux/x86_64-shash.yml
index 2760fc3..9e2db75 100644
--- a/tests/typecode/data/filetest/compiled/linux/x86_64-shash.yml
+++ b/tests/typecode/data/filetest/compiled/linux/x86_64-shash.yml
@@ -1,4 +1,4 @@
-filetype_file: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked
+filetype_file: ELF 64-bit LSB executable, x86-64
 mimetype_file: application/x-executable
 elf_type: executable
 is_file: yes
@@ -7,4 +7,3 @@ size: '19446'
 is_binary: yes
 contains_text: yes
 is_elf: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/compiled/win/file.exe.yml b/tests/typecode/data/filetest/compiled/win/file.exe.yml
index 7cf9724..5bc928f 100644
--- a/tests/typecode/data/filetest/compiled/win/file.exe.yml
+++ b/tests/typecode/data/filetest/compiled/win/file.exe.yml
@@ -1,9 +1,9 @@
 filetype_file: PE32 executable (console) Intel 80386 (stripped to external PDB), for MS Windows
 mimetype_file: application/x-dosexec
+mimetype_python: application/x-msdownload
 is_file: yes
 is_regular: yes
 size: 45056
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
 is_winexe: yes
diff --git a/tests/typecode/data/filetest/compiled/win/zlib1.dll.yml b/tests/typecode/data/filetest/compiled/win/zlib1.dll.yml
index 7c2757b..69fb2c0 100644
--- a/tests/typecode/data/filetest/compiled/win/zlib1.dll.yml
+++ b/tests/typecode/data/filetest/compiled/win/zlib1.dll.yml
@@ -1,10 +1,10 @@
 filetype_file: PE32 executable (DLL) (console) Intel 80386 (stripped to external PDB), for MS
   Windows
 mimetype_file: application/x-dosexec
+mimetype_python: application/x-msdownload
 is_file: yes
 is_regular: yes
 size: 72192
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
 is_winexe: yes
diff --git a/tests/typecode/data/filetest/config/config.conf.yml b/tests/typecode/data/filetest/config/config.conf.yml
index 44fd1a8..0cfd5a5 100644
--- a/tests/typecode/data/filetest/config/config.conf.yml
+++ b/tests/typecode/data/filetest/config/config.conf.yml
@@ -1,8 +1,8 @@
 filetype_file: ASCII text, with CRLF line terminators
 mimetype_file: text/plain
+mimetype_python: text/plain
 is_file: yes
 is_regular: yes
 size: 4005
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/config/defconfig-ar531x-jffs2.yml b/tests/typecode/data/filetest/config/defconfig-ar531x-jffs2.yml
index a9df562..bf68bd2 100644
--- a/tests/typecode/data/filetest/config/defconfig-ar531x-jffs2.yml
+++ b/tests/typecode/data/filetest/config/defconfig-ar531x-jffs2.yml
@@ -5,4 +5,3 @@ is_regular: yes
 size: 14466
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/config/eclipse_configuration_3u.cfs.yml b/tests/typecode/data/filetest/config/eclipse_configuration_3u.cfs.yml
index 8b24526..c762db3 100644
--- a/tests/typecode/data/filetest/config/eclipse_configuration_3u.cfs.yml
+++ b/tests/typecode/data/filetest/config/eclipse_configuration_3u.cfs.yml
@@ -6,4 +6,3 @@ size: 338561
 is_binary: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/config/wrapper.conf.yml b/tests/typecode/data/filetest/config/wrapper.conf.yml
index 44fd1a8..0cfd5a5 100644
--- a/tests/typecode/data/filetest/config/wrapper.conf.yml
+++ b/tests/typecode/data/filetest/config/wrapper.conf.yml
@@ -1,8 +1,8 @@
 filetype_file: ASCII text, with CRLF line terminators
 mimetype_file: text/plain
+mimetype_python: text/plain
 is_file: yes
 is_regular: yes
 size: 4005
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/data/mysql-arch.ARM.yml b/tests/typecode/data/filetest/data/mysql-arch.ARM.yml
index 0e9b463..dd1a3cc 100644
--- a/tests/typecode/data/filetest/data/mysql-arch.ARM.yml
+++ b/tests/typecode/data/filetest/data/mysql-arch.ARM.yml
@@ -6,4 +6,3 @@ size: 1
 is_text: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/data/mysql-arch.ARN.yml b/tests/typecode/data/filetest/data/mysql-arch.ARN.yml
index 0e9b463..dd1a3cc 100644
--- a/tests/typecode/data/filetest/data/mysql-arch.ARN.yml
+++ b/tests/typecode/data/filetest/data/mysql-arch.ARN.yml
@@ -6,4 +6,3 @@ size: 1
 is_text: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/data/mysql-arch.ARZ.yml b/tests/typecode/data/filetest/data/mysql-arch.ARZ.yml
index e4b8294..5716f56 100644
--- a/tests/typecode/data/filetest/data/mysql-arch.ARZ.yml
+++ b/tests/typecode/data/filetest/data/mysql-arch.ARZ.yml
@@ -1,4 +1,4 @@
-filetype_file: gzip compressed data, from Unix, original size modulo 2^32 305
+filetype_file: gzip compressed data
 mimetype_file: application/gzip
 is_file: yes
 is_regular: yes
@@ -7,4 +7,3 @@ is_binary: yes
 is_data: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/data/mysql-arch.yml b/tests/typecode/data/filetest/data/mysql-arch.yml
index a5da413..7120e7a 100644
--- a/tests/typecode/data/filetest/data/mysql-arch.yml
+++ b/tests/typecode/data/filetest/data/mysql-arch.yml
@@ -1,4 +1,4 @@
-filetype_file: MySQL table definition file Version 224, type DIAM_ISAM, MySQL version -1515870811
+filetype_file: MySQL table definition file
 mimetype_file: application/octet-stream
 is_file: yes
 is_regular: yes
@@ -6,4 +6,3 @@ size: 612
 is_text: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/data/nulls.txt.yml b/tests/typecode/data/filetest/data/nulls.txt.yml
index f4e2325..68d8632 100644
--- a/tests/typecode/data/filetest/data/nulls.txt.yml
+++ b/tests/typecode/data/filetest/data/nulls.txt.yml
@@ -1,5 +1,6 @@
 filetype_file: ASCII text, with very long lines, with no line terminators
 mimetype_file: text/plain
+mimetype_python: text/plain
 is_file: yes
 is_regular: yes
 size: 10000
@@ -7,4 +8,3 @@ is_text: yes
 is_text_with_long_lines: yes
 is_data: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/debug/QTMovieWin.pdb.yml b/tests/typecode/data/filetest/debug/QTMovieWin.pdb.yml
index 60867f6..f57a4b1 100644
--- a/tests/typecode/data/filetest/debug/QTMovieWin.pdb.yml
+++ b/tests/typecode/data/filetest/debug/QTMovieWin.pdb.yml
@@ -1,8 +1,8 @@
-filetype_file: MSVC program database ver 7.00, 1024*843 bytes
+filetype_file: MSVC program database ver 7.00
 mimetype_file: application/x-ms-pdb
+mimetype_python: application/vnd.palm
 is_file: yes
 is_regular: yes
 size: 863232
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/doc/html/Label.html.yml b/tests/typecode/data/filetest/doc/html/Label.html.yml
index 5b6b7ee..eca6c3f 100644
--- a/tests/typecode/data/filetest/doc/html/Label.html.yml
+++ b/tests/typecode/data/filetest/doc/html/Label.html.yml
@@ -1,5 +1,6 @@
 filetype_file: HTML document, ASCII text, with very long lines
 mimetype_file: text/html
+mimetype_python: text/html
 filetype_pygment: HTML
 programming_language: HTML
 is_file: yes
@@ -8,5 +9,4 @@ size: 49584
 is_text: yes
 is_text_with_long_lines: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/doc/html/a.htm.yml b/tests/typecode/data/filetest/doc/html/a.htm.yml
index e743dd1..dd9eaf1 100644
--- a/tests/typecode/data/filetest/doc/html/a.htm.yml
+++ b/tests/typecode/data/filetest/doc/html/a.htm.yml
@@ -1,5 +1,6 @@
 filetype_file: HTML document, ASCII text, with CRLF line terminators
 mimetype_file: text/html
+mimetype_python: text/html
 filetype_pygment: HTML
 programming_language: HTML
 is_file: yes
@@ -7,5 +8,4 @@ is_regular: yes
 size: 693
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/doc/html/allclasses-frame.html.yml b/tests/typecode/data/filetest/doc/html/allclasses-frame.html.yml
index b3e8354..373c743 100644
--- a/tests/typecode/data/filetest/doc/html/allclasses-frame.html.yml
+++ b/tests/typecode/data/filetest/doc/html/allclasses-frame.html.yml
@@ -1,5 +1,6 @@
 filetype_file: HTML document, ASCII text
 mimetype_file: text/html
+mimetype_python: text/html
 filetype_pygment: HTML
 programming_language: HTML
 is_file: yes
@@ -7,5 +8,4 @@ is_regular: yes
 size: 434697
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/doc/html/contenttype.html.yml b/tests/typecode/data/filetest/doc/html/contenttype.html.yml
index be3b0c2..c247a22 100644
--- a/tests/typecode/data/filetest/doc/html/contenttype.html.yml
+++ b/tests/typecode/data/filetest/doc/html/contenttype.html.yml
@@ -1,5 +1,6 @@
 filetype_file: HTML document, ASCII text
 mimetype_file: text/html
+mimetype_python: text/html
 filetype_pygment: HTML
 programming_language: HTML
 is_file: yes
@@ -7,5 +8,4 @@ is_regular: yes
 size: 23689
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/doc/office/Glitch-ERD.vsd.yml b/tests/typecode/data/filetest/doc/office/Glitch-ERD.vsd.yml
index 947fe64..453abfa 100644
--- a/tests/typecode/data/filetest/doc/office/Glitch-ERD.vsd.yml
+++ b/tests/typecode/data/filetest/doc/office/Glitch-ERD.vsd.yml
@@ -1,8 +1,8 @@
-filetype_file: Composite Document File V2 Document, Little Endian
+filetype_file: Composite Document File V2 Document
 mimetype_file: application/vnd.ms-office
+mimetype_python: application/vnd.visio
 is_file: yes
 is_regular: yes
 size: 100864
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/doc/office/document.doc.yml b/tests/typecode/data/filetest/doc/office/document.doc.yml
index ddc01f0..4b05196 100644
--- a/tests/typecode/data/filetest/doc/office/document.doc.yml
+++ b/tests/typecode/data/filetest/doc/office/document.doc.yml
@@ -1,10 +1,10 @@
 filetype_file: Microsoft Word 2007+
 mimetype_file: application/vnd.openxmlformats-officedocument.wordprocessingml.document
+mimetype_python: application/msword
 is_file: yes
 is_regular: yes
 size: 24015
 is_binary: yes
 is_archive: yes
 contains_text: yes
-is_media_with_meta: yes
 is_office_doc: yes
diff --git a/tests/typecode/data/filetest/doc/office/document.yml b/tests/typecode/data/filetest/doc/office/document.yml
index ddc01f0..b1f9f27 100644
--- a/tests/typecode/data/filetest/doc/office/document.yml
+++ b/tests/typecode/data/filetest/doc/office/document.yml
@@ -6,5 +6,4 @@ size: 24015
 is_binary: yes
 is_archive: yes
 contains_text: yes
-is_media_with_meta: yes
 is_office_doc: yes
diff --git a/tests/typecode/data/filetest/doc/office/excel.xls.yml b/tests/typecode/data/filetest/doc/office/excel.xls.yml
index 07e5627..33adc8c 100644
--- a/tests/typecode/data/filetest/doc/office/excel.xls.yml
+++ b/tests/typecode/data/filetest/doc/office/excel.xls.yml
@@ -1,8 +1,8 @@
 filetype_file: Composite Document File V2 Document
 mimetype_file: application/vnd.ms-excel
+mimetype_python: application/vnd.ms-excel
 is_file: yes
 is_regular: yes
 size: 13824
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/doc/office/excel.xlsx.yml b/tests/typecode/data/filetest/doc/office/excel.xlsx.yml
index d17efe1..c461dfb 100644
--- a/tests/typecode/data/filetest/doc/office/excel.xlsx.yml
+++ b/tests/typecode/data/filetest/doc/office/excel.xlsx.yml
@@ -1,10 +1,10 @@
 filetype_file: Microsoft Excel 2007+
 mimetype_file: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+mimetype_python: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
 is_file: yes
 is_regular: yes
 size: 8276
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_office_doc: yes
diff --git a/tests/typecode/data/filetest/doc/office/power.ppt.yml b/tests/typecode/data/filetest/doc/office/power.ppt.yml
index 908f407..2cc0093 100644
--- a/tests/typecode/data/filetest/doc/office/power.ppt.yml
+++ b/tests/typecode/data/filetest/doc/office/power.ppt.yml
@@ -1,9 +1,9 @@
-filetype_file: Composite Document File V2 Document, Little Endian
+filetype_file: Composite Document File V2 Document
 mimetype_file: application/vnd.ms-powerpoint
+mimetype_python: application/vnd.ms-powerpoint
 is_file: yes
 is_regular: yes
 size: 9216
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
 is_office_doc: yes
diff --git a/tests/typecode/data/filetest/doc/office/power.pptx.yml b/tests/typecode/data/filetest/doc/office/power.pptx.yml
index 61b29fa..5561099 100644
--- a/tests/typecode/data/filetest/doc/office/power.pptx.yml
+++ b/tests/typecode/data/filetest/doc/office/power.pptx.yml
@@ -1,10 +1,10 @@
 filetype_file: Microsoft PowerPoint 2007+
 mimetype_file: application/vnd.openxmlformats-officedocument.presentationml.presentation
+mimetype_python: application/vnd.openxmlformats-officedocument.presentationml.presentation
 is_file: yes
 is_regular: yes
 size: 28876
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_office_doc: yes
diff --git a/tests/typecode/data/filetest/doc/office/word.doc.yml b/tests/typecode/data/filetest/doc/office/word.doc.yml
index db4b465..7141e10 100644
--- a/tests/typecode/data/filetest/doc/office/word.doc.yml
+++ b/tests/typecode/data/filetest/doc/office/word.doc.yml
@@ -1,10 +1,10 @@
 filetype_file: Composite Document File V2 Document
 mimetype_file: application/msword
+mimetype_python: application/msword
 is_file: yes
 is_regular: yes
 size: 31232
 is_binary: yes
 is_archive: yes
 contains_text: yes
-is_media_with_meta: yes
 is_office_doc: yes
diff --git a/tests/typecode/data/filetest/doc/office/word.docx.yml b/tests/typecode/data/filetest/doc/office/word.docx.yml
index 03d5c95..bd21e25 100644
--- a/tests/typecode/data/filetest/doc/office/word.docx.yml
+++ b/tests/typecode/data/filetest/doc/office/word.docx.yml
@@ -1,10 +1,10 @@
 filetype_file: Microsoft Word 2007+
 mimetype_file: application/vnd.openxmlformats-officedocument.wordprocessingml.document
+mimetype_python: application/vnd.openxmlformats-officedocument.wordprocessingml.document
 is_file: yes
 is_regular: yes
 size: 11868
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_office_doc: yes
diff --git a/tests/typecode/data/filetest/doc/pdf/a.pdf.yml b/tests/typecode/data/filetest/doc/pdf/a.pdf.yml
index a532ba2..8ce4b7c 100644
--- a/tests/typecode/data/filetest/doc/pdf/a.pdf.yml
+++ b/tests/typecode/data/filetest/doc/pdf/a.pdf.yml
@@ -1,10 +1,10 @@
 filetype_file: PDF document, version 1.2
 mimetype_file: application/pdf
+mimetype_python: application/pdf
 is_file: yes
 is_regular: yes
 size: 1218
 is_pdf_with_text: yes
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
 is_pdf: yes
diff --git a/tests/typecode/data/filetest/doc/pdf/notpdf.pdf.yml b/tests/typecode/data/filetest/doc/pdf/notpdf.pdf.yml
index 78541bb..b1b78eb 100644
--- a/tests/typecode/data/filetest/doc/pdf/notpdf.pdf.yml
+++ b/tests/typecode/data/filetest/doc/pdf/notpdf.pdf.yml
@@ -1,8 +1,8 @@
 filetype_file: CSV text
 mimetype_file: application/csv
+mimetype_python: application/pdf
 is_file: yes
 is_regular: yes
 size: 2194
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/doc/pdf/pdf.pdf.yml b/tests/typecode/data/filetest/doc/pdf/pdf.pdf.yml
index abca93b..c5f8f1a 100644
--- a/tests/typecode/data/filetest/doc/pdf/pdf.pdf.yml
+++ b/tests/typecode/data/filetest/doc/pdf/pdf.pdf.yml
@@ -1,10 +1,10 @@
 filetype_file: PDF document, version 1.4
 mimetype_file: application/pdf
+mimetype_python: application/pdf
 is_file: yes
 is_regular: yes
 size: 29133
 is_pdf_with_text: yes
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
 is_pdf: yes
diff --git a/tests/typecode/data/filetest/doc/postscript/a.ps.yml b/tests/typecode/data/filetest/doc/postscript/a.ps.yml
index 6df834a..61fa5c4 100644
--- a/tests/typecode/data/filetest/doc/postscript/a.ps.yml
+++ b/tests/typecode/data/filetest/doc/postscript/a.ps.yml
@@ -1,10 +1,10 @@
 filetype_file: PostScript document text conforming DSC level 3.0, Level 3
 mimetype_file: application/postscript
+mimetype_python: application/postscript
 is_file: yes
 is_regular: yes
 size: 562
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_script: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/doc/postscript/doc.ps.yml b/tests/typecode/data/filetest/doc/postscript/doc.ps.yml
index f62c5fd..0f7b278 100644
--- a/tests/typecode/data/filetest/doc/postscript/doc.ps.yml
+++ b/tests/typecode/data/filetest/doc/postscript/doc.ps.yml
@@ -1,10 +1,10 @@
 filetype_file: PostScript document text conforming DSC level 2.0
 mimetype_file: application/postscript
+mimetype_python: application/postscript
 is_file: yes
 is_regular: yes
 size: 232479
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_script: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/doc/xml/simple.xml.yml b/tests/typecode/data/filetest/doc/xml/simple.xml.yml
index e305e1e..309fe10 100644
--- a/tests/typecode/data/filetest/doc/xml/simple.xml.yml
+++ b/tests/typecode/data/filetest/doc/xml/simple.xml.yml
@@ -1,8 +1,8 @@
 filetype_file: ASCII text
 mimetype_file: text/plain
+mimetype_python: application/xml
 is_file: yes
 is_regular: yes
 size: 82
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/doc/xml/some.xml.yml b/tests/typecode/data/filetest/doc/xml/some.xml.yml
index ff9b01f..ab14cac 100644
--- a/tests/typecode/data/filetest/doc/xml/some.xml.yml
+++ b/tests/typecode/data/filetest/doc/xml/some.xml.yml
@@ -1,8 +1,8 @@
 filetype_file: XML 1.0 document, ASCII text, with CRLF line terminators
 mimetype_file: text/xml
+mimetype_python: application/xml
 is_file: yes
 is_regular: yes
 size: 1588
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/doc/xml/somespring.xml.yml b/tests/typecode/data/filetest/doc/xml/somespring.xml.yml
index 61daf9d..b0d343f 100644
--- a/tests/typecode/data/filetest/doc/xml/somespring.xml.yml
+++ b/tests/typecode/data/filetest/doc/xml/somespring.xml.yml
@@ -1,8 +1,8 @@
 filetype_file: XML xxx document, ASCII text, with CRLF line terminators
 mimetype_file: text/xml
+mimetype_python: application/xml
 is_file: yes
 is_regular: yes
 size: 2396
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/media/Image-ascii.pgm.yml b/tests/typecode/data/filetest/media/Image-ascii.pgm.yml
index 50cd84e..e40165c 100644
--- a/tests/typecode/data/filetest/media/Image-ascii.pgm.yml
+++ b/tests/typecode/data/filetest/media/Image-ascii.pgm.yml
@@ -1,5 +1,6 @@
-filetype_file: Netpbm image data
+filetype_file: Netpbm image data, size = 62 x 23, greymap, ASCII text
 mimetype_file: image/x-portable-greymap
+mimetype_python: image/x-portable-graymap
 is_file: yes
 is_regular: yes
 size: 5458
diff --git a/tests/typecode/data/filetest/media/Image.pgm.yml b/tests/typecode/data/filetest/media/Image.pgm.yml
index 2eaacee..e82c904 100644
--- a/tests/typecode/data/filetest/media/Image.pgm.yml
+++ b/tests/typecode/data/filetest/media/Image.pgm.yml
@@ -1,5 +1,6 @@
-filetype_file: Netpbm image data
+filetype_file: Netpbm image data, size = 62 x 23, rawbits, greymap
 mimetype_file: image/x-portable-greymap
+mimetype_python: image/x-portable-graymap
 is_file: yes
 is_regular: yes
 size: 1478
diff --git a/tests/typecode/data/filetest/media/Image1.bmp.yml b/tests/typecode/data/filetest/media/Image1.bmp.yml
index aecafd0..d3c61bf 100644
--- a/tests/typecode/data/filetest/media/Image1.bmp.yml
+++ b/tests/typecode/data/filetest/media/Image1.bmp.yml
@@ -1,5 +1,7 @@
-filetype_file: PC bitmap, Windows 3.x format
+filetype_file: PC bitmap, Windows 3.x format, 1 x 1 x 1, image size 4, resolution 2834 x 2834
+  px/m, 2 important colors, cbSize 66, bits offset 62
 mimetype_file: image/bmp
+mimetype_python: image/bmp
 is_file: yes
 is_regular: yes
 size: 66
diff --git a/tests/typecode/data/filetest/media/Image1.gif.yml b/tests/typecode/data/filetest/media/Image1.gif.yml
index 93fa9d4..d9695a5 100644
--- a/tests/typecode/data/filetest/media/Image1.gif.yml
+++ b/tests/typecode/data/filetest/media/Image1.gif.yml
@@ -1,5 +1,6 @@
-filetype_file: GIF image data, version 87a
+filetype_file: GIF image data, version 87a, 1 x 1
 mimetype_file: image/gif
+mimetype_python: image/gif
 is_file: yes
 is_regular: yes
 size: 34
diff --git a/tests/typecode/data/filetest/media/Image1.ico.yml b/tests/typecode/data/filetest/media/Image1.ico.yml
index e8f811a..7c5eeeb 100644
--- a/tests/typecode/data/filetest/media/Image1.ico.yml
+++ b/tests/typecode/data/filetest/media/Image1.ico.yml
@@ -1,5 +1,6 @@
-filetype_file: MS Windows icon resource
+filetype_file: MS Windows icon resource - 1 icon, 1x1, 2 colors
 mimetype_file: image/vnd.microsoft.icon
+mimetype_python: image/x-icon
 is_file: yes
 is_regular: yes
 size: 78
diff --git a/tests/typecode/data/filetest/media/Image1.jpeg.yml b/tests/typecode/data/filetest/media/Image1.jpeg.yml
index bf696bb..e4e4e22 100644
--- a/tests/typecode/data/filetest/media/Image1.jpeg.yml
+++ b/tests/typecode/data/filetest/media/Image1.jpeg.yml
@@ -1,5 +1,7 @@
-filetype_file: JPEG image data, JFIF standard 1.01
+filetype_file: JPEG image data, JFIF standard 1.01, resolution (DPI), density 72x72, segment
+  length 16, progressive, precision 8, 1x1, components 1
 mimetype_file: image/jpeg
+mimetype_python: image/jpeg
 is_file: yes
 is_regular: yes
 size: 280
diff --git a/tests/typecode/data/filetest/media/Image1.jpg.yml b/tests/typecode/data/filetest/media/Image1.jpg.yml
index bf696bb..e4e4e22 100644
--- a/tests/typecode/data/filetest/media/Image1.jpg.yml
+++ b/tests/typecode/data/filetest/media/Image1.jpg.yml
@@ -1,5 +1,7 @@
-filetype_file: JPEG image data, JFIF standard 1.01
+filetype_file: JPEG image data, JFIF standard 1.01, resolution (DPI), density 72x72, segment
+  length 16, progressive, precision 8, 1x1, components 1
 mimetype_file: image/jpeg
+mimetype_python: image/jpeg
 is_file: yes
 is_regular: yes
 size: 280
diff --git a/tests/typecode/data/filetest/media/Image1.pbm.yml b/tests/typecode/data/filetest/media/Image1.pbm.yml
index f48fa05..5af71b0 100644
--- a/tests/typecode/data/filetest/media/Image1.pbm.yml
+++ b/tests/typecode/data/filetest/media/Image1.pbm.yml
@@ -1,5 +1,6 @@
-filetype_file: Netpbm image data
+filetype_file: Netpbm image data, size = 1 x 1, bitmap, ASCII text
 mimetype_file: image/x-portable-bitmap
+mimetype_python: image/x-portable-bitmap
 is_file: yes
 is_regular: yes
 size: 40
diff --git a/tests/typecode/data/filetest/media/Image1.pcx.yml b/tests/typecode/data/filetest/media/Image1.pcx.yml
index 6019344..7f7cc6d 100644
--- a/tests/typecode/data/filetest/media/Image1.pcx.yml
+++ b/tests/typecode/data/filetest/media/Image1.pcx.yml
@@ -1,5 +1,7 @@
-filetype_file: PCX ver. 3.0 image data
+filetype_file: PCX ver. 3.0 image data bounding box [0, 0] - [0, 0], 1-bit colour, 72 x 72 dpi,
+  RLE compressed
 mimetype_file: image/x-pcx
+mimetype_python: image/x-pcx
 is_file: yes
 is_regular: yes
 size: 130
diff --git a/tests/typecode/data/filetest/media/Image1.ppm.yml b/tests/typecode/data/filetest/media/Image1.ppm.yml
index ae711b2..de50b7e 100644
--- a/tests/typecode/data/filetest/media/Image1.ppm.yml
+++ b/tests/typecode/data/filetest/media/Image1.ppm.yml
@@ -1,5 +1,6 @@
-filetype_file: Netpbm image data
+filetype_file: Netpbm image data, size = 1 x 1, pixmap, ASCII text
 mimetype_file: image/x-portable-pixmap
+mimetype_python: image/x-portable-pixmap
 is_file: yes
 is_regular: yes
 size: 54
diff --git a/tests/typecode/data/filetest/media/Image1.psd.yml b/tests/typecode/data/filetest/media/Image1.psd.yml
index 0d7997e..e2e284b 100644
--- a/tests/typecode/data/filetest/media/Image1.psd.yml
+++ b/tests/typecode/data/filetest/media/Image1.psd.yml
@@ -1,5 +1,6 @@
-filetype_file: Adobe Photoshop Image
+filetype_file: Adobe Photoshop Image, 1 x 1, bitmap, 1-bit channel
 mimetype_file: image/vnd.adobe.photoshop
+mimetype_python: image/vnd.adobe.photoshop
 is_file: yes
 is_regular: yes
 size: 132
diff --git a/tests/typecode/data/filetest/media/Image1.ras.yml b/tests/typecode/data/filetest/media/Image1.ras.yml
index e67486f..9415acf 100644
--- a/tests/typecode/data/filetest/media/Image1.ras.yml
+++ b/tests/typecode/data/filetest/media/Image1.ras.yml
@@ -1,5 +1,6 @@
-filetype_file: Sun raster image data
+filetype_file: Sun raster image data, 1 x 1, 1-bit, no colormap
 mimetype_file: application/octet-stream
+mimetype_python: image/x-cmu-raster
 is_file: yes
 is_regular: yes
 size: 34
diff --git a/tests/typecode/data/filetest/media/Image1.tif.yml b/tests/typecode/data/filetest/media/Image1.tif.yml
index 781de98..1be33b6 100644
--- a/tests/typecode/data/filetest/media/Image1.tif.yml
+++ b/tests/typecode/data/filetest/media/Image1.tif.yml
@@ -1,5 +1,7 @@
-filetype_file: TIFF image data
+filetype_file: TIFF image data, little-endian, direntries=14, height=1, bps=1, compression=LZW,
+  PhotometricIntepretation=BlackIsZero, width=1
 mimetype_file: image/tiff
+mimetype_python: image/tiff
 is_file: yes
 is_regular: yes
 size: 222
diff --git a/tests/typecode/data/filetest/media/Image1.wmf.yml b/tests/typecode/data/filetest/media/Image1.wmf.yml
index 6dbf164..d082b67 100644
--- a/tests/typecode/data/filetest/media/Image1.wmf.yml
+++ b/tests/typecode/data/filetest/media/Image1.wmf.yml
@@ -1,5 +1,6 @@
 filetype_file: Windows metafile
 mimetype_file: image/wmf
+mimetype_python: application/x-msmetafile
 is_file: yes
 is_regular: yes
 size: 186
diff --git a/tests/typecode/data/filetest/media/Movie.wmv.yml b/tests/typecode/data/filetest/media/Movie.wmv.yml
index cece7da..d4c6128 100644
--- a/tests/typecode/data/filetest/media/Movie.wmv.yml
+++ b/tests/typecode/data/filetest/media/Movie.wmv.yml
@@ -1,5 +1,10 @@
-filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object
+filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object, Audio Media (Codec Id
+  353, Number of channels 1, Samples Per Second 8000, Average Number of Bytes Per Second 1000,
+  Block Alignment 1048896, Bits Per Sample 10, Error correction type ASF_Audio_Spread), Video
+  Media (Encoded Image Width 160, Encoded Image Height 120, Image Width 160, Image Height 120,
+  Bits Per Pixel Count 24, Error correction type ASF_No_Error_Correction) ASF_Stream_Bitrate_Properties_Object
 mimetype_file: video/x-ms-asf
+mimetype_python: video/x-ms-wmv
 is_file: yes
 is_regular: yes
 size: 12053
diff --git a/tests/typecode/data/filetest/media/Movie_0001.wmv.yml b/tests/typecode/data/filetest/media/Movie_0001.wmv.yml
index e0c0305..4dd1eb5 100644
--- a/tests/typecode/data/filetest/media/Movie_0001.wmv.yml
+++ b/tests/typecode/data/filetest/media/Movie_0001.wmv.yml
@@ -1,5 +1,11 @@
-filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object
+filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object, Audio Media (Codec Id
+  353, Number of channels 2, Samples Per Second 44100, Average Number of Bytes Per Second 11112,
+  Block Alignment 1053035, Bits Per Sample 10, Error correction type ASF_Audio_Spread), Video
+  Media (Encoded Image Width 320, Encoded Image Height 240, Image Width 320, Image Height 240,
+  Bits Per Pixel Count 24, Error correction type ASF_No_Error_Correction) ASF_Stream_Bitrate_Properties_Object
+  ASF_Index_Object ASF_Index_Object
 mimetype_file: video/x-ms-asf
+mimetype_python: video/x-ms-wmv
 is_file: yes
 is_regular: yes
 size: 43620
diff --git a/tests/typecode/data/filetest/media/Movie_0002.wmv.yml b/tests/typecode/data/filetest/media/Movie_0002.wmv.yml
index 4990fe0..b23d19a 100644
--- a/tests/typecode/data/filetest/media/Movie_0002.wmv.yml
+++ b/tests/typecode/data/filetest/media/Movie_0002.wmv.yml
@@ -1,5 +1,10 @@
-filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object
+filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object, Audio Media (Codec Id
+  353, Number of channels 2, Samples Per Second 22050, Average Number of Bytes Per Second 4006,
+  Block Alignment 1049320, Bits Per Sample 10, Error correction type ASF_Audio_Spread), Video
+  Media (Encoded Image Width 208, Encoded Image Height 160, Image Width 208, Image Height 160,
+  Bits Per Pixel Count 24, Error correction type ASF_No_Error_Correction) ASF_Stream_Bitrate_Properties_Object
 mimetype_file: video/x-ms-asf
+mimetype_python: video/x-ms-wmv
 is_file: yes
 is_regular: yes
 size: 46372
diff --git a/tests/typecode/data/filetest/media/TBarLrge.bmp.yml b/tests/typecode/data/filetest/media/TBarLrge.bmp.yml
index bb4741d..fb8a8d5 100644
--- a/tests/typecode/data/filetest/media/TBarLrge.bmp.yml
+++ b/tests/typecode/data/filetest/media/TBarLrge.bmp.yml
@@ -1,5 +1,7 @@
-filetype_file: PC bitmap, Windows 3.x format
+filetype_file: PC bitmap, Windows 3.x format, 400 x 32 x 4, image size 6400, resolution 4730
+  x 4720 px/m, cbSize 6518, bits offset 118
 mimetype_file: image/bmp
+mimetype_python: image/bmp
 is_file: yes
 is_regular: yes
 size: 6518
diff --git a/tests/typecode/data/filetest/media/TBarMedm.bmp.yml b/tests/typecode/data/filetest/media/TBarMedm.bmp.yml
index a33e5bc..23d904e 100644
--- a/tests/typecode/data/filetest/media/TBarMedm.bmp.yml
+++ b/tests/typecode/data/filetest/media/TBarMedm.bmp.yml
@@ -1,5 +1,7 @@
-filetype_file: PC bitmap, Windows 3.x format
+filetype_file: PC bitmap, Windows 3.x format, 210 x 16 x 4, image size 1728, cbSize 1846, bits
+  offset 118
 mimetype_file: image/bmp
+mimetype_python: image/bmp
 is_file: yes
 is_regular: yes
 size: 1846
diff --git a/tests/typecode/data/filetest/media/a.aif.yml b/tests/typecode/data/filetest/media/a.aif.yml
index 8308871..33d115f 100644
--- a/tests/typecode/data/filetest/media/a.aif.yml
+++ b/tests/typecode/data/filetest/media/a.aif.yml
@@ -1,5 +1,6 @@
 filetype_file: IFF data, AIFF audio
 mimetype_file: audio/x-aiff
+mimetype_python: audio/x-aiff
 is_file: yes
 is_regular: yes
 size: 8246
diff --git a/tests/typecode/data/filetest/media/a.aiff.yml b/tests/typecode/data/filetest/media/a.aiff.yml
index 8308871..33d115f 100644
--- a/tests/typecode/data/filetest/media/a.aiff.yml
+++ b/tests/typecode/data/filetest/media/a.aiff.yml
@@ -1,5 +1,6 @@
 filetype_file: IFF data, AIFF audio
 mimetype_file: audio/x-aiff
+mimetype_python: audio/x-aiff
 is_file: yes
 is_regular: yes
 size: 8246
diff --git a/tests/typecode/data/filetest/media/a.au.yml b/tests/typecode/data/filetest/media/a.au.yml
index d51b9ad..a2df838 100644
--- a/tests/typecode/data/filetest/media/a.au.yml
+++ b/tests/typecode/data/filetest/media/a.au.yml
@@ -1,5 +1,6 @@
 filetype_file: Sun/NeXT audio data
 mimetype_file: audio/basic
+mimetype_python: audio/basic
 is_file: yes
 is_regular: yes
 size: 8216
diff --git a/tests/typecode/data/filetest/media/a.avi.yml b/tests/typecode/data/filetest/media/a.avi.yml
index 497034b..3cef425 100644
--- a/tests/typecode/data/filetest/media/a.avi.yml
+++ b/tests/typecode/data/filetest/media/a.avi.yml
@@ -1,5 +1,6 @@
 filetype_file: Microsoft ASF, Video Media
 mimetype_file: video/x-ms-asf
+mimetype_python: video/x-msvideo
 is_file: yes
 is_regular: yes
 size: 156277
diff --git a/tests/typecode/data/filetest/media/a.mp2.yml b/tests/typecode/data/filetest/media/a.mp2.yml
index 3f992e2..dc8e1c2 100644
--- a/tests/typecode/data/filetest/media/a.mp2.yml
+++ b/tests/typecode/data/filetest/media/a.mp2.yml
@@ -1,5 +1,6 @@
-filetype_file: MPEG ADTS, layer II
+filetype_file: MPEG ADTS, layer II, v1, 160 kbps, 44.1 kHz, Monaural
 mimetype_file: audio/mpeg
+mimetype_python: audio/mpeg
 is_file: yes
 is_regular: yes
 size: 2088
diff --git a/tests/typecode/data/filetest/media/a.mp3.yml b/tests/typecode/data/filetest/media/a.mp3.yml
index b9e86fc..acac7c3 100644
--- a/tests/typecode/data/filetest/media/a.mp3.yml
+++ b/tests/typecode/data/filetest/media/a.mp3.yml
@@ -1,5 +1,6 @@
-filetype_file: MPEG ADTS, layer III
+filetype_file: MPEG ADTS, layer III, v1, 128 kbps, 44.1 kHz, Monaural
 mimetype_file: audio/mpeg
+mimetype_python: audio/mpeg
 is_file: yes
 is_regular: yes
 size: 2507
diff --git a/tests/typecode/data/filetest/media/a.ogg.yml b/tests/typecode/data/filetest/media/a.ogg.yml
index 293b1da..0a9bc4d 100644
--- a/tests/typecode/data/filetest/media/a.ogg.yml
+++ b/tests/typecode/data/filetest/media/a.ogg.yml
@@ -1,5 +1,7 @@
-filetype_file: Ogg data, Vorbis audio, mono
+filetype_file: 'Ogg data, Vorbis audio, mono, 44100 Hz, ~96000 bps, created by: Xiph.Org libVorbis
+  I (1.2.0)'
 mimetype_file: audio/ogg
+mimetype_python: audio/ogg
 is_file: yes
 is_regular: yes
 size: 5323
diff --git a/tests/typecode/data/filetest/media/a.pdf.yml b/tests/typecode/data/filetest/media/a.pdf.yml
index a532ba2..8ce4b7c 100644
--- a/tests/typecode/data/filetest/media/a.pdf.yml
+++ b/tests/typecode/data/filetest/media/a.pdf.yml
@@ -1,10 +1,10 @@
 filetype_file: PDF document, version 1.2
 mimetype_file: application/pdf
+mimetype_python: application/pdf
 is_file: yes
 is_regular: yes
 size: 1218
 is_pdf_with_text: yes
 is_binary: yes
 contains_text: yes
-is_media_with_meta: yes
 is_pdf: yes
diff --git a/tests/typecode/data/filetest/media/a.png.yml b/tests/typecode/data/filetest/media/a.png.yml
index a758523..1afc4da 100644
--- a/tests/typecode/data/filetest/media/a.png.yml
+++ b/tests/typecode/data/filetest/media/a.png.yml
@@ -1,5 +1,6 @@
-filetype_file: PNG image data
+filetype_file: PNG image data, 1 x 1, 1-bit colormap, non-interlaced
 mimetype_file: image/png
+mimetype_python: image/png
 is_file: yes
 is_regular: yes
 size: 158
diff --git a/tests/typecode/data/filetest/media/a.theo.ogg.yml b/tests/typecode/data/filetest/media/a.theo.ogg.yml
index 769b501..4eda305 100644
--- a/tests/typecode/data/filetest/media/a.theo.ogg.yml
+++ b/tests/typecode/data/filetest/media/a.theo.ogg.yml
@@ -1,5 +1,6 @@
 filetype_file: Ogg data, Theora video
 mimetype_file: video/ogg
+mimetype_python: audio/ogg
 is_file: yes
 is_regular: yes
 size: 81644
diff --git a/tests/typecode/data/filetest/media/a.wav.yml b/tests/typecode/data/filetest/media/a.wav.yml
index f93323f..d057a3e 100644
--- a/tests/typecode/data/filetest/media/a.wav.yml
+++ b/tests/typecode/data/filetest/media/a.wav.yml
@@ -1,5 +1,6 @@
-filetype_file: RIFF (little-endian) data, WAVE audio
+filetype_file: RIFF (little-endian) data, WAVE audio, Microsoft ADPCM, mono 44100 Hz
 mimetype_file: audio/x-wav
+mimetype_python: audio/x-wav
 is_file: yes
 is_regular: yes
 size: 4186
diff --git a/tests/typecode/data/filetest/media/a4.mp4.yml b/tests/typecode/data/filetest/media/a4.mp4.yml
index d00f9be..94f3758 100644
--- a/tests/typecode/data/filetest/media/a4.mp4.yml
+++ b/tests/typecode/data/filetest/media/a4.mp4.yml
@@ -1,5 +1,6 @@
 filetype_file: ISO Media, MP4 Base Media v1
 mimetype_file: video/mp4
+mimetype_python: video/mp4
 is_file: yes
 is_regular: yes
 size: '196'
diff --git a/tests/typecode/data/filetest/media/a4.mpg.yml b/tests/typecode/data/filetest/media/a4.mpg.yml
index 8d2d3d6..4633dde 100644
--- a/tests/typecode/data/filetest/media/a4.mpg.yml
+++ b/tests/typecode/data/filetest/media/a4.mpg.yml
@@ -1,5 +1,6 @@
 filetype_file: ISO Media, MP4 Base Media v1
 mimetype_file: video/mp4
+mimetype_python: video/mpeg
 is_file: yes
 is_regular: yes
 size: 238534
diff --git a/tests/typecode/data/filetest/media/drawing.svg.yml b/tests/typecode/data/filetest/media/drawing.svg.yml
index abc8e3a..53154ae 100644
--- a/tests/typecode/data/filetest/media/drawing.svg.yml
+++ b/tests/typecode/data/filetest/media/drawing.svg.yml
@@ -1,5 +1,6 @@
 filetype_file: SVG Scalable Vector Graphics image
 mimetype_file: image/svg+xml
+mimetype_python: image/svg+xml
 is_file: yes
 is_regular: yes
 size: '1971'
diff --git a/tests/typecode/data/filetest/media/mov.wvm.wmv.yml b/tests/typecode/data/filetest/media/mov.wvm.wmv.yml
index a272777..aee0555 100644
--- a/tests/typecode/data/filetest/media/mov.wvm.wmv.yml
+++ b/tests/typecode/data/filetest/media/mov.wvm.wmv.yml
@@ -1,5 +1,10 @@
-filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object
+filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object, Audio Media (Codec Id
+  353, Number of channels 1, Samples Per Second 8000, Average Number of Bytes Per Second 1000,
+  Block Alignment 1048896, Bits Per Sample 10, Error correction type ASF_Audio_Spread), Video
+  Media (Encoded Image Width 160, Encoded Image Height 120, Image Width 160, Image Height 120,
+  Bits Per Pixel Count 24, Error correction type ASF_No_Error_Correction) ASF_Stream_Bitrate_Properties_Object
 mimetype_file: video/x-ms-asf
+mimetype_python: video/x-ms-wmv
 is_file: yes
 is_regular: yes
 size: 10416
diff --git a/tests/typecode/data/filetest/package/TicketImport-0.7a-py2.5.egg.yml b/tests/typecode/data/filetest/package/TicketImport-0.7a-py2.5.egg.yml
index cc6d05c..4b18f4e 100644
--- a/tests/typecode/data/filetest/package/TicketImport-0.7a-py2.5.egg.yml
+++ b/tests/typecode/data/filetest/package/TicketImport-0.7a-py2.5.egg.yml
@@ -6,5 +6,4 @@ size: 38037
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_package: yes
diff --git a/tests/typecode/data/filetest/package/ant-jsch-1.7.0.jar.yml b/tests/typecode/data/filetest/package/ant-jsch-1.7.0.jar.yml
index ea29e86..d69c1af 100644
--- a/tests/typecode/data/filetest/package/ant-jsch-1.7.0.jar.yml
+++ b/tests/typecode/data/filetest/package/ant-jsch-1.7.0.jar.yml
@@ -1,10 +1,10 @@
 filetype_file: Java archive data (JAR)
 mimetype_file: application/java-archive
+mimetype_python: application/java-archive
 is_file: yes
 is_regular: yes
 size: 30122
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_package: yes
diff --git a/tests/typecode/data/filetest/package/ant.zip.yml b/tests/typecode/data/filetest/package/ant.zip.yml
index ea29e86..4f9b4ed 100644
--- a/tests/typecode/data/filetest/package/ant.zip.yml
+++ b/tests/typecode/data/filetest/package/ant.zip.yml
@@ -1,10 +1,10 @@
 filetype_file: Java archive data (JAR)
 mimetype_file: application/java-archive
+mimetype_python: application/zip
 is_file: yes
 is_regular: yes
 size: 30122
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_package: yes
diff --git a/tests/typecode/data/filetest/package/c.war.yml b/tests/typecode/data/filetest/package/c.war.yml
index 1267ee3..d4c4b8e 100644
--- a/tests/typecode/data/filetest/package/c.war.yml
+++ b/tests/typecode/data/filetest/package/c.war.yml
@@ -6,5 +6,4 @@ size: 880
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_package: yes
diff --git a/tests/typecode/data/filetest/package/rubygems-update-1.4.1.gem.yml b/tests/typecode/data/filetest/package/rubygems-update-1.4.1.gem.yml
index af5a442..de32c8b 100644
--- a/tests/typecode/data/filetest/package/rubygems-update-1.4.1.gem.yml
+++ b/tests/typecode/data/filetest/package/rubygems-update-1.4.1.gem.yml
@@ -6,5 +6,4 @@ size: 301056
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_package: yes
diff --git a/tests/typecode/data/filetest/package/wget-1.11.4-3.fc11.i586.rpm.yml b/tests/typecode/data/filetest/package/wget-1.11.4-3.fc11.i586.rpm.yml
index 4157cdb..dd6c884 100644
--- a/tests/typecode/data/filetest/package/wget-1.11.4-3.fc11.i586.rpm.yml
+++ b/tests/typecode/data/filetest/package/wget-1.11.4-3.fc11.i586.rpm.yml
@@ -6,5 +6,4 @@ size: 614846
 is_binary: yes
 is_archive: yes
 is_compressed: yes
-is_media_with_meta: yes
 is_package: yes
diff --git a/tests/typecode/data/filetest/script/build_w32vc.bat.yml b/tests/typecode/data/filetest/script/build_w32vc.bat.yml
index 5d99191..19628c4 100644
--- a/tests/typecode/data/filetest/script/build_w32vc.bat.yml
+++ b/tests/typecode/data/filetest/script/build_w32vc.bat.yml
@@ -1,5 +1,6 @@
 filetype_file: DOS batch file, ASCII text
 mimetype_file: text/x-msdos-batch
+mimetype_python: application/x-msdownload
 filetype_pygment: Batchfile
 programming_language: Batchfile
 is_file: yes
@@ -7,5 +8,4 @@ is_regular: yes
 size: 880
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/script/install.yml b/tests/typecode/data/filetest/script/install.yml
index 5ce9af3..efccf60 100644
--- a/tests/typecode/data/filetest/script/install.yml
+++ b/tests/typecode/data/filetest/script/install.yml
@@ -5,4 +5,3 @@ is_regular: yes
 size: 437
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/script/makelinks.yml b/tests/typecode/data/filetest/script/makelinks.yml
index 5bc9780..c83cf24 100644
--- a/tests/typecode/data/filetest/script/makelinks.yml
+++ b/tests/typecode/data/filetest/script/makelinks.yml
@@ -7,6 +7,5 @@ is_regular: yes
 size: 767
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_script: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/script/test.sh.yml b/tests/typecode/data/filetest/script/test.sh.yml
index ca2a9c4..32ea50f 100644
--- a/tests/typecode/data/filetest/script/test.sh.yml
+++ b/tests/typecode/data/filetest/script/test.sh.yml
@@ -1,5 +1,6 @@
 filetype_file: POSIX shell script, ASCII text executable
 mimetype_file: text/x-shellscript
+mimetype_python: application/x-sh
 filetype_pygment: Bash
 programming_language: Bash
 is_file: yes
@@ -7,6 +8,5 @@ is_regular: yes
 size: 97
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_script: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/script/zip_src.bat.yml b/tests/typecode/data/filetest/script/zip_src.bat.yml
index c01e05f..2fa6f2f 100644
--- a/tests/typecode/data/filetest/script/zip_src.bat.yml
+++ b/tests/typecode/data/filetest/script/zip_src.bat.yml
@@ -1,5 +1,6 @@
 filetype_file: ASCII text, with CRLF line terminators
 mimetype_file: text/plain
+mimetype_python: application/x-msdownload
 filetype_pygment: Batchfile
 programming_language: Batchfile
 is_file: yes
@@ -7,5 +8,4 @@ is_regular: yes
 size: 223
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/test.sh.yml b/tests/typecode/data/filetest/test.sh.yml
index ca2a9c4..32ea50f 100644
--- a/tests/typecode/data/filetest/test.sh.yml
+++ b/tests/typecode/data/filetest/test.sh.yml
@@ -1,5 +1,6 @@
 filetype_file: POSIX shell script, ASCII text executable
 mimetype_file: text/x-shellscript
+mimetype_python: application/x-sh
 filetype_pygment: Bash
 programming_language: Bash
 is_file: yes
@@ -7,6 +8,5 @@ is_regular: yes
 size: 97
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
 is_script: yes
 is_source: yes
diff --git a/tests/typecode/data/filetest/text/COPYING.yml b/tests/typecode/data/filetest/text/COPYING.yml
index 6b1ba35..80f920c 100644
--- a/tests/typecode/data/filetest/text/COPYING.yml
+++ b/tests/typecode/data/filetest/text/COPYING.yml
@@ -5,4 +5,3 @@ is_regular: yes
 size: 18691
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/text/CREDITS.yml b/tests/typecode/data/filetest/text/CREDITS.yml
index fabc3b4..14666b3 100644
--- a/tests/typecode/data/filetest/text/CREDITS.yml
+++ b/tests/typecode/data/filetest/text/CREDITS.yml
@@ -5,4 +5,3 @@ is_regular: yes
 size: 82295
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/text/ChangeLog.yml b/tests/typecode/data/filetest/text/ChangeLog.yml
index 325dbe0..ba80cc3 100644
--- a/tests/typecode/data/filetest/text/ChangeLog.yml
+++ b/tests/typecode/data/filetest/text/ChangeLog.yml
@@ -5,4 +5,3 @@ is_regular: yes
 size: 76402
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/text/GPL.txt.yml b/tests/typecode/data/filetest/text/GPL.txt.yml
index 473cc5b..82b59cc 100644
--- a/tests/typecode/data/filetest/text/GPL.txt.yml
+++ b/tests/typecode/data/filetest/text/GPL.txt.yml
@@ -1,8 +1,8 @@
 filetype_file: ASCII text
 mimetype_file: text/plain
+mimetype_python: text/plain
 is_file: yes
 is_regular: yes
 size: 17982
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/text/crashing-a.txt.yml b/tests/typecode/data/filetest/text/crashing-a.txt.yml
index 1383bec..2eea359 100644
--- a/tests/typecode/data/filetest/text/crashing-a.txt.yml
+++ b/tests/typecode/data/filetest/text/crashing-a.txt.yml
@@ -1,8 +1,8 @@
 filetype_file: ASCII text
 mimetype_file: text/plain
+mimetype_python: text/plain
 is_file: yes
 is_regular: yes
 size: 10
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/text/crashing-z.txt.yml b/tests/typecode/data/filetest/text/crashing-z.txt.yml
index 1383bec..2eea359 100644
--- a/tests/typecode/data/filetest/text/crashing-z.txt.yml
+++ b/tests/typecode/data/filetest/text/crashing-z.txt.yml
@@ -1,8 +1,8 @@
 filetype_file: ASCII text
 mimetype_file: text/plain
+mimetype_python: text/plain
 is_file: yes
 is_regular: yes
 size: 10
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/text/windowserver.log.yml b/tests/typecode/data/filetest/text/windowserver.log.yml
index 431219b..56c4189 100644
--- a/tests/typecode/data/filetest/text/windowserver.log.yml
+++ b/tests/typecode/data/filetest/text/windowserver.log.yml
@@ -1,8 +1,8 @@
 filetype_file: ASCII text
 mimetype_file: text/plain
+mimetype_python: text/plain
 is_file: yes
 is_regular: yes
 size: 65454
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/data/filetest/text/x11-xconsortium_text.txt.yml b/tests/typecode/data/filetest/text/x11-xconsortium_text.txt.yml
index 4c8a706..b5fad6f 100644
--- a/tests/typecode/data/filetest/text/x11-xconsortium_text.txt.yml
+++ b/tests/typecode/data/filetest/text/x11-xconsortium_text.txt.yml
@@ -1,8 +1,8 @@
 filetype_file: X1 archive data
 mimetype_file: text/plain
+mimetype_python: text/plain
 is_file: yes
 is_regular: yes
 size: 1355
 is_text: yes
 contains_text: yes
-is_media_with_meta: yes
diff --git a/tests/typecode/filetype_test_utils.py b/tests/typecode/filetype_test_utils.py
index d4a4d8d..d5675fe 100644
--- a/tests/typecode/filetype_test_utils.py
+++ b/tests/typecode/filetype_test_utils.py
@@ -70,12 +70,12 @@ class FileTypeTest(object):
     test_file = attr.ib(default=None)
 
     # ATTENTION: keep these attributes  in sync with typecode.contenttype.Type
-    filetype_file = attr.ib(default=None)
-    mimetype_file = attr.ib(default=None)
-    mimetype_python = attr.ib(default=None)
-    filetype_pygment = attr.ib(default=None)
-    elf_type = attr.ib(default=None)
-    programming_language = attr.ib(default=None)
+    filetype_file = attr.ib(default='')
+    mimetype_file = attr.ib(default='')
+    mimetype_python = attr.ib(default='')
+    filetype_pygment = attr.ib(default='')
+    elf_type = attr.ib(default='')
+    programming_language = attr.ib(default='')
 
     is_file = attr.ib(default=False)
     is_dir = attr.ib(default=False)
@@ -84,7 +84,7 @@ class FileTypeTest(object):
 
     is_link = attr.ib(default=False)
     is_broken_link = attr.ib(default=False)
-    link_target = attr.ib(default=False)
+    link_target = attr.ib(default='')
     size = attr.ib(default=False)
     is_pdf_with_text = attr.ib(default=False)
     is_text = attr.ib(default=False)
@@ -112,6 +112,7 @@ class FileTypeTest(object):
     is_source = attr.ib(default=False)
     is_stripped_elf = attr.ib(default=False)
     is_winexe = attr.ib(default=False)
+    is_makefile = attr.ib(default=False)
 
     expected_failure = attr.ib(default=False)
     notes = attr.ib(default=None)
@@ -127,8 +128,10 @@ def __attrs_post_init__(self, *args, **kwargs):
                 import traceback
                 msg = 'file://' + self.data_file + '\n' + repr(self) + '\n' + traceback.format_exc()
                 raise Exception(msg)
+        if isinstance(self.size, str):
+            self.size = int(self.size)
 
-    def to_dict(self):
+    def to_dict(self, filter_empty=False, filter_extra=False):
         """
         Serialize self to an ordered mapping.
         """
@@ -136,14 +139,20 @@ def to_dict(self):
                     if field.name in ('data_file', 'test_file')]
         fields_filter = attr.filters.exclude(*filtered)
         data = attr.asdict(self, filter=fields_filter, dict_factory=OrderedDict)
-        # skip empty fields
-        return OrderedDict([(key, val) for key, val in data.items() if val])
+        data = data.items()
+        if filter_empty:
+            # skip empty fields
+            data = ((k, v) for k, v in data if v)
+        if filter_extra:
+            data = ((k, v) for k, v in data if k not in ('expected_failure', 'notes'))
+
+        return OrderedDict(data)
 
     def dumps(self):
         """
         Return a string representation of self in YAML block format.
         """
-        return saneyaml.dump(self.to_dict())
+        return saneyaml.dump(self.to_dict(filter_empty=True))
 
     def dump(self, check_exists=False):
         """
@@ -165,6 +174,38 @@ def load_filetype_tests(test_dir):
         yield FileTypeTest(data_file, test_file)
 
 
+def check_types_equal(expected, result):
+    """
+    Compare type data dict expected to type data dict result key by key.
+    Return True if they match, false otherwise.
+    Check also that the keys are identical.
+    Treat text attributes in a special way as we test for "startswith".
+    Empty strings are treated the same as None.
+    """
+    extra_keys = set(expected.keys()).symmetric_difference(set(result.keys()))
+    assert not extra_keys
+
+    for expected_key, expected_value in expected.items():
+        result_value = result[expected_key]
+
+        # these attributes should be tested with startswith
+        if expected_key in Type.text_attributes:
+            if result_value and expected_value:
+                if not result_value.startswith(expected_value):
+                    return False
+            else:
+                if result_value != expected_value:
+                    return False
+
+        # we have either number, date, None or boolean value and
+        # we want both values to be both trueish or falsish
+        else:
+
+            if bool(result_value) != bool(expected_value):
+                return False
+    return True
+
+
 def make_filetype_test_functions(test, index, test_data_dir=test_env.test_data_dir, regen=False):
     """
     Build and return a test function closing on tests arguments and the function name.
@@ -172,44 +213,20 @@ def make_filetype_test_functions(test, index, test_data_dir=test_env.test_data_d
 
     def closure_test_function(*args, **kwargs):
         results = get_type(test_file).to_dict(include_date=False)
-        results_yaml = saneyaml.dump(results)
 
         if regen:
             for key, value in results.items():
                 setattr(test, key, value)
                 test.dump()
 
-            expected_yaml = results_yaml
-        else:
-            expected_yaml = test.dumps()
-
-        passing = True
-        for expected_key, expected_value in test.to_dict().items():
-            result_value = results[expected_key]
-
-            # these attributes should be tested with startswith
-            if expected_key in Type.text_attributes:
-                if result_value and expected_value:
-                    if not result_value.startswith(expected_value):
-                        passing = False
-                else:
-                    if not result_value == expected_value:
-                        passing = False
-
-            # we have either None or Boolean value and
-            # we want both values to be both trueish or falsish
-            else:
-                if not (result_value and expected_value):
-                    passing = False
+        expected = test.to_dict(filter_empty=False, filter_extra=True)
+        passing = check_types_equal(expected, results)
 
         # this is done to display slightly eaier to handle error traces
         if not passing:
-            expected_yaml = (
-                'data file: file://' + data_file +
-                '\ntest file: file://' + test_file + '\n'
-            ) + expected_yaml
-
-            assert expected_yaml == results_yaml
+            expected['data file']= 'file://' + data_file
+            expected['test_file']= 'file://' + test_file
+            assert dict(expected) == dict(results)
 
     data_file = test.data_file
     test_file = test.test_file
diff --git a/tests/typecode/test_types.py b/tests/typecode/test_types.py
index 3437d97..132ccf5 100644
--- a/tests/typecode/test_types.py
+++ b/tests/typecode/test_types.py
@@ -46,7 +46,8 @@ class TestFileTypesDataDriven(FileDrivenTesting):
 
 build_tests(
     filetype_tests=load_filetype_tests(
-        os.path.join(test_env.test_data_dir, 'filetest')), 
-    clazz=TestFileTypesDataDriven, 
+        os.path.join(test_env.test_data_dir, 'filetest')),
+    clazz=TestFileTypesDataDriven,
     test_data_dir=test_env.test_data_dir,
-    regen=False)
+    regen=False,
+)

From 7c12789baab9fd78c766e4a43169788c261da4c1 Mon Sep 17 00:00:00 2001
From: Jono Yang <jyang@nexb.com>
Date: Mon, 5 Oct 2020 15:03:22 -0700
Subject: [PATCH 7/8] Install typecode_libmagic when configuring #4

Signed-off-by: Jono Yang <jyang@nexb.com>
---
 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index a35c8c9..e17cb0b 100755
--- a/configure
+++ b/configure
@@ -35,6 +35,7 @@ function setup {
 setup
 
 $CONFIGURE_ROOT_DIR/tmp/bin/pip install -e .[testing]
+$CONFIGURE_ROOT_DIR/tmp/bin/pip install typecode_libmagic
 
 if [ -f "$CONFIGURE_ROOT_DIR/tmp/bin/activate" ]; then
     source "$CONFIGURE_ROOT_DIR/tmp/bin/activate"

From 951ad679392339996474ae83f49ea62edcfb1834 Mon Sep 17 00:00:00 2001
From: Jono Yang <jyang@nexb.com>
Date: Mon, 5 Oct 2020 16:08:48 -0700
Subject: [PATCH 8/8] Pin pygments version #4

Signed-off-by: Jono Yang <jyang@nexb.com>
---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 51973ea..7894c74 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,7 +33,7 @@ install_requires =
 	commoncode
 	pdfminer.six
 	plugincode
-	pygments
+	pygments >= 2.7.1
 	six
 setup_requires = setuptools_scm[toml] >= 4