intermediate changes

ref:2d4f292087954c9344efdabb7b2a67f466263c65

1 files changed, 15 insertions, 13 deletions

diff --git a/contrib/python/Pygments/py3/pygments/lexers/int_fiction.py b/contrib/python/Pygments/py3/pygments/lexers/int_fiction.py
index c309d19248..01ad8b7cbd 100644
--- a/contrib/python/Pygments/py3/pygments/lexers/int_fiction.py
+++ b/contrib/python/Pygments/py3/pygments/lexers/int_fiction.py
@@ -4,7 +4,7 @@
 
     Lexers for interactive fiction languages.
 
-    :copyright: Copyright 2006-2021 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,16 +21,17 @@ __all__ = ['Inform6Lexer', 'Inform6TemplateLexer', 'Inform7Lexer',
 
 class Inform6Lexer(RegexLexer):
     """
-    For `Inform 6 <http://inform-fiction.org/>`_ source code.
+    For Inform 6 source code.
 
     .. versionadded:: 2.0
     """
 
     name = 'Inform 6'
+    url = 'http://inform-fiction.org/'
     aliases = ['inform6', 'i6']
     filenames = ['*.inf']
 
-    flags = re.MULTILINE | re.DOTALL | re.UNICODE
+    flags = re.MULTILINE | re.DOTALL
 
     _name = r'[a-zA-Z_]\w*'
 
@@ -381,10 +382,10 @@ class Inform6Lexer(RegexLexer):
             include('_whitespace'),
             (words((
                 'additive', 'alias', 'buffer', 'class', 'creature', 'data', 'error', 'fatalerror',
-                'first', 'has', 'held', 'initial', 'initstr', 'last', 'long', 'meta', 'multi',
-                'multiexcept', 'multiheld', 'multiinside', 'noun', 'number', 'only', 'private',
-                'replace', 'reverse', 'scope', 'score', 'special', 'string', 'table', 'terminating',
-                'time', 'topic', 'warning', 'with'), suffix=r'\b'),
+                'first', 'has', 'held', 'individual', 'initial', 'initstr', 'last', 'long', 'meta',
+                'multi', 'multiexcept', 'multiheld', 'multiinside', 'noun', 'number', 'only',
+                'private', 'replace', 'reverse', 'scope', 'score', 'special', 'string', 'table',
+                'terminating', 'time', 'topic', 'warning', 'with'), suffix=r'\b'),
              Keyword, '#pop'),
             (r'static\b', Keyword),
             (r'[%s]{1,2}>|[+=]' % _dash, Punctuation, '#pop')
@@ -399,7 +400,8 @@ class Inform6Lexer(RegexLexer):
         ],
         'property-keyword*': [
             include('_whitespace'),
-            (r'(additive|long)\b', Keyword),
+            (words(('additive', 'individual', 'long'), suffix=r'\b(?!(\s*|(![^%s]*))*;)' % _newline),
+             Keyword),
             default('#pop')
         ],
         'trace-keyword?': [
@@ -527,16 +529,17 @@ class Inform6Lexer(RegexLexer):
 
 class Inform7Lexer(RegexLexer):
     """
-    For `Inform 7 <http://inform7.com/>`_ source code.
+    For Inform 7 source code.
 
     .. versionadded:: 2.0
     """
 
     name = 'Inform 7'
+    url = 'http://inform7.com/'
     aliases = ['inform7', 'i7']
     filenames = ['*.ni', '*.i7x']
 
-    flags = re.MULTILINE | re.DOTALL | re.UNICODE
+    flags = re.MULTILINE | re.DOTALL
 
     _dash = Inform6Lexer._dash
     _dquote = Inform6Lexer._dquote
@@ -730,8 +733,7 @@ class Inform7Lexer(RegexLexer):
 
 class Inform6TemplateLexer(Inform7Lexer):
     """
-    For `Inform 6 template
-    <http://inform7.com/sources/src/i6template/Woven/index.html>`_ code.
+    For Inform 6 template code.
 
     .. versionadded:: 2.0
     """
@@ -746,7 +748,7 @@ class Inform6TemplateLexer(Inform7Lexer):
 
 class Tads3Lexer(RegexLexer):
     """
-    For `TADS 3 <http://www.tads.org/>`_ source code.
+    For TADS 3 source code.
     """
 
     name = 'TADS 3'