summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-04-29 14:03:50 +0200
committerGeorg Brandl <georg@python.org>2011-04-29 14:03:50 +0200
commit5ee0664f59860a3ae59075435ef179247a665bc4 (patch)
treed289ef05ca2ac6d8147c8f87fbf0853c596e2e92
parentae9cd868fab0bcfd8fee758bbfc6cfc5504c2d8b (diff)
downloadpygments-5ee0664f59860a3ae59075435ef179247a665bc4.tar.gz
Fix awk lexer mimetypes attribute, and add more Fortran extensions (#661).
-rw-r--r--pygments/lexers/_mapping.py4
-rw-r--r--pygments/lexers/compiled.py2
-rw-r--r--pygments/lexers/other.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index b3ab5b14..6664b1d1 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -31,7 +31,7 @@ LEXERS = {
'AppleScriptLexer': ('pygments.lexers.other', 'AppleScript', ('applescript',), ('*.applescript',), ()),
'AsymptoteLexer': ('pygments.lexers.other', 'Asymptote', ('asy', 'asymptote'), ('*.asy',), ('text/x-asymptote',)),
'AutohotkeyLexer': ('pygments.lexers.other', 'autohotkey', ('ahk',), ('*.ahk', '*.ahkl'), ('text/x-autohotkey',)),
- 'AwkLexer': ('pygments.lexers.other', 'Awk', ('awk', 'gawk', 'mawk', 'nawk'), ('*.awk',), ('application/x-awk')),
+ 'AwkLexer': ('pygments.lexers.other', 'Awk', ('awk', 'gawk', 'mawk', 'nawk'), ('*.awk',), ('application/x-awk',)),
'BBCodeLexer': ('pygments.lexers.text', 'BBCode', ('bbcode',), (), ('text/x-bbcode',)),
'BaseMakefileLexer': ('pygments.lexers.text', 'Makefile', ('basemake',), (), ()),
'BashLexer': ('pygments.lexers.other', 'Bash', ('bash', 'sh', 'ksh'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass'), ('application/x-sh', 'application/x-shellscript')),
@@ -82,7 +82,7 @@ LEXERS = {
'FactorLexer': ('pygments.lexers.agile', 'Factor', ('factor',), ('*.factor',), ('text/x-factor',)),
'FancyLexer': ('pygments.lexers.agile', 'Fancy', ('fancy', 'fy'), ('*.fy', '*.fancypack'), ('text/x-fancysrc',)),
'FelixLexer': ('pygments.lexers.compiled', 'Felix', ('felix', 'flx'), ('*.flx', '*.flxh'), ('text/x-felix',)),
- 'FortranLexer': ('pygments.lexers.compiled', 'Fortran', ('fortran',), ('*.f', '*.f90'), ('text/x-fortran',)),
+ 'FortranLexer': ('pygments.lexers.compiled', 'Fortran', ('fortran',), ('*.f', '*.f90', '*.F', '*.F90'), ('text/x-fortran',)),
'GLShaderLexer': ('pygments.lexers.compiled', 'GLSL', ('glsl',), ('*.vert', '*.frag', '*.geo'), ('text/x-glslsrc',)),
'GasLexer': ('pygments.lexers.asm', 'GAS', ('gas',), ('*.s', '*.S'), ('text/x-gas',)),
'GenshiLexer': ('pygments.lexers.templates', 'Genshi', ('genshi', 'kid', 'xml+genshi', 'xml+kid'), ('*.kid',), ('application/x-genshi', 'application/x-kid')),
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py
index 5c10a785..a51bd420 100644
--- a/pygments/lexers/compiled.py
+++ b/pygments/lexers/compiled.py
@@ -1239,7 +1239,7 @@ class FortranLexer(RegexLexer):
'''
name = 'Fortran'
aliases = ['fortran']
- filenames = ['*.f', '*.f90']
+ filenames = ['*.f', '*.f90', '*.F', '*.F90']
mimetypes = ['text/x-fortran']
flags = re.IGNORECASE
diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py
index 1a56f72e..0cf785cc 100644
--- a/pygments/lexers/other.py
+++ b/pygments/lexers/other.py
@@ -2853,7 +2853,7 @@ class AwkLexer(RegexLexer):
name = 'Awk'
aliases = ['awk', 'gawk', 'mawk', 'nawk']
filenames = ['*.awk']
- mimetype = ['application/x-awk']
+ mimetypes = ['application/x-awk']
tokens = {
'commentsandwhitespace': [