RubyGems - ultraviolet - Versions diffs - 0.10.0 → 0.10.1 - Mend

ultraviolet 0.10.0 → 0.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (88) hide show

data/History.txt +7 -0
data/Manifest.txt +184 -188
data/Rakefile +2 -2
data/bin/theme2latexrender +9 -30
data/bin/theme2xhtmlrender +17 -23
data/lib/uv.rb +2 -2
data/lib/uv/{html_processor.rb → render_processor.rb} +39 -13
data/lib/uv/utility.rb +67 -0
data/render/latex/active4d.render +7 -7
data/render/latex/all_hallows_eve.render +6 -6
data/render/latex/amy.render +7 -7
data/render/latex/blackboard.render +5 -5
data/render/latex/brilliance_black.render +171 -221
data/render/latex/brilliance_dull.render +105 -105
data/render/latex/cobalt.render +12 -12
data/render/latex/dawn.render +8 -8
data/render/latex/eiffel.render +4 -4
data/render/latex/espresso_libre.render +5 -5
data/render/latex/idle.render +2 -2
data/render/latex/iplastic.render +5 -5
data/render/latex/lazy.render +2 -2
data/render/latex/mac_classic.render +7 -7
data/render/latex/magicwb_amiga.render +8 -8
data/render/latex/pastels_on_dark.render +5 -5
data/render/latex/slush_poppies.render +1 -1
data/render/latex/spacecadet.render +3 -3
data/render/latex/sunburst.render +14 -14
data/render/latex/twilight.render +9 -9
data/render/latex/zenburnesque.render +2 -2
data/render/xhtml/amy.render +1 -1
data/render/xhtml/brilliance_black.render +74 -124
data/render/xhtml/brilliance_dull.render +6 -6
data/render/xhtml/files/css/active4d.css +1 -1
data/render/xhtml/files/css/all_hallows_eve.css +1 -1
data/render/xhtml/files/css/amy.css +6 -3
data/render/xhtml/files/css/blackboard.css +3 -3
data/render/xhtml/files/css/brilliance_black.css +193 -220
data/render/xhtml/files/css/brilliance_dull.css +110 -90
data/render/xhtml/files/css/cobalt.css +3 -3
data/render/xhtml/files/css/dawn.css +6 -6
data/render/xhtml/files/css/eiffel.css +1 -1
data/render/xhtml/files/css/espresso_libre.css +2 -2
data/render/xhtml/files/css/iplastic.css +3 -3
data/render/xhtml/files/css/mac_classic.css +3 -3
data/render/xhtml/files/css/magicwb_amiga.css +6 -3
data/render/xhtml/files/css/pastels_on_dark.css +2 -2
data/render/xhtml/files/css/spacecadet.css +1 -1
data/render/xhtml/files/css/sunburst.css +7 -7
data/render/xhtml/files/css/twilight.css +5 -5
data/render/xhtml/files/css/zenburnesque.css +5 -2
data/render/xhtml/mac_classic.render +1 -1
data/render/xhtml/magicwb_amiga.render +1 -1
data/render/xhtml/zenburnesque.render +1 -1
data/syntax/antlr.syntax +49 -26
data/syntax/apache.syntax +17 -2
data/syntax/c.syntax +2 -2
data/syntax/cm.syntax +32 -0
data/syntax/coldfusion.syntax +4 -3
data/syntax/css.syntax +8 -3
data/syntax/d.syntax +4 -0
data/syntax/groovy.syntax +10 -8
data/syntax/gtd.syntax +22 -0
data/syntax/haml.syntax +2 -2
data/syntax/html.syntax +4 -4
data/syntax/ini.syntax +5 -4
data/syntax/javascript.syntax +2 -1
data/syntax/languagedefinition.syntax +50 -39
data/syntax/macports_portfile.syntax +21 -1
data/syntax/makefile.syntax +1 -0
data/syntax/objective-c.syntax +37 -30
data/syntax/pascal.syntax +1 -1
data/syntax/perl.syntax +40 -0
data/syntax/php.syntax +672 -379
data/syntax/pmwiki.syntax +113 -0
data/syntax/property_list.syntax +4 -14
data/syntax/python.syntax +17 -14
data/syntax/release_notes.syntax +12 -3
data/syntax/ruby_experimental.syntax +8 -8
data/syntax/standard_ml.syntax +79 -3
data/syntax/twiki.syntax +2 -2
data/syntax/txt2tags.syntax +18 -18
data/syntax/xml.syntax +1 -0
data/syntax/yaml.syntax +2 -2
metadata +193 -194
data/syntax/buggy/nemerle.yaml +0 -74
data/syntax/gtd2_text.syntax +0 -31
data/syntax/old/YAML.yaml +0 -160
data/syntax/old/txt2tags.yaml +0 -139

data/syntax/macports_portfile.syntax CHANGED

@@ -68,6 +68,26 @@ repository:
 uuid: 33EC56FE-2BD4-4B73-A6CD-73395F4E5E58
 foldingStartMarker: \{\s*$
 patterns:
+- begin: ^\s*(PortGroup)\s+ruby(?!\S)
+  beginCaptures:
+    "1":
+      name: keyword.other.tcl.macports
+  end: $.^
+  patterns:
+  - include: $base
+  - name: keyword.other.tcl.macports
+    match: ^\s*ruby\.setup(?!\S)
+  comment: special case for ruby PortGroup
+- begin: ^\s*(PortGroup)\s+perl5(?!\S)
+  beginCaptures:
+    "1":
+      name: keyword.other.tcl.macports
+  end: $.^
+  patterns:
+  - include: $base
+  - name: keyword.other.tcl.macports
+    match: ^\s*perl5\.setup(?!\S)
+  comment: special case for the perl5 PortGroup
 - captures:
     "1":
       name: keyword.other.tcl.macports
@@ -86,7 +106,7 @@ patterns:
 - captures:
     "1":
       name: keyword.other.tcl.macports
-  match: ^\s*((?:build\.target|categories|checksum\.skip|checksums|cvs\.(?:date|module|password|root|tag)|default_variants|depends_(?:build|lib|run)|destroot\.(?:clean|destdir|keepdirs|target|umask)|dist_subdir|distcheck\.check|distfiles|distname|distpath|epoch|extract\.(?:only|suffix)|fetch\.(?:password|type|use_epsv|user)|filesdir|gnustep\.domain|homepage|install\.(?:group|user)|libpath|livecheck\.(?:check|md5|name|regex|url|version)|maintainers|(?:master|patch)_sites(?:\.mirror_subdir)?|name|os\.(?:arch|endian|platform|version)|patchfiles|platforms|portdbpath|portname|prefix|revision|sources_conf|startupitem\.(?:create|executable|init|logevents|logfile|name|pidfile|requires|restart|start|stop|type)|svn\.(?:tag|url)|test\.(?:run|target)|use_bzip2|use_zip|version|workdir|worksrcdir|xcode\.(?:build\.settings|configuration|destroot\.(?:path|settings|type)|project|target)|zope\.need_subdir)(?:-(?:delete|append))?)(?!\S)
+  match: ^\s*((?:build\.target|categories|checksum\.skip|checksums|cvs\.(?:date|module|password|root|tag)|default_variants|depends_(?:build|lib|run)|destroot\.(?:clean|destdir|keepdirs|target|umask)|dist_subdir|distcheck\.check|distfiles|distname|distpath|epoch|extract\.(?:only|suffix)|fetch\.(?:password|type|use_epsv|user)|filesdir|gnustep\.domain|homepage|install\.(?:group|user)|libpath|livecheck\.(?:check|md5|name|distname|regex|url|version)|maintainers|(?:master|patch)_sites(?:\.mirror_subdir)?|name|os\.(?:arch|endian|platform|version)|patchfiles|platforms|portdbpath|portname|prefix|revision|sources_conf|startupitem\.(?:create|executable|init|logevents|logfile|name|pidfile|requires|restart|start|stop|type)|svn\.(?:tag|url)|test\.(?:run|target)|use_bzip2|use_zip|version|workdir|worksrcdir|xcode\.(?:build\.settings|configuration|destroot\.(?:path|settings|type)|project|target)|zope\.need_subdir)(?:-(?:delete|append))?)(?!\S)
   comment: Procs defined with the `options` keyword
 - begin: ^\s*((?:long_)?description)(?!\S)
   contentName: string.unquoted.tcl.macports

data/syntax/makefile.syntax CHANGED

@@ -4,6 +4,7 @@ fileTypes:
 - GNUmakefile
 - makefile
 - Makefile
+- OCamlMakefile
 scopeName: source.makefile
 uuid: FF1825E8-6B1C-11D9-B883-000D93589AF6
 patterns:

data/syntax/objective-c.syntax CHANGED

@@ -3,6 +3,7 @@ name: Objective-C
 fileTypes:
 - m
 - h
+bundleUUID: 4679484F-6227-11D9-BFB1-000D93589AF6
 scopeName: source.objc
 repository:
   protocol_type_qualifier:
@@ -30,22 +31,23 @@ repository:
           "1":
             name: punctuation.separator.arguments.objc
         match: \b\w+(:)
+      - include: "#special_variables"
       - include: $base
+    - include: "#special_variables"
     - include: $base
   protocol_list:
     name: meta.protocol-list.objc
-    captures:
-      "6":
-        name: punctuation.separator.arguments.objc
-      "7":
-        name: entity.other.inherited-protocol.objc
-      "8":
+    endCaptures:
+      "1":
         name: punctuation.section.scope.end.objc
+    begin: (<)
+    beginCaptures:
       "1":
         name: punctuation.section.scope.begin.objc
-      "4":
-        name: entity.other.inherited-protocol.objc
-    match: (<)((?:\s*)(([A-Za-z][A-Za-z0-9]*)((?:\s*)(,)(?:\s*)([A-Za-z][A-Za-z0-9]*)?)*)?(?:\s*))?(>)?
+    end: (>)
+    patterns:
+    - name: support.other.protocol.objc
+      match: \bNS(GlyphStorage|M(utableCopying|enuItem)|C(hangeSpelling|o(ding|pying|lorPicking(Custom|Default)))|T(oolbarItemValidations|ext(Input|AttachmentCell))|I(nputServ(iceProvider|erMouseTracker)|gnoreMisspelledWords)|Obj(CTypeSerializationCallBack|ect)|D(ecimalNumberBehaviors|raggingInfo)|U(serInterfaceValidations|RL(HandleClient|DownloadDelegate|ProtocolClient|AuthenticationChallengeSender))|Validated(ToobarItem|UserInterfaceItem)|Locking)\b
   method:
     name: meta.function.objc
     begin: ^(-|\+)\s*
@@ -102,6 +104,12 @@ repository:
       patterns:
       - name: punctuation.separator.continuation.c++
         match: (?>\\\s*\n)
+  special_variables:
+    patterns:
+    - name: variable.other.selector.objc
+      match: \b_cmd\b
+    - name: variable.language.objc
+      match: \b(self|super)\b
 uuid: F85CC716-6B1C-11D9-9A20-000D93589AF6
 foldingStartMarker: "(?x)\n\
   \t\t /\\*\\*(?!\\*)\n\
@@ -116,31 +124,20 @@ patterns:
     "7":
       name: entity.other.inherited-class.objc
     "8":
-      name: meta.inherited-class.objc
-    "13":
-      name: entity.other.inherited-protocol.objc
+      name: meta.divider.objc
     "9":
-      name: meta.protocol-list.objc
-    "15":
-      name: punctuation.separator.arguments.objc
-    "16":
-      name: entity.other.inherited-protocol.objc
-    "17":
-      name: punctuation.section.scope.end.objc
+      name: meta.inherited-class.objc
     "1":
       name: storage.type.objc
     "2":
       name: punctuation.definition.storage.type.objc
-    "18":
-      name: meta.inherited-protocol.end.objc
     "4":
       name: entity.name.type.objc
-    "10":
-      name: punctuation.section.scope.begin.objc
-  begin: ((@)(interface|protocol))(?!.+;)\s+([A-Za-z][A-Za-z0-9]*)\s*((:)(?:\s*)([A-Za-z][A-Za-z0-9]*)(\s|\n)?)?((?:\s*)(<)((?:\s*)(([A-Za-z][A-Za-z0-9]*)((?:\s*)(,)(?:\s*)([A-Za-z][A-Za-z0-9]*)?)*)?(?:\s*))?(>)?)?(\s|\n)?
+  begin: ((@)(interface|protocol))(?!.+;)\s+([A-Za-z][A-Za-z0-9]*)\s*((:)(?:\s*)([A-Za-z][A-Za-z0-9]*))?(\s|\n)?
   contentName: meta.scope.interface.objc
   end: ((@)end)\b
   patterns:
+  - include: "#protocol_list"
   - include: "#method"
   - include: $base
 - name: meta.implementation.objc
@@ -153,14 +150,11 @@ patterns:
       name: entity.name.type.objc
     "5":
       name: entity.other.inherited-class.objc
-  begin: ((@)(implementation))\s+([A-Za-z][A-Za-z0-9]+)\s*(?::\s*([A-Za-z][A-Za-z0-9]+))?
+  begin: ((@)(implementation))\s+([A-Za-z][A-Za-z0-9]*)\s*(?::\s*([A-Za-z][A-Za-z0-9]*))?
   contentName: meta.scope.implementation.objc
   end: ((@)end)\b
   patterns:
-  - name: variable.other.selector.objc
-    match: \b_cmd\b
-  - name: variable.language.objc
-    match: \b(self|super)\b
+  - include: "#special_variables"
   - include: "#method"
   - include: $base
 - name: string.quoted.double.objc
@@ -177,6 +171,14 @@ patterns:
     match: \\(\\|[abefnrtv'"?]|[0-3]\d{,2}|[4-7]\d?|x[a-zA-Z0-9]+)
   - name: invalid.illegal.unknown-escape.objc
     match: \\.
+- name: meta.id-with-protocol.objc
+  begin: (id)\s?(?=<)
+  beginCaptures:
+    "1":
+      name: storage.type.objc
+  end: (?<=>)
+  patterns:
+  - include: "#protocol_list"
 - name: keyword.control.macro.objc
   match: \b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\b
 - name: keyword.control.exception.objc
@@ -195,7 +197,10 @@ patterns:
       name: punctuation.definition.keyword.objc
   match: (@)(defs|encode)\b
 - name: storage.type.objc
-  match: \b(IBOutlet|IBAction|BOOL|SEL|id|unichar|IMP|Class)\b
+  captures:
+    "2":
+      name: meta.id-type.objc
+  match: \b(IBOutlet|IBAction|BOOL|SEL|id(?!\s?<)|unichar|IMP|Class)\b
 - name: storage.type.objc
   captures:
     "1":
@@ -219,6 +224,8 @@ patterns:
   match: \bNS(R(ect(Edge)?|ange)|G(lyph(Relation|LayoutMode)?|radientType)|M(odalSession|a(trixMode|p(Table|Enumerator)))|B(itmapImageFileType|orderType|uttonType|ezelStyle|ackingStoreType|rowserColumnResizingType)|S(cr(oll(er(Part|Arrow)|ArrowPosition)|eenAuxiliaryOpaque)|tringEncoding|ize|ocketNativeHandle|election(Granularity|Direction|Affinity)|wapped(Double|Float)|aveOperationType)|Ha(sh(Table|Enumerator)|ndler(2)?)|C(o(ntrol(Size|Tint)|mp(ositingOperation|arisonResult))|ell(State|Type|ImagePosition|Attribute))|T(hreadPrivate|ypesetterGlyphInfo|i(ckMarkPosition|tlePosition|meInterval)|o(ol(TipTag|bar(SizeMode|DisplayMode))|kenStyle)|IFFCompression|ext(TabType|Alignment)|ab(State|leViewDropOperation|ViewType)|rackingRectTag)|ImageInterpolation|Zone|OpenGL(ContextAuxiliary|PixelFormatAuxiliary)|D(ocumentChangeType|atePickerElementFlags|ra(werState|gOperation))|UsableScrollerParts|P(oint|r(intingPageOrder|ogressIndicator(Style|Th(ickness|readInfo))))|EventType|KeyValueObservingOptions|Fo(nt(SymbolicTraits|TraitMask|Action)|cusRingType)|W(indow(OrderingMode|Depth)|orkspace(IconCreationOptions|LaunchOptions)|ritingDirection)|L(ineBreakMode|ayout(Status|Direction))|A(nimation(Progress|Effect)|ppl(ication(TerminateReply|DelegateReply|PrintReply)|eEventManagerSuspensionID)|ffineTransformStruct|lertStyle))\b
 - name: support.constant.cocoa
   match: \bNS(NotFound|Ordered(Ascending|Descending|Same))\b
+- name: support.constant.notification.cocoa
+  match: \bNS(Menu(Did(RemoveItem|SendAction|ChangeItem|EndTracking|AddItem)|WillSendAction)|S(ystemColorsDidChange|plitView(DidResizeSubviews|WillResizeSubviews))|C(o(nt(extHelpModeDid(Deactivate|Activate)|rolT(intDidChange|extDid(BeginEditing|Change|EndEditing)))|lor(PanelColorDidChange|ListDidChange)|mboBox(Selection(IsChanging|DidChange)|Will(Dismiss|PopUp)))|lassDescriptionNeededForClass)|T(oolbar(DidRemoveItem|WillAddItem)|ext(Storage(DidProcessEditing|WillProcessEditing)|Did(BeginEditing|Change|EndEditing)|View(DidChange(Selection|TypingAttributes)|WillChangeNotifyingTextView))|ableView(Selection(IsChanging|DidChange)|ColumnDid(Resize|Move)))|ImageRepRegistryDidChange|OutlineView(Selection(IsChanging|DidChange)|ColumnDid(Resize|Move)|Item(Did(Collapse|Expand)|Will(Collapse|Expand)))|Drawer(Did(Close|Open)|Will(Close|Open))|PopUpButton(CellWillPopUp|WillPopUp)|View(GlobalFrameDidChange|BoundsDidChange|F(ocusDidChange|rameDidChange))|FontSetChanged|W(indow(Did(Resi(ze|gn(Main|Key))|M(iniaturize|ove)|Become(Main|Key)|ChangeScreen(|Profile)|Deminiaturize|Update|E(ndSheet|xpose))|Will(M(iniaturize|ove)|BeginSheet|Close))|orkspace(SessionDid(ResignActive|BecomeActive)|Did(Mount|TerminateApplication|Unmount|PerformFileOperation|Wake|LaunchApplication)|Will(Sleep|Unmount|PowerOff|LaunchApplication)))|A(ntialiasThresholdChanged|ppl(ication(Did(ResignActive|BecomeActive|Hide|ChangeScreenParameters|U(nhide|pdate)|FinishLaunching)|Will(ResignActive|BecomeActive|Hide|Terminate|U(nhide|pdate)|FinishLaunching))|eEventManagerWillProcessFirstEvent)))Notification\b
 - name: support.constant.cocoa
   match: \bNS(R(GB(ModeColorPanel|ColorSpaceModel)|ight(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey)|ound(RectBezelStyle|Bankers|ed(BezelStyle|TokenStyle|DisclosureBezelStyle)|Down|Up|Plain|Line(CapStyle|JoinStyle))|un(StoppedResponse|ContinuesResponse|AbortedResponse)|e(s(izableWindowMask|et(CursorRectsRunLoopOrdering|FunctionKey))|ce(ssedBezelStyle|iver(sCantHandleCommandScriptError|EvaluationScriptError))|turnTextMovement|doFunctionKey|quiredArgumentsMissingScriptError|l(evancyLevelIndicatorStyle|ative(Before|After))|gular(SquareBezelStyle|ControlSize)|moveTraitFontAction)|a(n(domSubelement|geDateMode)|tingLevelIndicatorStyle|dio(ModeMatrix|Button)))|G(IFFileType|lyph(Below|Inscribe(B(elow|ase)|Over(strike|Below)|Above)|Layout(WithPrevious|A(tAPoint|gainstAPoint))|A(ttribute(BidiLevel|Soft|Inscribe|Elastic)|bove))|r(ooveBorder|eaterThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|a(y(ModeColorPanel|ColorSpaceModel)|dient(None|Con(cave(Strong|Weak)|vex(Strong|Weak)))|phiteControlTint)))|XML(N(o(tationDeclarationKind|de(CompactEmptyElement|IsCDATA|OptionsNone|Use(SingleQuotes|DoubleQuotes)|Pre(serve(NamespaceOrder|C(haracterReferences|DATA)|DTD|Prefixes|E(ntities|mptyElements)|Quotes|Whitespace|A(ttributeOrder|ll))|ttyPrint)|ExpandEmptyElement))|amespaceKind)|CommentKind|TextKind|InvalidKind|D(ocument(X(MLKind|HTMLKind|Include)|HTMLKind|T(idy(XML|HTML)|extKind)|IncludeContentTypeDeclaration|Validate|Kind)|TDKind)|P(arser(GTRequiredError|XMLDeclNot(StartedError|FinishedError)|Mi(splaced(XMLDeclarationError|CDATAEndStringError)|xedContentDeclNot(StartedError|FinishedError))|S(t(andaloneValueError|ringNot(StartedError|ClosedError))|paceRequiredError|eparatorRequiredError)|N(MTOKENRequiredError|o(t(ationNot(StartedError|FinishedError)|WellBalancedError)|DTDError)|amespaceDeclarationError|AMERequiredError)|C(haracterRef(In(DTDError|PrologError|EpilogError)|AtEOFError)|o(nditionalSectionNot(StartedError|FinishedError)|mment(NotFinishedError|ContainsDoubleHyphenError))|DATANotFinishedError)|TagNameMismatchError|In(ternalError|valid(HexCharacterRefError|C(haracter(RefError|InEntityError|Error)|onditionalSectionError)|DecimalCharacterRefError|URIError|Encoding(NameError|Error)))|OutOfMemoryError|D(ocumentStartError|elegateAbortedParseError|OCTYPEDeclNotFinishedError)|U(RI(RequiredError|FragmentError)|n(declaredEntityError|parsedEntityError|knownEncodingError|finishedTagError))|P(CDATARequiredError|ublicIdentifierRequiredError|arsedEntityRef(MissingSemiError|NoNameError|In(Internal(SubsetError|Error)|PrologError|EpilogError)|AtEOFError)|r(ocessingInstructionNot(StartedError|FinishedError)|ematureDocumentEndError))|E(n(codingNotSupportedError|tity(Ref(In(DTDError|PrologError|EpilogError)|erence(MissingSemiError|WithoutNameError)|LoopError|AtEOFError)|BoundaryError|Not(StartedError|FinishedError)|Is(ParameterError|ExternalError)|ValueRequiredError))|qualExpectedError|lementContentDeclNot(StartedError|FinishedError)|xt(ernalS(tandaloneEntityError|ubsetNotFinishedError)|raContentError)|mptyDocumentError)|L(iteralNot(StartedError|FinishedError)|T(RequiredError|SlashRequiredError)|essThanSymbolInAttributeError)|Attribute(RedefinedError|HasNoValueError|Not(StartedError|FinishedError)|ListNot(StartedError|FinishedError)))|rocessingInstructionKind)|E(ntity(GeneralKind|DeclarationKind|UnparsedKind|P(ar(sedKind|ameterKind)|redefined))|lement(Declaration(MixedKind|UndefinedKind|E(lementKind|mptyKind)|Kind|AnyKind)|Kind))|Attribute(N(MToken(sKind|Kind)|otationKind)|CDATAKind|ID(Ref(sKind|Kind)|Kind)|DeclarationKind|En(tit(yKind|iesKind)|umerationKind)|Kind))|M(i(n(XEdge|iaturizableWindowMask|YEdge|uteCalendarUnit)|terLineJoinStyle|ddleSubelement|xedState)|o(nthCalendarUnit|deSwitchFunctionKey|use(Moved(Mask)?|E(ntered(Mask)?|ventSubtype|xited(Mask)?))|veToBezierPathElement|mentary(ChangeButton|Push(Button|InButton)|Light(Button)?))|enuFunctionKey|a(c(intoshInterfaceStyle|OSRomanStringEncoding)|tchesPredicateOperatorType|ppedRead|x(XEdge|YEdge))|ACHOperatingSystem)|B(MPFileType|o(ttomTabsBezelBorder|ldFontMask|rderlessWindowMask|x(Se(condary|parator)|OldStyle|Primary))|uttLineCapStyle|e(zelBorder|velLineJoinStyle|low(Bottom|Top)|gin(sWith(Comparison|PredicateOperatorType)|FunctionKey))|lueControlTint|ack(spaceCharacter|tabTextMovement|ingStore(Retained|Buffered|Nonretained)|TabCharacter|wardsSearch|groundTab)|r(owser(NoColumnResizing|UserColumnResizing|AutoColumnResizing)|eakFunctionKey))|S(h(ift(JISStringEncoding|KeyMask)|ow(ControlGlyphs|InvisibleGlyphs)|adowlessSquareBezelStyle)|y(s(ReqFunctionKey|tem(D(omainMask|efined(Mask)?)|FunctionKey))|mbolStringEncoding)|c(a(nnedOption|le(None|ToFit|Proportionally))|r(oll(er(NoPart|Increment(Page|Line|Arrow)|Decrement(Page|Line|Arrow)|Knob(Slot)?|Arrows(M(inEnd|axEnd)|None|DefaultSetting))|Wheel(Mask)?|LockFunctionKey)|eenChangedEventType))|t(opFunctionKey|r(ingDrawing(OneShot|DisableScreenFontSubstitution|Uses(DeviceMetrics|FontLeading|LineFragmentOrigin))|eam(Status(Reading|NotOpen|Closed|Open(ing)?|Error|Writing|AtEnd)|Event(Has(BytesAvailable|SpaceAvailable)|None|OpenCompleted|E(ndEncountered|rrorOccurred)))))|i(ngle(DateMode|UnderlineStyle)|ze(DownFontAction|UpFontAction))|olarisOperatingSystem|unOSOperatingSystem|pecialPageOrder|e(condCalendarUnit|lect(By(Character|Paragraph|Word)|i(ng(Next|Previous)|onAffinity(Downstream|Upstream))|edTab|FunctionKey)|gmentSwitchTracking(Momentary|Select(One|Any)))|quareLineCapStyle|witchButton|ave(ToOperation|Op(tions(Yes|No|Ask)|eration)|AsOperation)|mall(SquareBezelStyle|C(ontrolSize|apsFontMask)|IconButtonBezelStyle))|H(ighlightModeMatrix|SBModeColorPanel|o(ur(Minute(SecondDatePickerElementFlag|DatePickerElementFlag)|CalendarUnit)|rizontalRuler|meFunctionKey)|TTPCookieAcceptPolicy(Never|OnlyFromMainDocumentDomain|Always)|e(lp(ButtonBezelStyle|KeyMask|FunctionKey)|avierFontAction)|PUXOperatingSystem)|Year(MonthDa(yDatePickerElementFlag|tePickerElementFlag)|CalendarUnit)|N(o(n(StandardCharacterSetFontMask|ZeroWindingRule|activatingPanelMask|LossyASCIIStringEncoding)|Border|t(ification(SuspensionBehavior(Hold|Coalesce|D(eliverImmediately|rop))|NoCoalescing|CoalescingOn(Sender|Name)|DeliverImmediately|PostToAllSessions)|PredicateType|EqualToPredicateOperatorType)|S(cr(iptError|ollerParts)|ubelement|pecifierError)|CellMask|T(itle|opLevelContainersSpecifierError|abs(BezelBorder|NoBorder|LineBorder))|I(nterfaceStyle|mage)|UnderlineStyle|FontChangeAction)|u(ll(Glyph|CellType)|m(eric(Search|PadKeyMask)|berFormatter(Round(Half(Down|Up|Even)|Ceiling|Down|Up|Floor)|Behavior(10|Default)|S(cientificStyle|pellOutStyle)|NoStyle|CurrencyStyle|DecimalStyle|P(ercentStyle|ad(Before(Suffix|Prefix)|After(Suffix|Prefix))))))|e(t(Services(BadArgumentError|NotFoundError|C(ollisionError|ancelledError)|TimeoutError|InvalidError|UnknownError|ActivityInProgress)|workDomainMask)|wlineCharacter|xt(StepInterfaceStyle|FunctionKey))|EXTSTEPStringEncoding|a(t(iveShortGlyphPacking|uralTextAlignment)|rrowFontMask))|C(hange(ReadOtherContents|GrayCell(Mask)?|BackgroundCell(Mask)?|Cleared|Done|Undone|Autosaved)|MYK(ModeColorPanel|ColorSpaceModel)|ircular(BezelStyle|Slider)|o(n(stantValueExpressionType|t(inuousCapacityLevelIndicatorStyle|entsCellMask|ain(sComparison|erSpecifierError)|rol(Glyph|KeyMask))|densedFontMask)|lor(Panel(RGBModeMask|GrayModeMask|HSBModeMask|C(MYKModeMask|olorListModeMask|ustomPaletteModeMask|rayonModeMask)|WheelModeMask|AllModesMask)|ListModeColorPanel)|reServiceDirectory|m(p(osite(XOR|Source(In|O(ut|ver)|Atop)|Highlight|C(opy|lear)|Destination(In|O(ut|ver)|Atop)|Plus(Darker|Lighter))|ressedFontMask)|mandKeyMask))|u(stom(SelectorPredicateOperatorType|PaletteModeColorPanel)|r(sor(Update(Mask)?|PointingDevice)|veToBezierPathElement))|e(nterT(extAlignment|abStopType)|ll(State|H(ighlighted|as(Image(Horizontal|OnLeftOrBottom)|OverlappingImage))|ChangesContents|Is(Bordered|InsetButton)|Disabled|Editable|LightsBy(Gray|Background|Contents)|AllowsMixedState))|l(ipPagination|o(s(ePathBezierPathElement|ableWindowMask)|ckAndCalendarDatePickerStyle)|ear(ControlTint|DisplayFunctionKey|LineFunctionKey))|a(seInsensitive(Search|PredicateOption)|n(notCreateScriptCommandError|cel(Button|TextMovement))|chesDirectory|lculation(NoError|Overflow|DivideByZero|Underflow|LossOfPrecision)|rriageReturnCharacter)|r(itical(Request|AlertStyle)|ayonModeColorPanel))|T(hick(SquareBezelStyle|erSquareBezelStyle)|ypesetter(Behavior|HorizontalTabAction|ContainerBreakAction|ZeroAdvancementAction|OriginalBehavior|ParagraphBreakAction|WhitespaceAction|L(ineBreakAction|atestBehavior))|i(ckMark(Right|Below|Left|Above)|tledWindowMask|meZoneDatePickerElementFlag)|o(olbarItemVisibilityPriority(Standard|High|User|Low)|pTabsBezelBorder|ggleButton)|IFF(Compression(N(one|EXT)|CCITTFAX(3|4)|OldJPEG|JPEG|PackBits|LZW)|FileType)|e(rminate(Now|Cancel|Later)|xt(Read(InapplicableDocumentTypeError|WriteErrorM(inimum|aximum))|Block(M(i(nimum(Height|Width)|ddleAlignment)|a(rgin|ximum(Height|Width)))|B(o(ttomAlignment|rder)|aselineAlignment)|Height|TopAlignment|P(ercentageValueType|adding)|Width|AbsoluteValueType)|StorageEdited(Characters|Attributes)|CellType|ured(RoundedBezelStyle|BackgroundWindowMask|SquareBezelStyle)|Table(FixedLayoutAlgorithm|AutomaticLayoutAlgorithm)|Field(RoundedBezel|SquareBezel|AndStepperDatePickerStyle)|WriteInapplicableDocumentTypeError|ListPrependEnclosingMarker))|woByteGlyphPacking|ab(Character|TextMovement|le(tP(oint(Mask|EventSubtype)?|roximity(Mask|EventSubtype)?)|Column(NoResizing|UserResizingMask|AutoresizingMask)|View(ReverseSequentialColumnAutoresizingStyle|GridNone|S(olid(HorizontalGridLineMask|VerticalGridLineMask)|equentialColumnAutoresizingStyle)|NoColumnAutoresizing|UniformColumnAutoresizingStyle|FirstColumnOnlyAutoresizingStyle|LastColumnOnlyAutoresizingStyle)))|rackModeMatrix)|I(n(sert(CharFunctionKey|FunctionKey|LineFunctionKey)|t(Type|ernalS(criptError|pecifierError))|dexSubelement|validIndexSpecifierError|formational(Request|AlertStyle)|PredicateOperatorType)|talicFontMask|SO(2022JPStringEncoding|Latin(1StringEncoding|2StringEncoding))|dentityMappingCharacterCollection|llegalTextMovement|mage(R(ight|ep(MatchesDevice|LoadStatus(ReadingHeader|Completed|InvalidData|Un(expectedEOF|knownType)|WillNeedAllData)))|Below|C(ellType|ache(BySize|Never|Default|Always))|Interpolation(High|None|Default|Low)|O(nly|verlaps)|Frame(Gr(oove|ayBezel)|Button|None|Photo)|L(oadStatus(ReadError|C(ompleted|ancelled)|InvalidData|UnexpectedEOF)|eft)|A(lign(Right|Bottom(Right|Left)?|Center|Top(Right|Left)?|Left)|bove)))|O(n(State|eByteGlyphPacking|OffButton|lyScrollerArrows)|ther(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|TextMovement)|SF1OperatingSystem|pe(n(GL(GO(Re(setLibrary|tainRenderers)|ClearFormatCache|FormatCacheSize)|PFA(R(obust|endererID)|M(inimumPolicy|ulti(sample|Screen)|PSafe|aximumPolicy)|BackingStore|S(creenMask|te(ncilSize|reo)|ingleRenderer|upersample|ample(s|Buffers|Alpha))|NoRecovery|C(o(lor(Size|Float)|mpliant)|losestPolicy)|OffScreen|D(oubleBuffer|epthSize)|PixelBuffer|VirtualScreenCount|FullScreen|Window|A(cc(umSize|elerated)|ux(Buffers|DepthStencil)|l(phaSize|lRenderers))))|StepUnicodeReservedBase)|rationNotSupportedForKeyS(criptError|pecifierError))|ffState|KButton|rPredicateType|bjC(B(itfield|oolType)|S(hortType|tr(ingType|uctType)|electorType)|NoType|CharType|ObjectType|DoubleType|UnionType|PointerType|VoidType|FloatType|Long(Type|longType)|ArrayType))|D(i(s(c(losureBezelStyle|reteCapacityLevelIndicatorStyle)|playWindowRunLoopOrdering)|acriticInsensitivePredicateOption|rect(Selection|PredicateModifier))|o(c(ModalWindowMask|ument(Directory|ationDirectory))|ubleType|wn(TextMovement|ArrowFunctionKey))|e(s(cendingPageOrder|ktopDirectory)|cimalTabStopType|v(ice(NColorSpaceModel|IndependentModifierFlagsMask)|eloper(Directory|ApplicationDirectory))|fault(ControlTint|TokenStyle)|lete(Char(acter|FunctionKey)|FunctionKey|LineFunctionKey)|moApplicationDirectory)|a(yCalendarUnit|teFormatter(MediumStyle|Behavior(10|Default)|ShortStyle|NoStyle|FullStyle|LongStyle))|ra(wer(Clos(ingState|edState)|Open(ingState|State))|gOperation(Generic|Move|None|Copy|Delete|Private|Every|Link|All)))|U(ser(CancelledError|D(irectory|omainMask)|FunctionKey)|RL(Handle(NotLoaded|Load(Succeeded|InProgress|Failed))|CredentialPersistence(None|Permanent|ForSession))|n(scaledWindowMask|cachedRead|i(codeStringEncoding|talicFontMask|fiedTitleAndToolbarWindowMask)|d(o(CloseGroupingRunLoopOrdering|FunctionKey)|e(finedDateComponent|rline(Style(Single|None|Thick|Double)|Pattern(Solid|D(ot|ash(Dot(Dot)?)?)))))|known(ColorSpaceModel|P(ointingDevice|ageOrder)|KeyS(criptError|pecifierError))|boldFontMask)|tilityWindowMask|TF8StringEncoding|p(dateWindowsRunLoopOrdering|TextMovement|ArrowFunctionKey))|J(ustifiedTextAlignment|PEG(2000FileType|FileType)|apaneseEUC(GlyphPacking|StringEncoding))|P(o(s(t(Now|erFontMask|WhenIdle|ASAP)|iti(on(Replace|Be(fore|ginning)|End|After)|ve(IntType|DoubleType|FloatType)))|pUp(NoArrow|ArrowAt(Bottom|Center))|werOffEventType|rtraitOrientation)|NGFileType|ush(InCell(Mask)?|OnPushOffButton)|e(n(TipMask|UpperSideMask|PointingDevice|LowerSideMask)|riodic(Mask)?)|P(S(caleField|tatus(Title|Field)|aveButton)|N(ote(Title|Field)|ame(Title|Field))|CopiesField|TitleField|ImageButton|OptionsButton|P(a(perFeedButton|ge(Range(To|From)|ChoiceMatrix))|reviewButton)|LayoutButton)|lainTextTokenStyle|a(useFunctionKey|ragraphSeparatorCharacter|ge(DownFunctionKey|UpFunctionKey))|r(int(ing(ReplyLater|Success|Cancelled|Failure)|ScreenFunctionKey|erTable(NotFound|OK|Error)|FunctionKey)|o(p(ertyList(XMLFormat|MutableContainers(AndLeaves)?|BinaryFormat|Immutable|OpenStepFormat)|rietaryStringEncoding)|gressIndicator(BarStyle|SpinningStyle|Preferred(SmallThickness|Thickness|LargeThickness|AquaThickness)))|e(ssedTab|vFunctionKey))|L(HeightForm|CancelButton|TitleField|ImageButton|O(KButton|rientationMatrix)|UnitsButton|PaperNameButton|WidthForm))|E(n(terCharacter|d(sWith(Comparison|PredicateOperatorType)|FunctionKey))|v(e(nOddWindingRule|rySubelement)|aluatedObjectExpressionType)|qualTo(Comparison|PredicateOperatorType)|ra(serPointingDevice|CalendarUnit|DatePickerElementFlag)|x(clude(10|QuickDrawElementsIconCreationOption)|pandedFontMask|ecuteFunctionKey))|V(i(ew(M(in(XMargin|YMargin)|ax(XMargin|YMargin))|HeightSizable|NotSizable|WidthSizable)|aPanelFontAction)|erticalRuler|a(lidationErrorM(inimum|aximum)|riableExpressionType))|Key(SpecifierEvaluationScriptError|Down(Mask)?|Up(Mask)?|PathExpressionType|Value(MinusSetMutation|SetSetMutation|Change(Re(placement|moval)|Setting|Insertion)|IntersectSetMutation|ObservingOption(New|Old)|UnionSetMutation|ValidationError))|QTMovie(NormalPlayback|Looping(BackAndForthPlayback|Playback))|F(1(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|7FunctionKey|i(nd(PanelAction(Replace(A(ndFind|ll(InSelection)?))?|S(howFindPanel|e(tFindString|lectAll(InSelection)?))|Next|Previous)|FunctionKey)|tPagination|le(Read(No(SuchFileError|PermissionError)|CorruptFileError|In(validFileNameError|applicableStringEncodingError)|Un(supportedSchemeError|knownError))|HandlingPanel(CancelButton|OKButton)|NoSuchFileError|ErrorM(inimum|aximum)|Write(NoPermissionError|In(validFileNameError|applicableStringEncodingError)|OutOfSpaceError|Un(supportedSchemeError|knownError))|LockingError)|xedPitchFontMask)|2(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|o(nt(Mo(noSpaceTrait|dernSerifsClass)|BoldTrait|S(ymbolicClass|criptsClass|labSerifsClass|ansSerifClass)|C(o(ndensedTrait|llectionApplicationOnlyMask)|larendonSerifsClass)|TransitionalSerifsClass|I(ntegerAdvancementsRenderingMode|talicTrait)|O(ldStyleSerifsClass|rnamentalsClass)|DefaultRenderingMode|U(nknownClass|IOptimizedTrait)|Panel(S(hadowEffectModeMask|t(andardModesMask|rikethroughEffectModeMask)|izeModeMask)|CollectionModeMask|TextColorEffectModeMask|DocumentColorEffectModeMask|UnderlineEffectModeMask|FaceModeMask|All(ModesMask|EffectsModeMask))|ExpandedTrait|VerticalTrait|F(amilyClassMask|reeformSerifsClass)|Antialiased(RenderingMode|IntegerAdvancementsRenderingMode))|cusRing(Below|Type(None|Default|Exterior)|Only|Above)|urByteGlyphPacking|rm(attingError(M(inimum|aximum))?|FeedCharacter))|8FunctionKey|unction(ExpressionType|KeyMask)|3(1FunctionKey|2FunctionKey|3FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey)|9FunctionKey|4FunctionKey|P(RevertButton|S(ize(Title|Field)|etButton)|CurrentField|Preview(Button|Field))|l(oat(ingPointSamplesBitmapFormat|Type)|agsChanged(Mask)?)|axButton|5FunctionKey|6FunctionKey)|W(heelModeColorPanel|indow(s(NTOperatingSystem|CP125(1StringEncoding|2StringEncoding|3StringEncoding|4StringEncoding|0StringEncoding)|95(InterfaceStyle|OperatingSystem))|M(iniaturizeButton|ovedEventType)|Below|CloseButton|ToolbarButton|ZoomButton|Out|DocumentIconButton|ExposedEventType|Above)|orkspaceLaunch(NewInstance|InhibitingBackgroundOnly|Default|PreferringClassic|WithoutA(ctivation|ddingToRecents)|A(sync|nd(Hide(Others)?|Print)|llowingClassicStartup))|eek(day(CalendarUnit|OrdinalCalendarUnit)|CalendarUnit)|a(ntsBidiLevels|rningAlertStyle)|r(itingDirection(RightToLeft|Natural|LeftToRight)|apCalendarComponents))|L(i(stModeMatrix|ne(Moves(Right|Down|Up|Left)|B(order|reakBy(C(harWrapping|lipping)|Truncating(Middle|Head|Tail)|WordWrapping))|S(eparatorCharacter|weep(Right|Down|Up|Left))|ToBezierPathElement|DoesntMove|arSlider)|teralSearch|kePredicateOperatorType|ghterFontAction|braryDirectory)|ocalDomainMask|e(ssThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|ft(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey))|a(yout(RightToLeft|NotDone|CantFit|OutOfGlyphs|Done|LeftToRight)|ndscapeOrientation)|ABColorSpaceModel)|A(sc(iiWithDoubleByteEUCGlyphPacking|endingPageOrder)|n(y(Type|PredicateModifier|EventMask)|choredSearch|imation(Blocking|Nonblocking(Threaded)?|E(ffect(DisappearingItemDefault|Poof)|ase(In(Out)?|Out))|Linear)|dPredicateType)|t(Bottom|tachmentCharacter|omicWrite|Top)|SCIIStringEncoding|d(obe(GB1CharacterCollection|CNS1CharacterCollection|Japan(1CharacterCollection|2CharacterCollection)|Korea1CharacterCollection)|dTraitFontAction|minApplicationDirectory)|uto(saveOperation|Pagination)|pp(lication(SupportDirectory|D(irectory|e(fined(Mask)?|legateReply(Success|Cancel|Failure)|activatedEventType))|ActivatedEventType)|KitDefined(Mask)?)|l(ternateKeyMask|pha(ShiftKeyMask|NonpremultipliedBitmapFormat|FirstBitmapFormat)|ert(SecondButtonReturn|ThirdButtonReturn|OtherReturn|DefaultReturn|ErrorReturn|FirstButtonReturn|AlternateReturn)|l(ScrollerParts|DomainsMask|PredicateModifier|LibrariesDirectory|ApplicationsDirectory))|rgument(sWrongScriptError|EvaluationScriptError)|bove(Bottom|Top)|WTEventType))\b
 - include: "#bracketed_content"

data/syntax/pascal.syntax CHANGED

@@ -14,7 +14,7 @@ patterns:
     "1":
       name: storage.type.prototype.pascal
     "2":
-      name: entity.name.prototype.pascal
+      name: entity.name.function.prototype.pascal
   match: \b(?i:(function|procedure))\b\s+(\w+(\.\w+)?)(\(.*?\))?;\s*(?=(?i:attribute|forward|external))
 - name: meta.function.pascal
   captures:

data/syntax/perl.syntax CHANGED

@@ -660,6 +660,20 @@ patterns:
   - include: "#escaped_char"
   - include: "#variable"
   - include: source.sql
+- captures:
+    "0":
+      name: punctuation.definition.string.perl
+    "1":
+      name: string.unquoted.heredoc.doublequote.perl
+    "2":
+      name: punctuation.definition.heredoc.perl
+  begin: ((<<) *"POSTSCRIPT").*\n?
+  contentName: text.postscript.embedded.perl
+  end: (^POSTSCRIPT$)
+  patterns:
+  - include: "#escaped_char"
+  - include: "#variable"
+  - include: source.postscript
 - captures:
     "0":
       name: punctuation.definition.string.perl
@@ -733,6 +747,18 @@ patterns:
   end: (^SQL$)
   patterns:
   - include: source.sql
+- captures:
+    "0":
+      name: punctuation.definition.string.perl
+    "1":
+      name: string.unquoted.heredoc.quote.perl
+    "2":
+      name: punctuation.definition.heredoc.perl
+  begin: ((<<) *'POSTSCRIPT').*\n?
+  contentName: source.postscript.embedded.perl
+  end: (^POSTSCRIPT)
+  patterns:
+  - include: source.postscript
 - captures:
     "0":
       name: punctuation.definition.string.perl
@@ -798,6 +824,20 @@ patterns:
   - include: "#escaped_char"
   - include: "#variable"
   - include: source.sql
+- captures:
+    "0":
+      name: punctuation.definition.string.perl
+    "1":
+      name: string.unquoted.heredoc.perl
+    "2":
+      name: punctuation.definition.heredoc.perl
+  begin: ((<<) *POSTSCRIPT\b).*\n?
+  contentName: source.postscript.embedded.perl
+  end: (^POSTSCRIPT)
+  patterns:
+  - include: "#escaped_char"
+  - include: "#variable"
+  - include: source.postscript
 - captures:
     "0":
       name: punctuation.definition.string.perl

data/syntax/php.syntax CHANGED

@@ -3,9 +3,42 @@ name: PHP
 firstLineMatch: ^#!.*php[0-9]{0,1}\b
 scopeName: source.php
 repository:
-  language_constant:
-    name: constant.language.php
-    match: (?i)\b(TRUE|FALSE|NULL|__(FILE|FUNCTION|CLASS|METHOD|LINE)__|ON|OFF|YES|NO|NL|BR|TAB)\b
+  regex-single-quoted:
+    name: string.regexp.single-quoted.php
+    endCaptures:
+      "0":
+        name: punctuation.definition.string.end.php
+    begin: (?x)'/ (?= (\\.|[^'/])+/[imsxeADSUXu]*' )
+    beginCaptures:
+      "0":
+        name: punctuation.definition.string.begin.php
+    end: (/)([imsxeADSUXu]*)(')
+    patterns:
+    - name: string.regexp.arbitrary-repitition.php
+      captures:
+        "1":
+          name: punctuation.definition.arbitrary-repitition.php
+        "3":
+          name: punctuation.definition.arbitrary-repitition.php
+      match: (\{)\d+(,\d+)?(\})
+    - name: string.regexp.character-class.php
+      captures:
+        "0":
+          name: punctuation.definition.character-class.php
+      begin: \[(?:\^?\])?
+      end: \]
+      patterns:
+      - name: constant.character.escape.php
+        match: \\[\\']
+    - name: keyword.operator.regexp.php
+      match: "[$^+*]"
+    - name: constant.character.escape.php
+      match: \\[\\']
+  variables:
+    patterns:
+    - include: "#var_global"
+    - include: "#var_global_safer"
+    - include: "#var_basic"
   string-double-quoted:
     name: string.quoted.double.php
     endCaptures:
@@ -19,7 +52,7 @@ repository:
     patterns:
     - name: constant.character.escape.php
       match: \\.
-    - include: "#var_complex_string_heredoc"
+    - include: "#interpolation"
   language:
     patterns:
     - name: meta.scope.heredoc
@@ -28,7 +61,7 @@ repository:
           name: keyword.operator.heredoc.php
         "2":
           name: punctuation.definition.string.php
-      begin: (<<<)(HTML)
+      begin: (<<<)\s*(HTML)
       contentName: text.html.basic.embedded
       beginCaptures:
         "1":
@@ -38,17 +71,14 @@ repository:
       end: ^(HTML)(;?)$
       patterns:
       - include: text.html.basic
-      - include: "#var_global"
-      - include: "#var_global_safer"
-      - include: "#var_basic"
-      - include: "#var_complex_string_heredoc"
+      - include: "#interpolation"
     - name: meta.scope.heredoc
       endCaptures:
         "1":
           name: keyword.operator.heredoc.php
         "2":
           name: punctuation.definition.string.php
-      begin: ((<<<)XML)
+      begin: (<<<)\s*(XML)
       contentName: text.xml.embedded
       beginCaptures:
         "1":
@@ -58,17 +88,14 @@ repository:
       end: ^(XML)(;?)$
       patterns:
       - include: text.xml
-      - include: "#var_global"
-      - include: "#var_global_safer"
-      - include: "#var_basic"
-      - include: "#var_complex_string_heredoc"
+      - include: "#interpolation"
     - name: meta.scope.heredoc
       endCaptures:
         "1":
           name: keyword.operator.heredoc.php
         "2":
           name: punctuation.definition.string.php
-      begin: ((<<<)SQL)
+      begin: (<<<)\s*(SQL)
       contentName: source.sql.embedded
       beginCaptures:
         "1":
@@ -78,10 +105,7 @@ repository:
       end: ^(SQL)(;?)$
       patterns:
       - include: source.sql
-      - include: "#var_global"
-      - include: "#var_global_safer"
-      - include: "#var_basic"
-      - include: "#var_complex_string_heredoc"
+      - include: "#interpolation"
     - name: comment.block.documentation.phpdoc.php
       captures:
         "0":
@@ -101,12 +125,12 @@ repository:
       captures:
         "1":
           name: punctuation.definition.comment.php
-      match: (//).*$\n?
+      match: (//).*?($\n?|(?=\?>))
     - name: comment.line.number-sign.php
       captures:
         "1":
           name: punctuation.definition.comment.php
-      match: (#).*$\n?
+      match: (#).*?($\n?|(?=\?>))
     - name: meta.interface.php
       begin: ^\s*(interface)\s+([a-zA-Z0-9_]+)\s*(extends)?\s*
       beginCaptures:
@@ -152,11 +176,11 @@ repository:
     - name: keyword.control.php
       match: \b(break|c(ase|ontinue)|d(e(clare|fault)|ie|o)|e(lse(if)?|nd(declare|for(each)?|if|switch|while)|xit)|for(each)?|if|return|switch|use|while)\b
     - name: meta.include.php
-      captures:
+      begin: (?i)\b((?:require|include)(?:_once)?)\b\s*
+      beginCaptures:
         "1":
           name: keyword.control.import.include.php
-      begin: \b((require|include)(_once)?)\b
-      end: ;
+      end: (?=\s|;|$)
       patterns:
       - include: "#language"
     - name: keyword.control.exception.php
@@ -165,8 +189,11 @@ repository:
       endCaptures:
         "1":
           name: punctuation.definition.parameters.end.php
-      begin: (?:^\s*)((?:(?:final|abstract|public|private|protected|static)\s+)*)(function)(?:\s+|(\s*&\s*))([a-zA-Z0-9_]+)\s*(\()
+      begin: (?:^\s*)((?:(?:final|abstract|public|private|protected|static)\s+)*)(function)(?:\s+|(\s*&\s*))(?:(__(?:call|(?:con|de)struct|get|(?:is|un)?set|tostring|clone|set_state|sleep|wakeup|autoload))|([a-zA-Z0-9_]+))\s*(\()
+      contentName: meta.function.arguments.php
       beginCaptures:
+        "6":
+          name: punctuation.definition.parameters.begin.php
         "1":
           name: storage.modifier.php
         "2":
@@ -174,459 +201,729 @@ repository:
         "3":
           name: storage.modifier.reference.php
         "4":
-          name: entity.name.function.php
+          name: support.function.magic.php
         "5":
-          name: punctuation.definition.parameters.begin.php
+          name: entity.name.function.php
       end: \)
       patterns:
-      - include: "#string-double-quoted"
-      - include: "#string-single-quoted"
-      - include: "#string-backtick"
-      - include: "#var_global"
-      - include: "#var_global_safer"
-      - include: "#var_basic"
-      - include: "#language_constant"
-    - name: meta.class.php
-      captures:
+      - name: meta.function.argument.typehinted.php
+        captures:
+          "6":
+            name: constant.language.php
+          "7":
+            name: invalid.illegal.non-null-typehinted.php
+          "1":
+            name: storage.type.php
+          "2":
+            name: support.class.php
+          "3":
+            name: variable.other.php
+          "4":
+            name: punctuation.definition.variable.php
+          "5":
+            name: keyword.operator.assignment.php
+        match: \s*(?i:(array)|([A-Za-z_][A-Za-z_0-9]*))\s*((\$+)[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)(?:\s*(=)\s*((?i:NULL)|(.+?)))?\s*(?=,|\))
+      - name: meta.function.argument.no-default.php
+        captures:
+          "1":
+            name: variable.other.php
+          "2":
+            name: punctuation.definition.variable.php
+        match: \s*((\$+)[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)\s*(?=,|\))
+      - name: meta.function.argument.default.php
+        captures:
+          "1":
+            name: variable.other.php
+          "2":
+            name: punctuation.definition.variable.php
+          "3":
+            name: keyword.operator.assignment.php
+        begin: \s*((\$+)[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)(?:\s*(=)\s*)\s*
+        end: (?=,|\))
+        patterns:
+        - include: "#parameter-default-types"
+      - name: comment.block.php
+        captures:
+          "0":
+            name: punctuation.definition.comment.php
+        begin: /\*
+        end: \*/
+    - name: storage.type.php
+      match: (?i)\b(real|double|float|int(eger)?|bool(ean)?|string|class|clone|var|function|interface|parent|self|__(autoload|c(all|lone|onstruct)|destruct|get|set|sleep|toString|wakeup))\b
+    - name: storage.modifier.php
+      match: \b(global|abstract|const|extends|implements|final|p(r(ivate|otected)|ublic)|static)\b
+    - include: "#object"
+    - captures:
         "1":
-          name: storage.modifier.abstract.php
+          name: keyword.operator.class.php
         "2":
-          name: storage.modifier.class-or-interface.php
+          name: meta.function-call.static.php
         "3":
-          name: entity.name.type.class.php
+          name: variable.other.class.php
         "4":
-          name: entity.other.inherited-class.php
-      match: (?:^\s*)(abstract)?\s*(class|interface)\s+([a-zA-Z0-9_]+)\s*(extends\s+([a-zA-Z0-9_]+))?
-    - name: storage.type.php
-      match: \b(real|double|float|int(eger)?|bool(ean)?|string|class|clone|var|function|interface|new|parent|self|__(autoload|c(all|lone|onstruct)|destruct|get|set|sleep|toString|wakeup))\b
-    - name: storage.modifier.php
-      match: \b(global|abstract|const|extends|implements|final|p(r(ivate|otected)|ublic)|static)\b
-    - name: keyword.operator.php
-      match: "::|->"
-    - name: support.function.builtin_functions.php
-      match: (?i)\b(eval|s(tr(nc(asecmp|mp)|c(asecmp|mp)|len)|et_e(rror_handler|xception_handler))|c(lass_exists|reate_function)|trigger_error|i(s_(subclass_of|a)|nterface_exists)|zend_version|de(fine(d)?|bug_(print_backtrace|backtrace))|property_exists|e(ach|rror_reporting|xtension_loaded)|func(tion_exists|_(num_args|get_arg(s)?))|leak|restore_e(rror_handler|xception_handler)|get_(class(_(vars|methods))?|included_files|object_vars|de(clared_(classes|interfaces)|fined_(constants|vars|functions))|parent_class|extension_funcs|loaded_extensions|resource_type)|method_exists)\b
+          name: punctuation.definition.variable.php
+        "5":
+          name: constant.other.class.php
+      match: |-
+        (?x)(::)
+                                (?:
+                				    ([A-Za-z_][A-Za-z_0-9]*)\s*\(
+                				    |
+                				    ((\$+)[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)
+                				    |
+                				    ([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)
+                				)?
+    - include: "#support"
+    - name: string.unquoted.heredoc.php
+      endCaptures:
+        "1":
+          name: keyword.operator.heredoc.php
+        "2":
+          name: punctuation.definition.string.php
+      begin: (<<<)\s*([a-zA-Z_]+[a-zA-Z0-9_]*)
+      beginCaptures:
+        "1":
+          name: punctuation.definition.string.php
+        "2":
+          name: keyword.operator.heredoc.php
+      end: ^(\2)(;?)$
+      patterns:
+      - include: "#interpolation"
+    - name: keyword.operator.key.php
+      match: =>
+    - name: storage.modifier.reference.php
+      match: "&(?=\\s*(\\$|new|[A-Za-z_][A-Za-z_0-9]+(?=\\s*\\()))"
+    - name: keyword.operator.assignment.php
+      match: "="
+    - name: keyword.operator.terminator.php
+      match: ;
+    - name: keyword.operator.error-control.php
+      match: (@)
+    - name: keyword.operator.increment-decrement.php
+      match: (\-\-|\+\+)
+    - name: keyword.operator.arithmetic.php
+      match: (\-|\+|\*|/|%)
+    - name: keyword.operator.logical.php
+      match: (?i)(!|&&|\|\|)|\b(and|or|xor|as)\b
+    - name: keyword.operator.bitwise.php
+      match: <<|>>|~|\^|&|\|
+    - name: keyword.operator.comparison.php
+      match: (===|==|!==|!=|<=|>=|<>|<|>)
+    - name: keyword.operator.string.php
+      match: (\.=|\.)
+    - captures:
+        "1":
+          name: keyword.operator.type.php
+        "2":
+          name: support.class.php
+      match: (?i)\b(instanceof)\b(?:\s+(\w+))?
+    - include: "#numbers"
+    - include: "#strings"
+    - include: "#string-backtick"
+    - include: "#function-call"
+    - include: "#variables"
+    - captures:
+        "1":
+          name: keyword.operator.php
+        "2":
+          name: variable.other.property.php
+      match: (?<=[a-zA-Z0-9_\x{7f}-\x{ff}])(->)([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?)\b
+    - include: "#instantiation"
+    - include: "#constants"
+  instantiation:
+    captures:
+      "1":
+        name: keyword.other.new.php
+      "2":
+        name: support.class.php
+      "3":
+        name: support.class.php
+    match: (?i)\b(new)\s+(\w+)|(\w+)(?=::)
+  var_basic:
+    name: variable.other.php
+    captures:
+      "1":
+        name: punctuation.definition.variable.php
+    match: |-
+      (?x)
+      			            (\$+)[a-zA-Z_\x{7f}-\x{ff}]
+      			            [a-zA-Z0-9_\x{7f}-\x{ff}]*?\b
+  string-backtick:
+    name: string.interpolated.php
+    endCaptures:
+      "0":
+        name: punctuation.definition.string.end.php
+    begin: `
+    beginCaptures:
+      "0":
+        name: punctuation.definition.string.begin.php
+    end: `
+    patterns:
+    - name: constant.character.escape.php
+      match: \\.
+    - include: "#interpolation"
+  var_global_safer:
+    name: variable.other.global.safer.php
+    captures:
+      "2":
+        name: punctuation.definition.variable.php
+    match: ((\$)(GLOBALS|_(ENV|SERVER|SESSION)))|\b(global)\b
+  strings:
+    patterns:
+    - include: "#regex-double-quoted"
+    - include: "#sql-string-double-quoted"
+    - include: "#string-double-quoted"
+    - include: "#regex-single-quoted"
+    - include: "#sql-string-single-quoted"
+    - include: "#string-single-quoted"
+  string-single-quoted:
+    name: string.quoted.single.php
+    endCaptures:
+      "0":
+        name: punctuation.definition.string.end.php
+    begin: "'"
+    beginCaptures:
+      "0":
+        name: punctuation.definition.string.begin.php
+    end: "'"
+    patterns:
+    - name: constant.character.escape.php
+      match: \\[\\']
+  sql-string-double-quoted:
+    name: string.quoted.double.sql.php
+    endCaptures:
+      "0":
+        name: punctuation.definition.string.end.php
+    begin: "\"\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER)\\b)"
+    beginCaptures:
+      "0":
+        name: punctuation.definition.string.begin.php
+    end: "\""
+    patterns:
+    - name: constant.character.escape.php
+      match: \\.
+    - include: "#interpolation"
+    - include: source.sql
+  support:
+    patterns:
+    - name: meta.array.php
+      endCaptures:
+        "0":
+          name: punctuation.definition.array.end.php
+      begin: (array)(\()
+      beginCaptures:
+        "1":
+          name: support.function.construct.php
+        "2":
+          name: punctuation.definition.array.begin.php
+      end: \)
+      patterns:
+      - include: "#language"
+    - name: support.function.construct.php
+      match: (?i)\b(isset|unset|print|e(cho|val|mpty)|list)\b
+    - name: support.function.array.php
+      match: (?i)\b(s(huffle|izeof|ort)|n(ext|at(sort|casesort))|c(o(unt|mpact)|urrent)|in_array|u(sort|ksort|asort)|p(os|rev)|e(nd|xtract)|k(sort|ey(_exists)?|rsort)|a(sort|r(sort|ray_(s(hift|um|plice|earch|lice)|c(h(unk|ange_key_case)|o(unt_values|mbine))|intersect(_(u(key|assoc)|key|assoc))?|diff(_(u(key|assoc)|key|assoc))?|u(n(shift|ique)|intersect(_(uassoc|assoc))?|diff(_(uassoc|assoc))?)|p(op|ush|ad|roduct)|values|key(s|_exists)|f(il(ter|l(_keys)?)|lip)|walk(_recursive)?|r(e(duce|verse)|and)|m(ultisort|erge(_recursive)?|ap))))|r(sort|eset|ange)|m(in|ax))\b(?=\s*\()
+    - name: support.function.assert.php
+      match: (?i)\bassert(_options)?\b(?=\s*\()
+    - name: support.function.attr.php
+      match: (?i)\b(isId|dom_attr_is_id)\b(?=\s*\()
+    - name: support.function.base64.php
+      match: (?i)\bbase64_(decode|encode)\b(?=\s*\()
+    - name: support.function.basic_functions.php
+      match: (?i)\b(highlight_(string|file)|s(how_source|ys_getloadavg|et_(include_path|magic_quotes_runtime)|leep)|c(on(stant|nection_(status|aborted))|all_user_(func(_array)?|method(_array)?))|time_(sleep_until|nanosleep)|i(s_uploaded_file|n(i_(set|alter|restore|get(_all)?)|et_(ntop|pton))|p2long|gnore_user_abort|mport_request_variables)|u(sleep|nregister_tick_function)|error_(log|get_last)|p(hp_strip_whitespace|utenv|arse_ini_file|rint_r)|flush|long2ip|re(store_include_path|gister_(shutdown_function|tick_function))|get(servby(name|port)|opt|_(c(urrent_user|fg_var)|include_path|magic_quotes_(gpc|runtime))|protobyn(umber|ame)|env)|m(ove_uploaded_file|agic_quotes_runtime))\b(?=\s*\()
     - name: support.function.bcmath.php
-      match: (?i)\bbc(s(cale|ub|qrt)|comp|div|pow(mod)?|add|m(od|ul))\b
+      match: (?i)\bbc(s(cale|ub|qrt)|comp|div|pow(mod)?|add|m(od|ul))\b(?=\s*\()
+    - name: support.function.birdstep.php
+      match: (?i)\b(velocis_(c(o(nnect|mmit)|lose)|off_autocommit|exec|f(ieldn(um|ame)|etch|reeresult)|autocommit|r(ollback|esult))|birdstep_(c(o(nnect|mmit)|lose)|off_autocommit|exec|f(ieldn(um|ame)|etch|reeresult)|autocommit|r(ollback|esult)))\b(?=\s*\()
+    - name: support.function.browscap.php
+      match: (?i)\bget_browser\b(?=\s*\()
+    - name: support.function.builtin_functions.php
+      match: (?i)\b(s(tr(nc(asecmp|mp)|c(asecmp|mp)|len)|et_e(rror_handler|xception_handler))|c(lass_exists|reate_function)|trigger_error|i(s_(subclass_of|a)|nterface_exists)|de(fine(d)?|bug_(print_backtrace|backtrace))|zend_version|property_exists|e(ach|rror_reporting|xtension_loaded)|func(tion_exists|_(num_args|get_arg(s)?))|leak|restore_e(rror_handler|xception_handler)|get_(class(_(vars|methods))?|included_files|de(clared_(classes|interfaces)|fined_(constants|vars|functions))|object_vars|extension_funcs|parent_class|loaded_extensions|resource_type)|method_exists)\b(?=\s*\()
     - name: support.function.bz2.php
-      match: (?i)\bbz(compress|open|decompress|err(str|no|or)|read)\b
+      match: (?i)\bbz(compress|decompress|open|err(str|no|or)|read)\b(?=\s*\()
     - name: support.function.cal_unix.php
-      match: (?i)\b(unixtojd|jdtounix)\b
+      match: (?i)\b(jdtounix|unixtojd)\b(?=\s*\()
     - name: support.function.calendar.php
-      match: (?i)\b(cal_(to_jd|info|days_in_month|from_jd)|j(d(to(j(ulian|ewish)|french|gregorian)|dayofweek|monthname)|uliantojd|ewishtojd)|frenchtojd|gregoriantojd)\b
-    - name: support.function.easter.php
-      match: (?i)\beaster_da(ys|te)\b
+      match: (?i)\b(cal_(to_jd|info|days_in_month|from_jd)|j(d(to(j(ulian|ewish)|french|gregorian)|dayofweek|monthname)|uliantojd|ewishtojd)|frenchtojd|gregoriantojd)\b(?=\s*\()
+    - name: support.function.characterdata.php
+      match: (?i)\b(substringData|insertData|d(om_characterdata_(substring_data|insert_data|delete_data|append_data|replace_data)|eleteData)|appendData|replaceData)\b(?=\s*\()
     - name: support.function.com_com.php
-      match: (?i)\bcom_(create_guid|print_typeinfo|event_sink|load_typelib|get_active_object|message_pump)\b
+      match: (?i)\bcom_(create_guid|print_typeinfo|event_sink|load_typelib|get_active_object|message_pump)\b(?=\s*\()
     - name: support.function.com_variant.php
-      match: (?i)\bvariant_(s(ub|et(_type)?)|n(ot|eg)|c(a(st|t)|mp)|i(nt|div|mp)|or|d(iv|ate_(to_timestamp|from_timestamp))|pow|eqv|fix|a(nd|dd|bs)|round|get_type|xor|m(od|ul))\b
+      match: (?i)\bvariant_(s(ub|et(_type)?)|n(ot|eg)|c(a(st|t)|mp)|i(nt|div|mp)|or|d(iv|ate_(to_timestamp|from_timestamp))|pow|eqv|fix|a(nd|dd|bs)|get_type|round|xor|m(od|ul))\b(?=\s*\()
+    - name: support.function.crc32.php
+      match: (?i)\bcrc32\b(?=\s*\()
+    - name: support.function.crypt.php
+      match: (?i)\bcrypt\b(?=\s*\()
     - name: support.function.ctype.php
-      match: (?i)\bctype_(space|cntrl|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit)\b
-    - name: support.function.interface.php
-      match: (?i)\bcurl_(setopt(_array)?|c(opy_handle|lose)|init|e(rr(no|or)|xec)|version|getinfo)\b
-    - name: support.function.multi.php
-      match: (?i)\bcurl_multi_(select|close|in(it|fo_read)|exec|add_handle|remove_handle|getcontent)\b
-    - name: support.function.php_date.php
-      match: (?i)\b(str(totime|ftime)|checkdate|time(zone_(name_(from_abbr|get)|transitions_get|identifiers_list|o(pen|ffset_get)|abbreviations_list))?|idate|date(_(sun(set|_info|rise)|create|time(zone_(set|get)|_set)|isodate_set|offset_get|d(efault_timezone_(set|get)|ate_set)|parse|format|modify))?|localtime|g(etdate|m(strftime|date|mktime))|mktime)\b
+      match: (?i)\bctype_(space|cntrl|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit)\b(?=\s*\()
+    - name: support.function.cyr_convert.php
+      match: (?i)\bconvert_cyr_string\b(?=\s*\()
+    - name: support.function.datetime.php
+      match: (?i)\bstrptime\b(?=\s*\()
     - name: support.function.dba.php
-      match: (?i)\bdba_(sync|handlers|nextkey|close|insert|op(timize|en)|delete|popen|exists|key_split|f(irstkey|etch)|list|replace)\b
+      match: (?i)\bdba_(handlers|sync|nextkey|close|insert|delete|op(timize|en)|exists|popen|key_split|f(irstkey|etch)|list|replace)\b(?=\s*\()
     - name: support.function.dbase.php
-      match: (?i)\bdbase_(num(fields|records)|c(lose|reate)|open|delete_record|pack|add_record|replace_record|get_(header_info|record(_with_names)?))\b
-    - name: support.function.attr.php
-      match: (?i)\bdom_attr_is_id\b
-    - name: support.function.characterdata.php
-      match: (?i)\bdom_characterdata_(substring_data|insert_data|delete_data|append_data|replace_data)\b
+      match: (?i)\bdbase_(num(fields|records)|c(lose|reate)|delete_record|open|pack|add_record|get_(header_info|record(_with_names)?)|replace_record)\b(?=\s*\()
+    - name: support.function.dir.php
+      match: (?i)\b(scandir|c(h(dir|root)|lose(dir)?)|dir|opendir|re(addir|wind(dir)?)|g(etcwd|lob))\b(?=\s*\()
+    - name: support.function.dl.php
+      match: (?i)\bdl\b(?=\s*\()
+    - name: support.function.dns.php
+      match: (?i)\b(checkdnsrr|dns_(check_record|get_(record|mx))|get(hostby(name(l)?|addr)|mxrr))\b(?=\s*\()
     - name: support.function.document.php
-      match: (?i)\bdom_document_(s(chema_validate(_file)?|ave(_html(_file)?|xml)?)|normalize_document|create_(c(omment|datasection)|text_node|document_fragment|processing_instruction|e(ntity_reference|lement(_ns)?)|attribute(_ns)?)|import_node|validate|load(_html(_file)?|xml)?|adopt_node|re(name_node|laxNG_validate_(file|xml))|get_element(s_by_tag_name(_ns)?|_by_id)|xinclude)\b
+      match: (?i)\b(s(chemaValidate|ave(XML|HTML(File)?))|normalizeDocument|create(C(omment|DATASection)|TextNode|DocumentFragment|ProcessingInstruction|E(ntityReference|lement(NS)?)|Attribute(NS)?)|importNode|dom_document_(s(chema_validate(_file)?|ave(_html(_file)?|xml)?)|normalize_document|create_(c(datasection|omment)|text_node|document_fragment|processing_instruction|e(ntity_reference|lement(_ns)?)|attribute(_ns)?)|import_node|validate|load(_html(_file)?|xml)?|adopt_node|re(name_node|laxNG_validate_(file|xml))|get_element(s_by_tag_name(_ns)?|_by_id)|xinclude)|validate|adoptNode|re(nameNode|laxNGValidate(Source)?)|getElementById|xinclude)\b(?=\s*\()
     - name: support.function.domconfiguration.php
-      match: (?i)\bdom_domconfiguration_(set_parameter|can_set_parameter|get_parameter)\b
+      match: (?i)\b(canSetParameter|dom_domconfiguration_(set_parameter|can_set_parameter|get_parameter))\b(?=\s*\()
     - name: support.function.domerrorhandler.php
-      match: (?i)\bdom_domerrorhandler_handle_error\b
+      match: (?i)\b(handleError|dom_domerrorhandler_handle_error)\b(?=\s*\()
     - name: support.function.domimplementation.php
-      match: (?i)\bdom_domimplementation_(has_feature|create_document(_type)?|get_feature)\b
+      match: (?i)\bdom_domimplementation_(has_feature|create_document(_type)?|get_feature)\b(?=\s*\()
     - name: support.function.domimplementationlist.php
-      match: (?i)\bdom_domimplementationlist_item\b
+      match: (?i)\bdom_domimplementationlist_item\b(?=\s*\()
     - name: support.function.domimplementationsource.php
-      match: (?i)\bdom_domimplementationsource_get_domimplementation(s)?\b
+      match: (?i)\b(dom_domimplementationsource_get_domimplementation(s)?|getDomimplementation(s)?)\b(?=\s*\()
     - name: support.function.domstringlist.php
-      match: (?i)\bdom_domstringlist_item\b
+      match: (?i)\bdom_domstringlist_item\b(?=\s*\()
+    - name: support.function.easter.php
+      match: (?i)\beaster_da(ys|te)\b(?=\s*\()
     - name: support.function.element.php
-      match: (?i)\bdom_element_(set_(id_attribute(_n(s|ode))?|attribute(_n(s|ode(_ns)?))?)|has_attribute(_ns)?|remove_attribute(_n(s|ode))?|get_(elements_by_tag_name(_ns)?|attribute(_n(s|ode(_ns)?))?))\b
-    - name: support.function.namednodemap.php
-      match: (?i)\bdom_namednodemap_(set_named_item(_ns)?|item|remove_named_item(_ns)?|get_named_item(_ns)?)\b
-    - name: support.function.namelist.php
-      match: (?i)\bdom_namelist_get_name(space_uri)?\b
-    - name: support.function.node.php
-      match: (?i)\bdom_node_(set_user_data|has_(child_nodes|attributes)|normalize|c(ompare_document_position|lone_node)|i(s_(s(upported|ame_node)|default_namespace|equal_node)|nsert_before)|lookup_(namespace_uri|prefix)|append_child|re(place_child|move_child)|get_(user_data|feature))\b
-    - name: support.function.nodelist.php
-      match: (?i)\bdom_nodelist_item\b
-    - name: support.function.php_dom.php
-      match: (?i)\bdom_import_simplexml\b
-    - name: support.function.string_extend.php
-      match: (?i)\bdom_string_extend_find_offset(16|32)\b
-    - name: support.function.text.php
-      match: (?i)\bdom_text_(split_text|is_whitespace_in_element_content|replace_whole_text)\b
-    - name: support.function.userdatahandler.php
-      match: (?i)\bdom_userdatahandler_handle\b
-    - name: support.function.xpath.php
-      match: (?i)\bdom_xpath_(evaluate|query|register_ns)\b
+      match: (?i)\b(hasAttribute(NS)?|set(IdAttribute(N(S|ode))?|Attribute(N(S|ode(NS)?))?)|dom_element_(has_attribute(_ns)?|set_(id_attribute(_n(s|ode))?|attribute(_n(s|ode(_ns)?))?)|remove_attribute(_n(s|ode))?|get_(elements_by_tag_name(_ns)?|attribute(_n(s|ode(_ns)?))?))|removeAttribute(N(S|ode))?|get(ElementsByTagName(NS)?|Attribute(N(S|ode(NS)?))?))\b(?=\s*\()
+    - name: support.function.exec.php
+      match: (?i)\b(s(hell_exec|ystem)|p(assthru|roc_nice)|e(scapeshell(cmd|arg)|xec))\b(?=\s*\()
     - name: support.function.exif.php
-      match: (?i)\bexif_(t(humbnail|agname)|imagetype|read_data)\b
-    - name: support.function.php_fbsql.php
-      match: (?i)\bfbsql_(s(t(op_db|art_db)|e(t_(characterset|transaction|password|lob_mode)|lect_db))|hostname|n(um_(fields|rows)|ext_result)|c(hange_user|o(nnect|mmit)|lo(se|b_size)|reate_(clob|db|blob))|table_name|insert_id|d(ata(_seek|base(_password)?)|rop_db|b_(status|query))|username|p(connect|assword)|err(no|or)|query|f(ield_(seek|name|t(ype|able)|flags|len)|etch_(object|field|lengths|a(ssoc|rray)|row)|ree_result)|warnings|list_(tables|dbs|fields)|a(utocommit|ffected_rows)|r(o(ws_fetched|llback)|e(sult|ad_(clob|blob)))|get_autostart_info|blob_size)\b
+      match: (?i)\b(exif_(imagetype|t(humbnail|agname)|read_data)|read_exif_data)\b(?=\s*\()
     - name: support.function.fdf.php
-      match: (?i)\bfdf_(s(et_(s(tatus|ubmit_form_action)|target_frame|o(n_import_javascript|pt)|javascript_action|encoding|v(ersion|alue)|f(ile|lags)|ap)|ave(_string)?)|header|next_field_name|c(lose|reate)|open(_string)?|e(num_values|rr(no|or))|add_(template|doc_javascript)|remove_item|get_(status|opt|encoding|v(ersion|alue)|f(ile|lags)|a(ttachment|p)))\b
+      match: (?i)\bfdf_(header|s(et_(s(tatus|ubmit_form_action)|target_frame|o(n_import_javascript|pt)|javascript_action|encoding|v(ersion|alue)|f(ile|lags)|ap)|ave(_string)?)|next_field_name|c(lose|reate)|open(_string)?|e(num_values|rr(no|or))|add_(template|doc_javascript)|remove_item|get_(status|opt|encoding|v(ersion|alue)|f(ile|lags)|a(ttachment|p)))\b(?=\s*\()
+    - name: support.function.file.php
+      match: (?i)\b(sys_get_temp_dir|copy|t(empnam|mpfile)|u(nlink|mask)|p(close|open)|f(s(canf|tat|eek)|nmatch|close|t(ell|runcate)|ile(_(put_contents|get_contents))?|open|p(ut(s|csv)|assthru)|eof|flush|write|lock|read|get(s(s)?|c(sv)?))|r(e(name|a(dfile|lpath)|wind)|mdir)|g(z(seek|close|tell|eof|p(uts|assthru)|write|re(ad|wind)|get(s(s)?|c))|et_meta_tags)|bz(close|flush|write)|mkdir)\b(?=\s*\()
+    - name: support.function.filestat.php
+      match: (?i)\b(stat|c(h(own|grp|mod)|learstatcache)|is_(dir|executable|file|link|writ(eable|able)|readable)|touch|disk(_(total_space|free_space)|freespace)|file(size|ctime|type|inode|owner|_exists|perms|atime|group|mtime)|l(stat|chgrp))\b(?=\s*\()
     - name: support.function.filter.php
-      match: (?i)\bfilter_(has_var|i(nput(_array)?|d)|var(_array)?|list)\b
-    - name: support.function.php_ftp.php
-      match: (?i)\bftp_(s(sl_connect|ystype|i(te|ze)|et_option)|n(list|b_(continue|put|f(put|get)|get))|c(h(dir|mod)|onnect|dup|lose)|delete|p(ut|wd|asv)|exec|f(put|get)|login|alloc|r(ename|aw(list)?|mdir)|get(_option)?|m(dtm|kdir))\b
+      match: (?i)\bfilter_(has_var|input(_array)?|var(_array)?)\b(?=\s*\()
+    - name: support.function.formatted_print.php
+      match: (?i)\b(sprintf|printf|v(sprintf|printf|fprintf)|fprintf)\b(?=\s*\()
+    - name: support.function.fsock.php
+      match: (?i)\b(pfsockopen|fsockopen)\b(?=\s*\()
+    - name: support.function.ftok.php
+      match: (?i)\bftok\b(?=\s*\()
     - name: support.function.gd.php
-      match: (?i)\b(image(s(y|tring(up)?|et(style|t(hickness|ile)|pixel|brush)|avealpha|x)|c(har(up)?|o(nvolution|py(res(ized|ampled)|merge(gray)?)?|lor(s(total|et|forindex)|closest(hwb|alpha)?|transparent|deallocate|exact(alpha)?|a(t|llocate(alpha)?)|resolve(alpha)?|match))|reate(truecolor|from(string|jpeg|png|wbmp|g(if|d(2(part)?)?)|x(pm|bm)))?)|t(ypes|tf(text|bbox)|ruecolortopalette)|i(struecolor|nterlace)|2wbmp|d(estroy|ashedline)|jpeg|p(s(slantfont|copyfont|text|e(ncodefont|xtendfont)|freefont|loadfont|bbox)|ng|olygon|alettecopy)|ellipse|f(t(text|bbox)|il(ter|l(toborder|ed(polygon|ellipse|arc|rectangle))?)|ont(height|width))|wbmp|l(ine|oadfont|ayereffect)|a(ntialias|lphablending|rc)|r(otate|ectangle)|g(if|d(2)?|ammacorrect)|xbm)|jpeg2wbmp|png2wbmp|gd_info)\b
+      match: (?i)\b(image(s(y|tring(up)?|et(style|t(hickness|ile)|pixel|brush)|avealpha|x)|c(har(up)?|o(nvolution|py(res(ized|ampled)|merge(gray)?)?|lor(s(total|et|forindex)|closest(hwb|alpha)?|transparent|deallocate|exact(alpha)?|a(t|llocate(alpha)?)|resolve(alpha)?|match))|reate(truecolor|from(string|jpeg|png|wbmp|g(if|d(2(part)?)?)|x(pm|bm)))?)|2wbmp|t(ypes|tf(text|bbox)|ruecolortopalette)|i(struecolor|nterlace)|d(estroy|ashedline)|jpeg|ellipse|p(s(slantfont|copyfont|text|e(ncodefont|xtendfont)|freefont|loadfont|bbox)|ng|olygon|alettecopy)|f(t(text|bbox)|il(ter|l(toborder|ed(polygon|ellipse|arc|rectangle))?)|ont(height|width))|wbmp|a(ntialias|lphablending|rc)|l(ine|oadfont|ayereffect)|g(if|d(2)?|ammacorrect)|r(otate|ectangle)|xbm)|jpeg2wbmp|png2wbmp|gd_info)\b(?=\s*\()
     - name: support.function.gettext.php
-      match: (?i)\b(ngettext|textdomain|d(ngettext|c(ngettext|gettext)|gettext)|gettext|bind(textdomain|_textdomain_codeset))\b
+      match: (?i)\b(ngettext|textdomain|d(ngettext|c(ngettext|gettext)|gettext)|gettext|bind(textdomain|_textdomain_codeset))\b(?=\s*\()
     - name: support.function.gmp.php
-      match: (?i)\bgmp_(s(can(1|0)|trval|ign|ub|etbit|qrt(rem)?)|hamdist|ne(g|xtprime)|c(om|lrbit|mp)|in(tval|it|vert)|or|div(_(q(r)?|r)|exact)|jacobi|p(o(pcount|w(m)?)|erfect_square|rob_prime)|fact|legendre|a(nd|dd|bs)|random|gcd(ext)?|xor|m(od|ul))\b
+      match: (?i)\bgmp_(hamdist|s(can(1|0)|ign|trval|ub|etbit|qrt(rem)?)|c(om|lrbit|mp)|ne(g|xtprime)|in(tval|it|vert)|or|div(_(q(r)?|r)|exact)|jacobi|p(o(pcount|w(m)?)|erfect_square|rob_prime)|fact|legendre|a(nd|dd|bs)|random|gcd(ext)?|xor|m(od|ul))\b(?=\s*\()
     - name: support.function.hash.php
-      match: (?i)\bhash(_(hmac(_file)?|init|update(_(stream|file))?|fi(nal|le)|algos))?\b
+      match: (?i)\bhash(_(hmac(_file)?|init|update(_(stream|file))?|fi(nal|le)|algos))?\b(?=\s*\()
     - name: support.function.hash_md.php
-      match: (?i)\bmd5(_file)?\b
+      match: (?i)\bmd5(_file)?\b(?=\s*\()
     - name: support.function.hash_sha.php
-      match: (?i)\bsha1(_file)?\b
-    - name: support.function.iconv.php
-      match: (?i)\b(iconv(_(s(tr(pos|len|rpos)|ubstr|et_encoding)|get_encoding|mime_(decode(_headers)?|encode)))?|ob_iconv_handler)\b
-    - name: support.function.php_imap.php
-      match: (?i)\bimap_(s(can|tatus|ort|ubscribe|e(t(_quota|flag_full|acl)|arch)|avebody)|header(s|info)|num_(recent|msg)|c(heck|l(ose|earflag_full)|reatemailbox)|t(hread|imeout)|open|delete(mailbox)?|8bit|u(n(subscribe|delete)|tf(7_(decode|encode)|8)|id)|ping|e(rrors|xpunge)|qprint|fetch(structure|header|_overview|body)|l(sub|ist|ast_error)|a(ppend|lerts)|r(e(namemailbox|open)|fc822_(parse_(headers|adrlist)|write_address))|get(subscribed|_quota(root)?|acl|mailboxes)|m(sgno|ime_header_decode|ail(_(co(py|mpose)|move)|boxmsginfo)?)|b(inary|ody(struct)?|ase64))\b
+      match: (?i)\bsha1(_file)?\b(?=\s*\()
+    - name: support.function.head.php
+      match: (?i)\b(set(cookie|rawcookie)|header(s_(sent|list))?)\b(?=\s*\()
+    - name: support.function.html.php
+      match: (?i)\b(html(specialchars(_decode)?|_entity_decode|entities)|get_html_translation_table)\b(?=\s*\()
+    - name: support.function.http.php
+      match: (?i)\bhttp_build_query\b(?=\s*\()
     - name: support.function.ibase_blobs.php
-      match: (?i)\bibase_blob_(c(lose|ancel|reate)|i(nfo|mport)|open|echo|add|get)\b
+      match: (?i)\b(ibase_blob_(c(ancel|lose|reate)|i(nfo|mport)|open|echo|add|get)|fbird_blob_(c(ancel|lose|reate)|i(nfo|mport)|open|echo|add|get))\b(?=\s*\()
     - name: support.function.ibase_events.php
-      match: (?i)\bibase_(set_event_handler|free_event_handler|wait_event)\b
+      match: (?i)\b(ibase_(set_event_handler|free_event_handler|wait_event)|fbird_(set_event_handler|free_event_handler|wait_event))\b(?=\s*\()
     - name: support.function.ibase_query.php
-      match: (?i)\bibase_(n(um_(params|fields|rows)|ame_result)|p(aram_info|repare)|execute|query|f(ield_info|etch_(object|assoc|row)|ree_(query|result))|affected_rows)\b
+      match: (?i)\b(ibase_(n(um_(params|fields|rows)|ame_result)|execute|p(aram_info|repare)|f(ield_info|etch_(object|assoc|row)|ree_(query|result))|query|affected_rows)|fbird_(n(um_(params|fields|rows)|ame_result)|execute|p(aram_info|repare)|query|f(ield_info|etch_(object|assoc|row)|ree_(query|result))|affected_rows))\b(?=\s*\()
     - name: support.function.ibase_service.php
-      match: (?i)\bibase_(serv(ice_(detach|attach)|er_info)|d(elete_user|b_info)|add_user|restore|m(odify_user|aintain_db)|backup)\b
+      match: (?i)\b(ibase_(serv(ice_(detach|attach)|er_info)|d(elete_user|b_info)|add_user|restore|backup|m(odify_user|aintain_db))|fbird_(serv(ice_(detach|attach)|er_info)|d(elete_user|b_info)|add_user|restore|backup|m(odify_user|aintain_db)))\b(?=\s*\()
+    - name: support.function.iconv.php
+      match: (?i)\b(iconv(_(s(tr(pos|len|rpos)|ubstr|et_encoding)|get_encoding|mime_(decode(_headers)?|encode)))?|ob_iconv_handler)\b(?=\s*\()
+    - name: support.function.image.php
+      match: (?i)\b(image_type_to_(extension|mime_type)|getimagesize)\b(?=\s*\()
+    - name: support.function.info.php
+      match: (?i)\b(zend_logo_guid|php(credits|info|_(sapi_name|ini_scanned_files|uname|egg_logo_guid|logo_guid|real_logo_guid)|version))\b(?=\s*\()
     - name: support.function.interbase.php
-      match: (?i)\bibase_(c(o(nnect|mmit(_ret)?)|lose)|trans|drop_db|pconnect|err(code|msg)|rollback(_ret)?|gen_id)\b
+      match: (?i)\b(ibase_(c(o(nnect|mmit(_ret)?)|lose)|trans|drop_db|pconnect|err(code|msg)|gen_id|rollback(_ret)?)|fbird_(c(o(nnect|mmit(_ret)?)|lose)|trans|drop_db|pconnect|err(code|msg)|gen_id|rollback(_ret)?))\b(?=\s*\()
+    - name: support.function.interface.php
+      match: (?i)\bcurl_(setopt(_array)?|c(opy_handle|lose)|init|e(rr(no|or)|xec)|version|getinfo)\b(?=\s*\()
+    - name: support.function.iptc.php
+      match: (?i)\biptc(parse|embed)\b(?=\s*\()
+    - name: support.function.lcg.php
+      match: (?i)\blcg_value\b(?=\s*\()
     - name: support.function.ldap.php
-      match: (?i)\bldap_(s(tart_tls|ort|e(t_(option|rebind_proc)|arch)|asl_bind)|next_(entry|attribute|reference)|co(nnect|unt_entries|mpare)|t61_to_8859|d(n2ufn|elete)|8859_to_t61|unbind|parse_re(sult|ference)|e(rr(no|2str|or)|xplode_dn)|f(irst_(entry|attribute|reference)|ree_result)|list|add|re(name|ad)|get_(option|dn|entries|values(_len)?|attributes)|mod_(del|add|replace)|bind)\b
+      match: (?i)\bldap_(s(tart_tls|ort|e(t_(option|rebind_proc)|arch)|asl_bind)|next_(entry|attribute|reference)|c(o(nnect|unt_entries|mpare)|lose)|t61_to_8859|8859_to_t61|d(n2ufn|elete)|unbind|parse_re(sult|ference)|e(rr(no|2str|or)|xplode_dn)|f(irst_(entry|attribute|reference)|ree_result)|add|list|get_(option|dn|entries|values(_len)?|attributes)|re(name|ad)|mod(ify|_(del|add|replace))|bind)\b(?=\s*\()
+    - name: support.function.levenshtein.php
+      match: (?i)\blevenshtein\b(?=\s*\()
     - name: support.function.libxml.php
-      match: (?i)\blibxml_(set_streams_context|clear_errors|use_internal_errors|get_(errors|last_error))\b
+      match: (?i)\blibxml_(set_streams_context|clear_errors|use_internal_errors|get_(errors|last_error))\b(?=\s*\()
+    - name: support.function.link.php
+      match: (?i)\b(symlink|link(info)?|readlink)\b(?=\s*\()
+    - name: support.function.mail.php
+      match: (?i)\b(ezmlm_hash|mail)\b(?=\s*\()
+    - name: support.function.main.php
+      match: (?i)\bset_time_limit\b(?=\s*\()
+    - name: support.function.math.php
+      match: (?i)\b(h(ypot|exdec)|s(in(h)?|qrt)|number_format|c(os(h)?|eil)|is_(nan|infinite|finite)|tan(h)?|octdec|de(c(hex|oct|bin)|g2rad)|exp(m1)?|p(i|ow)|f(loor|mod)|log(1(p|0))?|a(sin(h)?|cos(h)?|tan(h|2)?|bs)|r(ound|ad2deg)|b(indec|ase_convert))\b(?=\s*\()
     - name: support.function.mbstring.php
-      match: (?i)\bmb_(s(tr(str|cut|to(upper|lower)|i(str|pos|mwidth)|pos|width|len|r(chr|i(chr|pos)|pos))|ubst(itute_character|r(_count)?)|end_mail)|http_(input|output)|c(heck_encoding|onvert_(case|encoding|variables|kana))|internal_encoding|output_handler|de(code_(numericentity|mimeheader)|tect_(order|encoding))|p(arse_str|referred_mime_name)|encode_(numericentity|mimeheader)|l(ist_(encodings(_alias_names)?|mime_names)|anguage)|get_info)\b
-    - name: support.function.php_mbregex.php
-      match: (?i)\bmb_(split|ereg(i(_replace)?|_(search(_(setpos|init|pos|regs|get(pos|regs)))?|replace|match))?|regex_(set_options|encoding))\b
+      match: (?i)\bmb_(s(tr(str|cut|to(upper|lower)|i(str|pos|mwidth)|pos|width|len|r(chr|i(chr|pos)|pos))|ubst(itute_character|r(_count)?)|end_mail)|http_(input|output)|c(heck_encoding|onvert_(case|encoding|variables|kana))|internal_encoding|output_handler|de(code_(numericentity|mimeheader)|tect_(order|encoding))|encode_(numericentity|mimeheader)|p(arse_str|referred_mime_name)|l(ist_(encodings(_alias_names)?|mime_names)|anguage)|get_info)\b(?=\s*\()
     - name: support.function.mcrypt.php
-      match: (?i)\bm(crypt_(c(fb|reate_iv|bc)|ofb|decrypt|e(nc(_(self_test|is_block_(algorithm(_mode)?|mode)|get_(supported_key_sizes|iv_size|key_size|algorithms_name|modes_name|block_size))|rypt)|cb)|list_(algorithms|modes)|ge(neric(_(init|deinit))?|t_(cipher_name|iv_size|key_size|block_size))|module_(self_test|close|is_block_(algorithm(_mode)?|mode)|open|get_(supported_key_sizes|algo_(key_size|block_size))))|decrypt_generic)\b
+      match: (?i)\bm(crypt_(c(fb|reate_iv|bc)|ofb|decrypt|e(cb|nc(_(self_test|is_block_(algorithm(_mode)?|mode)|get_(supported_key_sizes|iv_size|key_size|algorithms_name|modes_name|block_size))|rypt))|list_(algorithms|modes)|ge(neric(_(init|deinit))?|t_(cipher_name|iv_size|key_size|block_size))|module_(self_test|close|is_block_(algorithm(_mode)?|mode)|open|get_(supported_key_sizes|algo_(key_size|block_size))))|decrypt_generic)\b(?=\s*\()
+    - name: support.function.md5.php
+      match: (?i)\bmd5(_file)?\b(?=\s*\()
+    - name: support.function.metaphone.php
+      match: (?i)\bmetaphone\b(?=\s*\()
     - name: support.function.mhash.php
-      match: (?i)\bmhash(_(count|keygen_s2k|get_(hash_name|block_size)))?\b
+      match: (?i)\bmhash(_(count|keygen_s2k|get_(hash_name|block_size)))?\b(?=\s*\()
+    - name: support.function.microtime.php
+      match: (?i)\b(get(timeofday|rusage)|microtime)\b(?=\s*\()
     - name: support.function.mime_magic.php
-      match: (?i)\bmime_content_type\b
+      match: (?i)\bmime_content_type\b(?=\s*\()
     - name: support.function.ming.php
-      match: (?i)\b(swf(prebuiltclip_init|videostream_init)|ming_(set(scale|cubicthreshold)|use(swfversion|constants)|keypress))\b
-    - name: support.function.php_msql.php
-      match: (?i)\bmsql_(select_db|num_(fields|rows)|c(onnect|lose|reate_db)|d(ata_seek|rop_db|b_query)|pconnect|error|query|f(ield_(seek|name|t(ype|able)|flags|len)|etch_(object|field|array|row)|ree_result)|list_(tables|dbs|fields)|affected_rows|result)\b
-    - name: support.function.php_mssql.php
-      match: (?i)\bmssql_(select_db|n(um_(fields|rows)|ext_result)|c(onnect|lose)|init|data_seek|pconnect|execute|query|f(ield_(seek|name|type|length)|etch_(object|field|a(ssoc|rray)|row|batch)|ree_(statement|result))|r(ows_affected|esult)|g(uid_string|et_last_message)|min_(error_severity|message_severity)|bind)\b
-    - name: support.function.php_mysql.php
-      match: (?i)\bmysql_(s(tat|elect_db)|num_(fields|rows)|c(onnect|l(ient_encoding|ose)|reate_db)|thread_id|in(sert_id|fo)|d(ata_seek|rop_db|b_query)|unbuffered_query|p(connect|ing)|e(scape_string|rr(no|or))|query|f(ield_(seek|name|t(ype|able)|flags|len)|etch_(object|field|lengths|a(ssoc|rray)|row)|ree_result)|list_(tables|dbs|processes|fields)|affected_rows|re(sult|al_escape_string)|get_(server_info|host_info|client_info|proto_info))\b
+      match: (?i)\b(swf(prebuiltclip_init|videostream_init)|ming_(set(scale|cubicthreshold)|use(swfversion|constants)|keypress))\b(?=\s*\()
+    - name: support.function.multi.php
+      match: (?i)\bcurl_multi_(select|close|in(it|fo_read)|exec|add_handle|getcontent|remove_handle)\b(?=\s*\()
     - name: support.function.mysqli_api.php
-      match: (?i)\bmysqli_(s(sl_set|t(ore_result|at|mt_(s(tore_result|end_long_data|qlstate)|num_rows|close|in(sert_id|it)|data_seek|p(aram_count|repare)|e(rr(no|or)|xecute)|f(ield_count|etch|ree_result)|a(ttr_(set|get)|ffected_rows)|res(ult_metadata|et)|bind_(param|result)))|e(t_local_infile_(handler|default)|lect_db)|qlstate)|n(um_(fields|rows)|ext_result)|c(ha(nge_user|racter_set_name)|ommit|lose)|thread_(safe|id)|in(sert_id|it|fo)|options|d(ump_debug_info|ebug|ata_seek)|use_result|p(ing|repare)|err(no|or)|kill|f(ield_(seek|count|tell)|etch_(field(s|_direct)?|lengths|row)|ree_result)|warning_count|a(utocommit|ffected_rows)|r(ollback|eal_(connect|escape_string|query))|get_(server_(info|version)|host_info|client_(info|version)|proto_info)|more_results)\b
+      match: (?i)\b(s(sl_set|t(ore_result|at|mt(_init)?)|e(nd_long_data|t_(opt|local_infile_(handler|default))|lect_db))|c(ha(nge_user|racter_set_name)|ommit|lient_encoding)|n(um_rows|ext_result)|init|thread_safe|options|d(ump_debug_info|ebug|ata_seek)|use_result|e(scape_string|xecute)|p(ing|repare)|kill|f(ield_(seek|count)|etch(_(field(s|_direct)?|row))?|ree_result)|a(ttr_(set|get)|utocommit)|get_(server_info|client_info)|r(ollback|e(s(ult_metadata|et)|al_(connect|escape_string|query)))|bind_(param|result)|m(ysqli_(s(sl_set|t(ore_result|at|mt_(s(tore_result|end_long_data|qlstate)|num_rows|close|in(sert_id|it)|data_seek|p(aram_count|repare)|e(rr(no|or)|xecute)|f(ield_count|etch|ree_result)|a(ttr_(set|get)|ffected_rows)|res(ult_metadata|et)|bind_(param|result)))|e(nd_long_data|t_(opt|local_infile_(handler|default))|lect_db)|qlstate)|n(um_(fields|rows)|ext_result)|c(ha(nge_user|racter_set_name)|ommit|l(ient_encoding|ose))|thread_(safe|id)|in(sert_id|it|fo)|options|d(ump_debug_info|ebug|ata_seek)|use_result|p(ing|aram_count|repare)|e(scape_string|rr(no|or)|xecute)|kill|f(ield_(seek|count|tell)|etch(_(field(s|_direct)?|lengths|row))?|ree_result)|warning_count|a(utocommit|ffected_rows)|r(ollback|eal_(connect|escape_string|query))|get_(server_(info|version)|host_info|client_(info|version)|proto_info|metadata)|bind_(param|result)|more_results)|ore_results))\b(?=\s*\()
     - name: support.function.mysqli_embedded.php
-      match: (?i)\bmysqli_embedded_server_(start|end)\b
+      match: (?i)\b(embedded_server_(start|end)|mysqli_embedded_server_(start|end))\b(?=\s*\()
     - name: support.function.mysqli_nonapi.php
-      match: (?i)\bmysqli_(s(tmt_get_warnings|et_charset)|connect(_err(no|or))?|query|fetch_(object|a(ssoc|rray))|get_(charset|warnings)|multi_query)\b
+      match: (?i)\b(set_charset|connect|query|fetch_(object|a(ssoc|rray))|get_(charset|warnings)|m(ysqli(_(s(tmt_get_warnings|et_charset)|connect(_err(no|or))?|query|fetch_(object|a(ssoc|rray))|get_(charset|warnings)|multi_query))?|ulti_query))\b(?=\s*\()
     - name: support.function.mysqli_repl.php
-      match: (?i)\bmysqli_(s(end_query|lave_query)|disable_r(pl_parse|eads_from_master)|enable_r(pl_parse|eads_from_master)|rpl_(p(arse_enabled|robe)|query_type)|master_query)\b
+      match: (?i)\b(slave_query|disable_r(eads_from_master|pl_parse)|enable_r(pl_parse|eads_from_master)|rpl_(p(arse_enabled|robe)|query_type)|m(ysqli_(s(end_query|lave_query)|disable_r(pl_parse|eads_from_master)|enable_r(pl_parse|eads_from_master)|rpl_(p(arse_enabled|robe)|query_type)|master_query)|aster_query))\b(?=\s*\()
     - name: support.function.mysqli_report.php
-      match: (?i)\bmysqli_report\b
+      match: (?i)\bmysqli_report\b(?=\s*\()
+    - name: support.function.namednodemap.php
+      match: (?i)\b(setNamedItem(NS)?|dom_namednodemap_(set_named_item(_ns)?|item|remove_named_item(_ns)?|get_named_item(_ns)?)|getNamedItem(NS)?|removeNamedItem(NS)?)\b(?=\s*\()
+    - name: support.function.namelist.php
+      match: (?i)\b(dom_namelist_get_name(space_uri)?|getName(spaceURI)?)\b(?=\s*\()
     - name: support.function.ncurses_functions.php
-      match: (?i)\bncurses_(s(how_panel|cr(_(set|init|dump|restore)|l)|ta(nd(out|end)|rt_color)|lk_(set|noutrefresh|c(olor|lear)|touch|init|attr(set|o(n|ff))?|re(store|fresh))|avetty)|h(ide_panel|line|a(s_(colors|i(c|l)|key)|lfdelay))|n(o(nl|cbreak|echo|qiflush|raw)|ew(_panel|pad|win)|l|apms)|c(olor_(set|content)|urs_set|l(ear|rto(eol|bot))|an_change_color|break)|t(ypeahead|imeout|op_panel|erm(name|attrs))|i(sendwin|n(s(str|ch|tr|delln|ertln)|ch|it(_(color|pair))?))|d(oupdate|e(f(ine_key|_(shell_mode|prog_mode))|l(ch|_panel|eteln|win|ay_output)))|u(se_(default_colors|e(nv|xtended_names))|nget(ch|mouse)|pdate_panels)|p(noutrefresh|utp|a(nel_(window|above|below)|ir_content)|refresh)|e(nd|cho(char)?|rase(char)?)|v(idattr|line)|k(illchar|ey(ok|pad))|qiflush|f(ilter|l(ushinp|ash))|w(stand(out|end)|hline|noutrefresh|c(olor_set|lear)|erase|vline|a(ttr(set|o(n|ff))|dd(str|ch))|refresh|getch|mo(use_trafo|ve)|border)|longname|a(ssume_default_colors|ttr(set|o(n|ff))|dd(str|nstr|ch(str|nstr)?))|r(e(set(ty|_(shell_mode|prog_mode))|place_panel|fresh)|aw)|get(yx|ch|m(ouse|axyx))|m(o(use(interval|_trafo|mask)|ve(_panel)?)|eta|v(hline|cur|inch|delch|vline|waddstr|add(str|nstr|ch(str|nstr)?)|getch))|b(o(ttom_panel|rder)|eep|kgd(set)?|audrate))\b
+      match: (?i)\bncurses_(s(how_panel|cr(_(set|init|dump|restore)|l)|ta(nd(out|end)|rt_color)|lk_(set|noutrefresh|c(olor|lear)|init|touch|attr(set|o(n|ff))?|re(store|fresh))|avetty)|h(ide_panel|line|a(s_(colors|i(c|l)|key)|lfdelay))|n(o(nl|cbreak|echo|qiflush|raw)|ew(_panel|pad|win)|apms|l)|c(olor_(set|content)|urs_set|l(ear|rto(eol|bot))|an_change_color|break)|t(ypeahead|imeout|op_panel|erm(name|attrs))|i(sendwin|n(s(str|ch|tr|delln|ertln)|ch|it(_(color|pair))?))|d(oupdate|e(f(ine_key|_(shell_mode|prog_mode))|l(ch|_panel|eteln|ay_output|win)))|u(se_(default_colors|e(nv|xtended_names))|nget(ch|mouse)|pdate_panels)|p(noutrefresh|utp|a(nel_(window|above|below)|ir_content)|refresh)|e(cho(char)?|nd|rase(char)?)|v(idattr|line)|k(illchar|ey(ok|pad))|qiflush|f(ilter|l(ushinp|ash))|longname|w(stand(out|end)|hline|noutrefresh|c(olor_set|lear)|erase|vline|a(ttr(set|o(n|ff))|dd(str|ch))|getch|refresh|mo(use_trafo|ve)|border)|a(ssume_default_colors|ttr(set|o(n|ff))|dd(str|nstr|ch(str|nstr)?))|r(e(set(ty|_(shell_mode|prog_mode))|place_panel|fresh)|aw)|get(yx|ch|m(ouse|axyx))|b(o(ttom_panel|rder)|eep|kgd(set)?|audrate)|m(o(use(interval|_trafo|mask)|ve(_panel)?)|eta|v(hline|cur|inch|delch|vline|waddstr|add(str|nstr|ch(str|nstr)?)|getch)))\b(?=\s*\()
+    - name: support.function.node.php
+      match: (?i)\b(has(ChildNodes|Attributes)|setUserData|c(ompareDocumentPosition|loneNode)|normalize|i(s(S(upported|ameNode)|DefaultNamespace|EqualNode)|nsertBefore)|dom_node_(set_user_data|has_(child_nodes|attributes)|normalize|c(ompare_document_position|lone_node)|i(s_(s(upported|ame_node)|default_namespace|equal_node)|nsert_before)|lookup_(namespace_uri|prefix)|append_child|get_(user_data|feature)|re(place_child|move_child))|lookup(NamespaceUri|Prefix)|appendChild|re(placeChild|moveChild)|get(UserData|Feature))\b(?=\s*\()
+    - name: support.function.nodelist.php
+      match: (?i)\b(item|dom_nodelist_item)\b(?=\s*\()
+    - name: support.function.nsapi.php
+      match: (?i)\b(nsapi_(virtual|re(sponse_headers|quest_headers))|virtual|apache_re(sponse_headers|quest_headers)|getallheaders)\b(?=\s*\()
     - name: support.function.oci8_interface.php
-      match: (?i)\boci(setbufferinglob|_(s(tatement_type|e(t_prefetch|rver_version))|n(um_(fields|rows)|ew_(c(o(nnect|llection)|ursor)|descriptor))|c(o(nnect|llection_(size|trim|element_(assign|get)|a(ssign|ppend)|max)|mmit)|lose|ancel)|internal_debug|define_by_name|p(connect|a(ssword_change|rse))|e(rror|xecute)|f(ield_(s(cale|ize)|name|type(_raw)?|is_null|precision)|etch(_(object|a(ssoc|ll|rray)|row))?|ree_(statement|collection|descriptor))|lob_(s(ize|eek|ave)|c(opy|lose)|t(ell|runcate)|i(s_equal|mport)|e(of|rase|xport)|flush|write(_temporary)?|load|append|re(wind|ad))|r(ollback|esult)|bind_(array_by_name|by_name))|fetchinto|getbufferinglob)\b
-    - name: support.function.birdstep.php
-      match: (?i)\bbirdstep_(c(o(nnect|mmit)|lose)|off_autocommit|exec|f(ieldn(um|ame)|etch|reeresult)|autocommit|r(ollback|esult))\b
-    - name: support.function.php_odbc.php
-      match: (?i)\b(solid_fetch_prev|odbc_(s(tatistics|pecialcolumns|etoption)|n(um_(fields|rows)|ext_result)|c(o(nnect|lumn(s|privileges)|mmit)|ursor|lose(_all)?)|table(s|privileges)|data_source|p(connect|r(imarykeys|ocedure(s|columns)|epare))|e(rror(msg)?|xec(ute)?)|f(ield_(scale|n(um|ame)|type|len)|oreignkeys|etch_(into|object|array|row)|ree_result)|longreadlen|autocommit|r(ollback|esult(_all)?)|gettypeinfo|binmode))\b
+      match: (?i)\b(s(ize|e(tbuffering|ek)|ave(file)?)|import|t(ell|r(im|uncate))|oci(s(tatementtype|e(t(prefetch|bufferinglob)|rverversion)|avelob(file)?)|n(umcols|ew(c(ollection|ursor)|descriptor)|logon)|c(o(l(umn(s(cale|ize)|name|isnull|type(raw)?|precision)|l(size|trim|a(ssignelem|ppend)|getelem|max))|mmit)|ancel)|internaldebug|definebyname|_(s(tatement_type|e(t_prefetch|rver_version))|c(o(nnect|llection_(size|trim|element_(assign|get)|a(ssign|ppend)|max)|mmit)|lose|ancel)|n(um_(fields|rows)|ew_(c(o(nnect|llection)|ursor)|descriptor))|internal_debug|define_by_name|p(connect|a(ssword_change|rse))|e(rror|xecute)|f(ield_(s(cale|ize)|name|is_null|type(_raw)?|precision)|etch(_(object|a(ssoc|ll|rray)|row))?|ree_(statement|c(ollection|ursor)|descriptor))|lob_(s(ize|eek|ave)|c(opy|lose)|t(ell|runcate)|i(s_equal|mport)|e(of|rase|xport)|flush|append|write(_temporary)?|load|re(wind|ad))|r(ollback|esult)|bind_(array_by_name|by_name))|e(rror|xecute)|p(logon|a(sswordchange|rse))|f(etch(statement|into)?|ree(statement|c(ollection|ursor)|desc))|lo(adlob|go(n|ff))|writelobtofile|r(o(wcount|llback)|esult)|getbufferinglob|bindbyname)|e(of|rase|xport)|f(lush|ree)|write(t(ofile|emporary))?|a(ssign(elem)?|ppend)|load|get(elem|buffering)|read|max)\b(?=\s*\()
     - name: support.function.openssl.php
-      match: (?i)\bopenssl_(s(ign|eal)|csr_(sign|new|export(_to_file)?|get_(subject|public_key))|open|p(ublic_(decrypt|encrypt)|k(cs7_(sign|decrypt|encrypt|verify)|ey_(new|export(_to_file)?|free|get_(details|p(ublic|rivate))))|rivate_(decrypt|encrypt))|error_string|verify|x509_(check(_private_key|purpose)|parse|export(_to_file)?|free|read))\b
+      match: (?i)\bopenssl_(s(ign|eal)|csr_(sign|new|export(_to_file)?|get_(subject|public_key))|open|error_string|p(ublic_(decrypt|encrypt)|k(cs7_(sign|decrypt|encrypt|verify)|ey_(new|export(_to_file)?|free|get_(details|p(ublic|rivate))))|rivate_(decrypt|encrypt))|verify|free_key|get_p(ublickey|rivatekey)|x509_(check(_private_key|purpose)|parse|export(_to_file)?|free|read))\b(?=\s*\()
+    - name: support.function.output.php
+      match: (?i)\bo(utput_(add_rewrite_var|reset_rewrite_vars)|b_(start|clean|implicit_flush|end_(clean|flush)|flush|list_handlers|get_(status|c(ontents|lean)|flush|le(ngth|vel))))\b(?=\s*\()
+    - name: support.function.pack.php
+      match: (?i)\b(unpack|pack)\b(?=\s*\()
+    - name: support.function.pageinfo.php
+      match: (?i)\bget(lastmod|my(inode|uid|pid|gid))\b(?=\s*\()
     - name: support.function.pcntl.php
-      match: (?i)\bpcntl_(s(ignal|etpriority)|exec|fork|w(stopsig|termsig|if(s(topped|ignaled)|exited)|exitstatus|ait(pid)?)|alarm|getpriority)\b
-    - name: support.function.php_pcre.php
-      match: (?i)\bpreg_(split|quote|last_error|replace(_callback)?|grep|match(_all)?)\b
+      match: (?i)\bpcntl_(s(ignal|etpriority)|exec|fork|w(stopsig|termsig|if(s(ignaled|topped)|exited)|exitstatus|ait(pid)?)|alarm|getpriority)\b(?=\s*\()
     - name: support.function.pdo.php
-      match: (?i)\bpdo_drivers\b
+      match: (?i)\bpdo_drivers\b(?=\s*\()
     - name: support.function.pdo_dbh.php
-      match: (?i)\bpdo_drivers\b
+      match: (?i)\bpdo_drivers\b(?=\s*\()
     - name: support.function.pgsql.php
-      match: (?i)\bpg_(se(nd_(prepare|execute|query(_params)?)|t_(client_encoding|error_verbosity)|lect)|host|num_(fields|rows)|c(o(n(nect(ion_(status|reset|busy))?|vert)|py_(to|from))|l(ient_encoding|ose)|ancel_query)|t(ty|ra(nsaction_status|ce))|insert|options|d(elete|bname)|u(n(trace|escape_bytea)|pdate)|p(connect|ing|ort|ut_line|arameter_status|repare)|e(scape_(string|bytea)|nd_copy|xecute)|version|query(_params)?|f(ield_(size|n(um|ame)|t(ype(_oid)?|able)|is_null|prtlen)|etch_(object|a(ssoc|ll(_columns)?|rray)|r(ow|esult))|ree_result)|l(o_(seek|c(lose|reate)|tell|import|open|unlink|export|write|read(_all)?)|ast_(notice|oid|error))|affected_rows|result_(s(tatus|eek)|error(_field)?)|get_(notify|pid|result)|meta_data)\b
+      match: (?i)\bpg_(se(nd_(execute|prepare|query(_params)?)|t(clientencoding|_(client_encoding|error_verbosity))|lect)|host|num(_(fields|rows)|fields|rows)|c(o(n(nect(ion_(status|reset|busy))?|vert)|py_(to|from))|ancel_query|l(ient(_encoding|encoding)|ose)|mdtuples)|insert|t(ty|ra(nsaction_status|ce))|options|d(elete|bname)|u(n(trace|escape_bytea)|pdate)|e(scape_(string|bytea)|nd_copy|rrormessage|xec(ute)?)|p(connect|ing|ort|ut_line|arameter_status|repare)|version|f(ield(size|n(um|ame)|type|isnull|_(size|n(um|ame)|is_null|t(ype(_oid)?|able)|prtlen)|prtlen)|etch_(object|a(ssoc|ll(_columns)?|rray)|r(ow|esult))|ree(_result|result))|query(_params)?|affected_rows|l(o(c(lose|reate)|import|open|unlink|_(seek|c(lose|reate)|tell|import|open|unlink|export|write|read(_all)?)|export|write|read(all)?)|ast_(notice|oid|error))|get(_(notify|pid|result)|lastoid)|result(_(s(tatus|eek)|error(_field)?))?|meta_data)\b(?=\s*\()
+    - name: support.function.php_apache.php
+      match: (?i)\b(headers_(in|out)|s(ome_auth_required|e(t_(etag|last_modified)|rver_port)|atisfies)|is_initial_req|discard_request_body|update_mtime|err_headers_out|virtual|lo(okup_(uri|file)|g_error)|a(uth_(name|type)|pache_(setenv|note|child_terminate|lookup_uri|get_(version|modules)|re(s(et_timeout|ponse_headers)|quest_(s(ome_auth_required|ub_req_(lookup_(uri|file)|method_uri)|e(t_(etag|last_modified)|rver_port)|atisfies)|headers(_(in|out))?|is_initial_req|discard_request_body|update_mtime|err_headers_out|log_error|auth_(name|type)|r(un|emote_host)|meets_conditions))))|r(un|emote_host)|getallheaders|me(thod_uri|ets_conditions))\b(?=\s*\()
+    - name: support.function.php_date.php
+      match: (?i)\b(str(totime|ftime)|checkdate|time(zone_(name_(from_abbr|get)|identifiers_list|transitions_get|o(pen|ffset_get)|abbreviations_list))?|idate|date(_(sun(set|_info|rise)|create|isodate_set|time(zone_(set|get)|_set)|d(efault_timezone_(set|get)|ate_set)|offset_get|parse|format|modify))?|localtime|g(etdate|m(strftime|date|mktime))|mktime)\b(?=\s*\()
+    - name: support.function.php_dom.php
+      match: (?i)\bdom_import_simplexml\b(?=\s*\()
+    - name: support.function.php_fbsql.php
+      match: (?i)\bfbsql(_(hostname|s(t(op_db|art_db)|e(t_(characterset|transaction|password|lob_mode)|lect_db))|n(um_(fields|rows)|ext_result)|c(hange_user|o(nnect|mmit)|lo(se|b_size)|reate_(clob|db|blob))|table(name|_name)|insert_id|d(ata(_seek|base(_password)?)|rop_db|b_(status|query))|username|err(no|or)|p(connect|assword)|f(ield_(seek|name|t(ype|able)|flags|len)|etch_(object|field|lengths|a(ssoc|rray)|row)|ree_result)|query|warnings|list_(tables|dbs|fields)|a(utocommit|ffected_rows)|get_autostart_info|r(o(ws_fetched|llback)|e(sult|ad_(clob|blob)))|blob_size))?\b(?=\s*\()
+    - name: support.function.php_ftp.php
+      match: (?i)\bftp_(s(sl_connect|ystype|i(te|ze)|et_option)|n(list|b_(continue|put|f(put|get)|get))|c(h(dir|mod)|dup|onnect|lose)|delete|exec|p(ut|asv|wd)|quit|f(put|get)|alloc|login|get(_option)?|r(ename|aw(list)?|mdir)|m(dtm|kdir))\b(?=\s*\()
+    - name: support.function.php_functions.php
+      match: (?i)\b(virtual|apache_(setenv|note|get(_(version|modules)|env)|response_headers)|getallheaders)\b(?=\s*\()
+    - name: support.function.php_imap.php
+      match: (?i)\bimap_(header(s|info)?|s(can|tatus|ort|ubscribe|e(t(_quota|flag_full|acl)|arch)|avebody)|c(heck|l(ose|earflag_full)|reate(mailbox)?)|num_(recent|msg)|t(hread|imeout)|8bit|delete(mailbox)?|open|u(n(subscribe|delete)|id|tf(7_(decode|encode)|8))|e(rrors|xpunge)|ping|qprint|fetch(header|structure|text|_overview|body)|l(sub|ist(subscribed|mailbox)?|ast_error)|a(ppend|lerts)|get(subscribed|_quota(root)?|acl|mailboxes)|r(e(name(mailbox)?|open)|fc822_(parse_(headers|adrlist)|write_address))|m(sgno|ime_header_decode|ail(_(co(py|mpose)|move)|boxmsginfo)?)|b(inary|ody(struct)?|ase64))\b(?=\s*\()
+    - name: support.function.php_mbregex.php
+      match: (?i)\bmb(split|_(split|ereg(i(_replace)?|_(search(_(setpos|init|pos|get(pos|regs)|regs))?|replace|match))?|regex_(set_options|encoding))|ereg(i(_replace)?|_(search(_(setpos|init|pos|get(pos|regs)|regs))?|replace|match))?|regex_encoding)\b(?=\s*\()
+    - name: support.function.php_milter.php
+      match: (?i)\bsmfi_(set(timeout|flags|reply)|chgheader|delrcpt|add(header|rcpt)|replacebody|getsymval)\b(?=\s*\()
+    - name: support.function.php_msql.php
+      match: (?i)\bmsql(_(select(db|_db)|num(_(fields|rows)|fields|rows)|c(onnect|lose|reate(db|_db))|tablename|d(ata_seek|rop(db|_db)|b(name|_query))|error|pconnect|f(ield(name|t(ype|able)|_(seek|name|t(ype|able)|flags|len)|flags|len)|etch_(object|field|array|row)|ree(_result|result))|query|affected_rows|list(tables|dbs|_(tables|dbs|fields)|fields)|result))?\b(?=\s*\()
+    - name: support.function.php_mssql.php
+      match: (?i)\bmssql_(select_db|n(um_(fields|rows)|ext_result)|c(onnect|lose)|init|data_seek|execute|pconnect|query|f(ield_(seek|name|type|length)|etch_(object|field|a(ssoc|rray)|row|batch)|ree_(statement|result))|g(uid_string|et_last_message)|r(ows_affected|esult)|bind|min_(error_severity|message_severity))\b(?=\s*\()
+    - name: support.function.php_mysql.php
+      match: (?i)\bmysql(_(s(tat|elect(db|_db))|num(_(fields|rows)|fields|rows)|c(onnect|l(ient_encoding|ose)|reate_db)|t(hread_id|able(name|_name))|in(sert_id|fo)|d(ata_seek|rop_db|b(name|_(name|query)))|unbuffered_query|e(scape_string|rr(no|or))|p(connect|ing)|f(ield(name|t(ype|able)|_(seek|name|t(ype|able)|flags|len)|flags|len)|etch_(object|field|lengths|a(ssoc|rray)|row)|ree(_result|result))|query|affected_rows|list(dbs|_(tables|dbs|processes|fields)|fields)|re(sult|al_escape_string)|get_(server_info|host_info|client_info|proto_info)))?\b(?=\s*\()
+    - name: support.function.php_odbc.php
+      match: (?i)\b(solid_fetch_prev|odbc_(s(tatistics|pecialcolumns|etoption)|n(um_(fields|rows)|ext_result)|c(o(nnect|lumn(s|privileges)|mmit)|ursor|lose(_all)?)|table(s|privileges)|d(o|ata_source)|e(rror(msg)?|xec(ute)?)|p(connect|r(imarykeys|ocedure(s|columns)|epare))|f(ield_(scale|n(um|ame)|type|precision|len)|oreignkeys|etch_(into|object|array|row)|ree_result)|autocommit|longreadlen|gettypeinfo|r(ollback|esult(_all)?)|binmode))\b(?=\s*\()
+    - name: support.function.php_pcre.php
+      match: (?i)\bpreg_(split|quote|last_error|grep|replace(_callback)?|match(_all)?)\b(?=\s*\()
+    - name: support.function.php_spl.php
+      match: (?i)\b(spl_(classes|object_hash|autoload(_(call|unregister|extensions|functions|register))?)|class_(implements|parents))\b(?=\s*\()
+    - name: support.function.php_sybase_ct.php
+      match: (?i)\b(sybase_(se(t_message_handler|lect_db)|num_(fields|rows)|c(onnect|lose)|d(eadlock_retry_count|ata_seek)|unbuffered_query|pconnect|f(ield_seek|etch_(object|field|a(ssoc|rray)|row)|ree_result)|query|affected_rows|result|get_last_message|min_(server_severity|client_severity))|mssql_(se(t_message_handler|lect_db)|c(onnect|lose)|num_(fields|rows)|d(eadlock_retry_count|ata_seek)|unbuffered_query|pconnect|query|f(ield_seek|etch_(object|field|a(ssoc|rray)|row)|ree_result)|affected_rows|get_last_message|result|min_(server_severity|client_severity)))\b(?=\s*\()
+    - name: support.function.php_sybase_db.php
+      match: (?i)\b(sybase_(select_db|num_(fields|rows)|c(onnect|lose)|data_seek|pconnect|f(ield_seek|etch_(object|field|array|row)|ree_result)|query|affected_rows|result|get_last_message|min_(error_severity|message_severity))|mssql_min_(error_severity|message_severity))\b(?=\s*\()
+    - name: support.function.php_xmlwriter.php
+      match: (?i)\bxmlwriter_(s(tart_(c(omment|data)|d(td(_(e(ntity|lement)|attlist))?|ocument)|pi|element(_ns)?|attribute(_ns)?)|et_indent(_string)?)|text|o(utput_memory|pen_(uri|memory))|end_(c(omment|data)|d(td(_(e(ntity|lement)|attlist))?|ocument)|pi|element|attribute)|f(ull_end_element|lush)|write_(c(omment|data)|dtd(_(e(ntity|lement)|attlist))?|pi|element(_ns)?|attribute(_ns)?|raw))\b(?=\s*\()
+    - name: support.function.php_zip.php
+      match: (?i)\b(s(tat(Name|Index)|et(Comment(Name|Index)|ArchiveComment))|c(lose|reateEmptyDir)|delete(Name|Index)|open|zip_(close|open|entry_(name|c(ompress(ionmethod|edsize)|lose)|open|filesize|read)|read)|unchange(Name|Index|All)|locateName|addF(ile|romString)|rename(Name|Index)|get(Stream|Comment(Name|Index)|NameIndex|From(Name|Index)|ArchiveComment))\b(?=\s*\()
     - name: support.function.posix.php
-      match: (?i)\bposix_(s(trerror|et(sid|uid|pgid|e(uid|gid)|gid))|ctermid|t(tyname|imes)|i(satty|nitgroups)|uname|kill|access|get(sid|cwd|uid|_last_error|p(id|pid|w(nam|uid)|g(id|rp))|e(uid|gid)|login|rlimit|g(id|r(nam|oups|gid)))|mk(nod|fifo))\b
+      match: (?i)\bposix_(s(trerror|et(sid|uid|pgid|e(uid|gid)|gid))|ctermid|i(satty|nitgroups)|t(tyname|imes)|uname|errno|kill|access|get(sid|cwd|_last_error|uid|e(uid|gid)|p(id|pid|w(nam|uid)|g(id|rp))|login|rlimit|g(id|r(nam|oups|gid)))|mk(nod|fifo))\b(?=\s*\()
+    - name: support.function.proc_open.php
+      match: (?i)\bproc_(close|terminate|open|get_status)\b(?=\s*\()
     - name: support.function.pspell.php
-      match: (?i)\bpspell_(s(tore_replacement|uggest|ave_wordlist)|new(_(config|personal))?|c(heck|onfig_(save_repl|create|ignore|d(ict_dir|ata_dir)|personal|r(untogether|epl)|mode)|lear_session)|add_to_(session|personal))\b
+      match: (?i)\bpspell_(s(tore_replacement|uggest|ave_wordlist)|c(heck|onfig_(save_repl|create|ignore|d(ict_dir|ata_dir)|personal|r(untogether|epl)|mode)|lear_session)|new(_(config|personal))?|add_to_(session|personal))\b(?=\s*\()
+    - name: support.function.quot_print.php
+      match: (?i)\bquoted_printable_decode\b(?=\s*\()
+    - name: support.function.rand.php
+      match: (?i)\b(srand|getrandmax|rand|mt_(srand|getrandmax|rand))\b(?=\s*\()
     - name: support.function.readline.php
-      match: (?i)\breadline(_(c(ompletion_function|lear_history|allback_(handler_(install|remove)|read_char))|info|on_new_line|write_history|list_history|add_history|re(display|ad_history)))?\b
+      match: (?i)\breadline(_(c(ompletion_function|allback_(handler_(install|remove)|read_char)|lear_history)|info|on_new_line|write_history|list_history|add_history|re(display|ad_history)))?\b(?=\s*\()
     - name: support.function.recode.php
-      match: (?i)\brecode_(string|file)\b
+      match: (?i)\brecode(_(string|file))?\b(?=\s*\()
+    - name: support.function.reg.php
+      match: (?i)\b(s(plit(i)?|ql_regcase)|ereg(i(_replace)?|_replace)?|msql_regcase)\b(?=\s*\()
     - name: support.function.session.php
-      match: (?i)\bsession_(s(tart|et_(save_handler|cookie_params)|ave_path)|name|cache_(expire|limiter)|i(s_registered|d)|de(stroy|code)|un(set|register)|encode|write_close|reg(ister|enerate_id)|get_cookie_params|module_name)\b
+      match: (?i)\bsession_(s(tart|et_(save_handler|cookie_params)|ave_path)|c(ommit|ache_(expire|limiter))|name|i(s_registered|d)|de(stroy|code)|un(set|register)|encode|write_close|reg(ister|enerate_id)|get_cookie_params|module_name)\b(?=\s*\()
+    - name: support.function.sha1.php
+      match: (?i)\bsha1(_file)?\b(?=\s*\()
     - name: support.function.shmop.php
-      match: (?i)\bshmop_(size|close|open|delete|write|read)\b
+      match: (?i)\bshmop_(size|close|delete|open|write|read)\b(?=\s*\()
     - name: support.function.simplexml.php
-      match: (?i)\bsimplexml_(import_dom|load_(string|file))\b
+      match: (?i)\bsimplexml_(import_dom|load_(string|file))\b(?=\s*\()
     - name: support.function.skeleton.php
-      match: (?i)\bconfirm_extname_compiled\b
+      match: (?i)\bconfirm_extname_compiled\b(?=\s*\()
     - name: support.function.snmp.php
-      match: (?i)\b(snmp(set|2_(set|walk|real_walk|get(next)?)|_(set_(oid_output_format|enum_print|valueretrieval|quick_print)|read_mib|get_(valueretrieval|quick_print))|3_(set|walk|real_walk|get(next)?)|walk|realwalk|get(next)?)|php_snmpv3)\b
+      match: (?i)\b(snmp(set|2_(set|walk|real_walk|get(next)?)|3_(set|walk|real_walk|get(next)?)|_(set_(oid_(numeric_print|output_format)|enum_print|valueretrieval|quick_print)|read_mib|get_(valueretrieval|quick_print))|walk(oid)?|realwalk|get(next)?)|php_snmpv3)\b(?=\s*\()
     - name: support.function.sockets.php
-      match: (?i)\bsocket_(s(hutdown|trerror|e(nd(to)?|t_(nonblock|option|block)|lect))|c(onnect|l(ose|ear_error)|reate(_(pair|listen))?)|write|l(isten|ast_error)|accept|re(cv(from)?|ad)|get(sockname|_option|peername)|bind)\b
-    - name: support.function.php_spl.php
-      match: (?i)\b(spl_(classes|object_hash|autoload(_(call|unregister|extensions|functions|register))?)|class_(implements|parents))\b
+      match: (?i)\bsocket_(s(hutdown|trerror|e(nd(to)?|t(opt|_(nonblock|option|block))|lect))|c(onnect|l(ose|ear_error)|reate(_(pair|listen))?)|write|l(isten|ast_error)|accept|get(sockname|opt|_option|peername)|re(cv(from)?|ad)|bind)\b(?=\s*\()
+    - name: support.function.soundex.php
+      match: (?i)\bsoundex\b(?=\s*\()
     - name: support.function.spl_iterators.php
-      match: (?i)\biterator_(count|to_array|apply)\b
+      match: (?i)\biterator_(count|to_array|apply)\b(?=\s*\()
     - name: support.function.sqlite.php
-      match: (?i)\bsqlite_(s(ingle_query|eek)|has_prev|n(um_(fields|rows)|ext)|c(hanges|olumn|urrent|lose|reate_(function|aggregate))|open|u(nbuffered_query|df_(decode_binary|encode_binary))|p(open|rev)|e(scape_string|rror_string|xec)|valid|key|query|f(ield_name|etch_(single|column_types|object|a(ll|rray))|actory)|l(ib(encoding|version)|ast_(insert_rowid|error))|array_query|rewind|busy_timeout)\b
-    - name: support.function.array.php
-      match: (?i)(=>)|\b(list|array|s(huffle|ort)|n(ext|at(sort|casesort))|c(o(unt|mpact)|urrent)|in_array|u(sort|ksort|asort)|prev|e(nd|xtract)|k(sort|ey|rsort)|a(sort|r(sort|ray_(s(hift|um|plice|earch|lice)|c(h(unk|ange_key_case)|o(unt_values|mbine))|intersect(_(u(key|assoc)|key|assoc))?|diff(_(u(key|assoc)|key|assoc))?|u(n(shift|ique)|intersect(_(uassoc|assoc))?|diff(_(uassoc|assoc))?)|p(op|ush|ad|roduct)|values|key(s|_exists)|f(il(ter|l(_keys)?)|lip)|walk(_recursive)?|r(e(duce|verse)|and)|m(ultisort|erge(_recursive)?|ap))))|r(sort|eset|ange)|m(in|ax))\b
-    - name: support.function.assert.php
-      match: (?i)\bassert(_options)?\b
-    - name: support.function.base64.php
-      match: (?i)\bbase64_(decode|encode)\b
-    - name: support.function.basic_functions.php
-      match: (?i)\b(s(ys_getloadavg|et_(include_path|magic_quotes_runtime)|leep)|highlight_(string|file)|c(on(stant|nection_(status|aborted))|all_user_(func(_array)?|method(_array)?))|time_(sleep_until|nanosleep)|i(s_uploaded_file|n(i_(set|restore|get(_all)?)|et_(ntop|pton))|p2long|gnore_user_abort|mport_request_variables)|u(sleep|nregister_tick_function)|p(hp_strip_whitespace|utenv|arse_ini_file|rint_r)|error_(log|get_last)|flush|long2ip|re(store_include_path|gister_(shutdown_function|tick_function))|get(servby(name|port)|opt|_(c(urrent_user|fg_var)|include_path|magic_quotes_(runtime|gpc))|protobyn(umber|ame)|env)|move_uploaded_file)\b
-    - name: support.function.browscap.php
-      match: (?i)\bget_browser\b
-    - name: support.function.crc32.php
-      match: (?i)\bcrc32\b
-    - name: support.function.crypt.php
-      match: (?i)\bcrypt\b
-    - name: support.function.cyr_convert.php
-      match: (?i)\bconvert_cyr_string\b
-    - name: support.function.datetime.php
-      match: (?i)\bstrptime\b
-    - name: support.function.dir.php
-      match: (?i)\b(scandir|c(h(dir|root)|losedir)|opendir|dir|re(winddir|addir)|g(etcwd|lob))\b
-    - name: support.function.dl.php
-      match: (?i)\bdl\b
-    - name: support.function.dns.php
-      match: (?i)\b(dns_(check_record|get_(record|mx))|gethostby(name(l)?|addr))\b
-    - name: support.function.exec.php
-      match: (?i)\b(s(hell_exec|ystem)|p(assthru|roc_nice)|e(scapeshell(cmd|arg)|xec))\b
-    - name: support.function.file.php
-      match: (?i)\b(sys_get_temp_dir|copy|t(empnam|mpfile)|u(nlink|mask)|p(close|open)|f(s(canf|tat|eek)|nmatch|close|t(ell|runcate)|ile(_(put_contents|get_contents))?|open|p(utcsv|assthru)|eof|flush|write|lock|read|get(s(s)?|c(sv)?))|r(e(name|wind|a(dfile|lpath))|mdir)|get_meta_tags|mkdir)\b
-    - name: support.function.filestat.php
-      match: (?i)\b(stat|c(h(own|grp|mod)|learstatcache)|touch|is_(dir|executable|file|writable|link|readable)|disk_(total_space|free_space)|file(size|ctime|type|inode|owner|_exists|perms|atime|group|mtime)|l(stat|chgrp))\b
-    - name: support.function.formatted_print.php
-      match: (?i)\b(sprintf|printf|v(sprintf|printf|fprintf)|fprintf)\b
-    - name: support.function.fsock.php
-      match: (?i)\b(pfsockopen|fsockopen)\b
-    - name: support.function.ftok.php
-      match: (?i)\bftok\b
-    - name: support.function.head.php
-      match: (?i)\b(set(cookie|rawcookie)|header(s_(sent|list))?)\b
-    - name: support.function.html.php
-      match: (?i)\b(html(specialchars(_decode)?|_entity_decode|entities)|get_html_translation_table)\b
-    - name: support.function.http.php
-      match: (?i)\bhttp_build_query\b
-    - name: support.function.image.php
-      match: (?i)\b(image_type_to_(extension|mime_type)|getimagesize)\b
-    - name: support.function.info.php
-      match: (?i)\b(zend_logo_guid|php(credits|info|_(sapi_name|ini_scanned_files|uname|egg_logo_guid|logo_guid|real_logo_guid)|version))\b
-    - name: support.function.iptc.php
-      match: (?i)\biptc(parse|embed)\b
-    - name: support.function.lcg.php
-      match: (?i)\blcg_value\b
-    - name: support.function.levenshtein.php
-      match: (?i)\blevenshtein\b
-    - name: support.function.link.php
-      match: (?i)\b(symlink|link(info)?|readlink)\b
-    - name: support.function.mail.php
-      match: (?i)\b(ezmlm_hash|mail)\b
-    - name: support.function.math.php
-      match: (?i)\b(s(in(h)?|qrt)|h(ypot|exdec)|number_format|c(os(h)?|eil)|tan(h)?|is_(nan|infinite|finite)|octdec|de(c(hex|oct|bin)|g2rad)|p(i|ow)|exp(m1)?|f(loor|mod)|log(1(p|0))?|a(sin(h)?|cos(h)?|tan(h|2)?|bs)|r(ound|ad2deg)|b(indec|ase_convert))\b
-    - name: support.function.md5.php
-      match: (?i)\bmd5(_file)?\b
-    - name: support.function.metaphone.php
-      match: (?i)\bmetaphone\b
-    - name: support.function.microtime.php
-      match: (?i)\b(get(timeofday|rusage)|microtime)\b
-    - name: support.function.pack.php
-      match: (?i)\b(unpack|pack)\b
-    - name: support.function.pageinfo.php
-      match: (?i)\bget(lastmod|my(inode|uid|pid|gid))\b
-    - name: support.function.proc_open.php
-      match: (?i)\bproc_(close|terminate|open|get_status)\b
-    - name: support.function.quot_print.php
-      match: (?i)\bquoted_printable_decode\b
-    - name: support.function.rand.php
-      match: (?i)\b(srand|rand|getrandmax|mt_(srand|rand|getrandmax))\b
-    - name: support.function.reg.php
-      match: (?i)\b(s(plit(i)?|ql_regcase)|ereg(i(_replace)?|_replace)?)\b
-    - name: support.function.sha1.php
-      match: (?i)\bsha1(_file)?\b
-    - name: support.function.soundex.php
-      match: (?i)\bsoundex\b
+      match: (?i)\bsqlite_(has_(prev|more)|s(ingle_query|eek)|n(um_(fields|rows)|ext)|c(hanges|olumn|urrent|lose|reate_(function|aggregate))|open|u(nbuffered_query|df_(decode_binary|encode_binary))|e(scape_string|rror_string|xec)|p(open|rev)|key|valid|query|f(ield_name|etch_(s(tring|ingle)|column_types|object|a(ll|rray))|actory)|l(ib(encoding|version)|ast_(insert_rowid|error))|array_query|rewind|busy_timeout)\b(?=\s*\()
     - name: support.function.streamsfuncs.php
-      match: (?i)\bstream_(s(ocket_(s(hutdown|e(ndto|rver))|client|pair|enable_crypto|accept|recvfrom|get_name)|e(t_(timeout|write_buffer|blocking)|lect))|co(ntext_(set_(option|params)|create|get_(options|default))|py_to_stream)|filter_(prepend|append|remove)|get_(contents|transports|wrappers|line|meta_data))\b
+      match: (?i)\bs(tream_(s(ocket_(s(hutdown|e(ndto|rver))|client|enable_crypto|pair|accept|recvfrom|get_name)|e(t_(timeout|write_buffer|blocking)|lect))|co(ntext_(set_(option|params)|create|get_(default|options))|py_to_stream)|filter_(prepend|append|remove)|get_(contents|transports|line|wrappers|meta_data))|ocket_(set_(timeout|blocking)|get_status)|et_file_buffer)\b(?=\s*\()
     - name: support.function.string.php
-      match: (?i)\b(echo|print|s(scanf|tr(s(tr|pn)|natc(asecmp|mp)|c(spn|hr|oll)|t(o(upper|k|lower)|r)|i(str|p(slashes|cslashes|os|_tags))|_(s(huffle|plit)|ireplace|pad|word_count|r(ot13|ep(eat|lace)))|p(os|brk)|r(chr|ipos|pos|ev))|imilar_text|ubstr(_(co(unt|mpare)|replace))?|etlocale)|hebrev(c)?|nl(2br|_langinfo)|c(h(unk_split|r)|ount_chars)|trim|implode|ord|dirname|uc(first|words)|join|pa(thinfo|rse_str)|explode|quotemeta|wordwrap|l(trim|ocaleconv)|add(slashes|cslashes)|rtrim|money_format|b(in2hex|asename))\b
+      match: (?i)\b(hebrev(c)?|s(scanf|imilar_text|tr(s(tr|pn)|natc(asecmp|mp)|c(hr|spn|oll)|i(str|p(slashes|cslashes|os|_tags))|t(o(upper|k|lower)|r)|_(s(huffle|plit)|ireplace|pad|word_count|r(ot13|ep(eat|lace)))|p(os|brk)|r(chr|ipos|ev|pos))|ubstr(_(co(unt|mpare)|replace))?|etlocale)|c(h(op|unk_split|r)|ount_chars)|nl(2br|_langinfo)|implode|trim|ord|dirname|uc(first|words)|join|pa(thinfo|rse_str)|explode|quotemeta|add(slashes|cslashes)|wordwrap|l(trim|ocaleconv)|rtrim|money_format|b(in2hex|asename))\b(?=\s*\()
+    - name: support.function.string_extend.php
+      match: (?i)\b(dom_string_extend_find_offset(16|32)|findOffset(16|32))\b(?=\s*\()
     - name: support.function.syslog.php
-      match: (?i)\b(syslog|closelog|openlog|define_syslog_variables)\b
+      match: (?i)\b(syslog|closelog|openlog|define_syslog_variables)\b(?=\s*\()
+    - name: support.function.sysvmsg.php
+      match: (?i)\bmsg_(s(tat_queue|e(nd|t_queue))|re(ceive|move_queue)|get_queue)\b(?=\s*\()
+    - name: support.function.sysvsem.php
+      match: (?i)\bsem_(acquire|re(lease|move)|get)\b(?=\s*\()
+    - name: support.function.sysvshm.php
+      match: (?i)\bshm_(detach|put_var|attach|get_var|remove(_var)?)\b(?=\s*\()
+    - name: support.function.text.php
+      match: (?i)\b(splitText|is(ElementContentWhitespace|WhitespaceInElementContent)|dom_text_(split_text|is_whitespace_in_element_content|replace_whole_text)|replaceWholeText)\b(?=\s*\()
+    - name: support.function.tidy.php
+      match: (?i)\btidy_(c(onfig_count|lean_repair)|is_x(html|ml)|diagnose|error_count|parse_(string|file)|access_count|warning_count|repair_(string|file)|get(opt|_(h(tml(_ver)?|ead)|status|config|o(utput|pt_doc)|error_buffer|r(oot|elease)|body)))\b(?=\s*\()
+    - name: support.function.tokenizer.php
+      match: (?i)\btoken_(name|get_all)\b(?=\s*\()
     - name: support.function.type.php
-      match: (?i)\b(s(trval|ettype)|i(s_(s(calar|tring)|nu(ll|meric)|callable|object|float|long|array|resource|bool)|ntval)|floatval|gettype)\b
+      match: (?i)\b(s(trval|ettype)|i(s_(s(calar|tring)|callable|nu(ll|meric)|int(eger)?|double|object|float|array|long|re(source|al)|bool)|ntval)|doubleval|floatval|gettype)\b(?=\s*\()
     - name: support.function.uniqid.php
-      match: (?i)\buniqid\b
+      match: (?i)\buniqid\b(?=\s*\()
     - name: support.function.url.php
-      match: (?i)\b(url(decode|encode)|parse_url|rawurl(decode|encode)|get_headers)\b
+      match: (?i)\b(url(decode|encode)|parse_url|get_headers|rawurl(decode|encode))\b(?=\s*\()
     - name: support.function.user_filters.php
-      match: (?i)\bstream_(filter_register|get_filters|bucket_(new|prepend|append|make_writeable))\b
+      match: (?i)\bstream_(filter_register|get_filters|bucket_(new|prepend|append|make_writeable))\b(?=\s*\()
+    - name: support.function.userdatahandler.php
+      match: (?i)\b(handle|dom_userdatahandler_handle)\b(?=\s*\()
+    - name: support.function.userspace.php
+      match: (?i)\bstream_(wrapper_(unregister|re(store|gister))|register_wrapper)\b(?=\s*\()
     - name: support.function.uuencode.php
-      match: (?i)\bconvert_uu(decode|encode)\b
+      match: (?i)\bconvert_uu(decode|encode)\b(?=\s*\()
     - name: support.function.var.php
-      match: (?i)\b((un|is)set|empty|serialize|debug_zval_dump|unserialize|var_(dump|export)|memory_get_(usage|peak_usage))\b
+      match: (?i)\b(serialize|debug_zval_dump|unserialize|var_(dump|export)|memory_get_(usage|peak_usage))\b(?=\s*\()
     - name: support.function.versioning.php
-      match: (?i)\bversion_compare\b
-    - name: support.function.php_sybase_db.php
-      match: (?i)\bsybase_(select_db|num_(fields|rows)|c(onnect|lose)|data_seek|pconnect|query|f(ield_seek|etch_(object|field|array|row)|ree_result)|affected_rows|result|get_last_message|min_(error_severity|message_severity))\b
-    - name: support.function.php_sybase_ct.php
-      match: (?i)\bsybase_(se(t_message_handler|lect_db)|num_(fields|rows)|c(onnect|lose)|d(eadlock_retry_count|ata_seek)|unbuffered_query|pconnect|query|f(ield_seek|etch_(object|field|a(ssoc|rray)|row)|ree_result)|affected_rows|result|get_last_message|min_(server_severity|client_severity))\b
-    - name: support.function.sysvmsg.php
-      match: (?i)\bmsg_(s(tat_queue|e(nd|t_queue))|re(ceive|move_queue)|get_queue)\b
-    - name: support.function.sysvsem.php
-      match: (?i)\bsem_(acquire|re(lease|move)|get)\b
-    - name: support.function.sysvshm.php
-      match: (?i)\bshm_(detach|put_var|attach|remove(_var)?|get_var)\b
-    - name: support.function.tidy.php
-      match: (?i)\btidy_(c(onfig_count|lean_repair)|is_x(html|ml)|diagnose|parse_(string|file)|error_count|warning_count|access_count|repair_(string|file)|get(opt|_(status|h(tml(_ver)?|ead)|config|o(utput|pt_doc)|error_buffer|r(oot|elease)|body)))\b
-    - name: support.function.tokenizer.php
-      match: (?i)\btoken_(name|get_all)\b
+      match: (?i)\bversion_compare\b(?=\s*\()
     - name: support.function.wddx.php
-      match: (?i)\bwddx_(serialize_va(lue|rs)|deserialize|packet_(start|end)|add_vars)\b
+      match: (?i)\bwddx_(serialize_va(lue|rs)|deserialize|packet_(start|end)|add_vars)\b(?=\s*\()
     - name: support.function.xml.php
-      match: (?i)\b(utf8_(decode|encode)|xml_(set_(start_namespace_decl_handler|notation_decl_handler|character_data_handler|object|default_handler|unparsed_entity_decl_handler|processing_instruction_handler|e(nd_namespace_decl_handler|lement_handler|xternal_entity_ref_handler))|parse(_into_struct|r_(set_option|create(_ns)?|free|get_option))?|error_string|get_(current_(column_number|line_number|byte_index)|error_code)))\b
+      match: (?i)\b(utf8_(decode|encode)|xml_(set_(start_namespace_decl_handler|notation_decl_handler|character_data_handler|default_handler|object|unparsed_entity_decl_handler|processing_instruction_handler|e(nd_namespace_decl_handler|lement_handler|xternal_entity_ref_handler))|error_string|parse(_into_struct|r_(set_option|create(_ns)?|free|get_option))?|get_(current_(column_number|line_number|byte_index)|error_code)))\b(?=\s*\()
     - name: support.function.xmlrpc-epi-php.php
-      match: (?i)\bxmlrpc_(se(t_type|rver_(c(all_method|reate)|destroy|add_introspection_data|register_(introspection_callback|method)))|is_fault|decode(_request)?|parse_method_descriptions|encode(_request)?|get_type)\b
-    - name: support.function.php_xmlwriter.php
-      match: (?i)\bxmlwriter_(s(tart_(c(omment|data)|d(td(_(e(ntity|lement)|attlist))?|ocument)|pi|element(_ns)?|attribute(_ns)?)|et_indent(_string)?)|text|o(utput_memory|pen_(uri|memory))|end_(c(omment|data)|d(td(_(e(ntity|lement)|attlist))?|ocument)|pi|element|attribute)|f(ull_end_element|lush)|write_(c(omment|data)|dtd(_(e(ntity|lement)|attlist))?|pi|element(_ns)?|attribute(_ns)?|raw))\b
+      match: (?i)\bxmlrpc_(se(t_type|rver_(c(all_method|reate)|destroy|add_introspection_data|register_(introspection_callback|method)))|is_fault|decode(_request)?|parse_method_descriptions|encode(_request)?|get_type)\b(?=\s*\()
+    - name: support.function.xpath.php
+      match: (?i)\b(dom_xpath_(evaluate|query|register_ns)|evaluate|registerNamespace)\b(?=\s*\()
     - name: support.function.xsltprocessor.php
-      match: (?i)\bxsl_xsltprocessor_(set_parameter|has_exslt_support|transform_to_(doc|uri|xml)|import_stylesheet|re(gister_php_functions|move_parameter)|get_parameter)\b
-    - name: support.function.php_zip.php
-      match: (?i)\b(s(tat(Name|Index)|et(Comment(Name|Index)|ArchiveComment))|c(lose|reateEmptyDir)|zip_(close|open|entry_(name|c(ompress(ionmethod|edsize)|lose)|open|filesize|read)|read)|open|delete(Name|Index)|unchange(Name|Index|All)|locateName|addF(ile|romString)|rename(Name|Index)|get(Stream|NameIndex|Comment(Name|Index)|From(Name|Index)|ArchiveComment))\b
+      match: (?i)\b(hasExsltSupport|setParameter|transformTo(Xml|Doc|Uri)|importStylesheet|getParameter|re(gisterPHPFunctions|moveParameter)|xsl_xsltprocessor_(has_exslt_support|set_parameter|transform_to_(doc|uri|xml)|import_stylesheet|re(gister_php_functions|move_parameter)|get_parameter))\b(?=\s*\()
     - name: support.function.zlib.php
-      match: (?i)\b(zlib_get_coding_type|ob_gzhandler|readgzfile|gz(compress|inflate|open|deflate|uncompress|encode|file))\b
-    - name: support.function.main.php
-      match: (?i)\bset_time_limit\b
-    - name: support.function.output.php
-      match: (?i)\bo(utput_(add_rewrite_var|reset_rewrite_vars)|b_(start|clean|implicit_flush|end_(clean|flush)|flush|list_handlers|get_(status|c(ontents|lean)|flush|le(ngth|vel))))\b
-    - name: support.function.userspace.php
-      match: (?i)\bstream_wrapper_(unregister|re(store|gister))\b
-    - name: support.function.php_apache.php
-      match: (?i)\b(virtual|apache_(setenv|note|child_terminate|lookup_uri|re(s(ponse_headers|et_timeout)|quest_headers)|get_(version|modules))|getallheaders)\b
-    - name: support.function.php_functions.php
-      match: (?i)\b(virtual|apache_(setenv|note|response_headers|get(_(version|modules)|env))|getallheaders)\b
-    - name: support.function.php_functions.php
-      match: (?i)\b(virtual|apache_(setenv|note|response_headers|get(_(version|modules)|env))|getallheaders)\b
-    - name: support.function.php_apache.php
-      match: (?i)\b(virtual|apache_(setenv|note|child_terminate|lookup_uri|get_(version|modules)|re(sponse_headers|quest_(s(ome_auth_required|ub_req_(lookup_(uri|file)|method_uri)|e(t_(etag|last_modified)|rver_port)|atisfies)|headers(_(in|out))?|is_initial_req|discard_request_body|update_mtime|err_headers_out|log_error|auth_(name|type)|r(un|emote_host)|meets_conditions|basic_auth_pw)))|getallheaders)\b
-    - name: support.function.php_milter.php
-      match: (?i)\bsmfi_(set(timeout|flags|reply)|chgheader|delrcpt|add(header|rcpt)|replacebody|getsymval)\b
-    - name: support.function.nsapi.php
-      match: (?i)\bnsapi_(virtual|re(sponse_headers|quest_headers))\b
-    - name: support.class.builtin
-      match: (?i)\b(Re(cursive(RegexIterator|CachingIterator|IteratorIterator|DirectoryIterator|FilterIterator|ArrayIterator)|flection(Method|Class|Object|Extension|P(arameter|roperty)|Function)?|gexIterator)|swf(s(hape|ound|prite)|text(field)?|displayitem|f(ill|ont(cha(r)?)?)|action|gradient|mo(vie|rph)|b(itmap|utton))|XMLReader|tidyNode|S(impleXML(Iterator|Element)|oap(Header|Server|Client|Param|Var|Fault)|pl(TempFileObject|ObjectStorage|File(Info|Object)))|NoRewindIterator|C(OMPersistHelper|achingIterator)|I(nfiniteIterator|teratorIterator)|D(irectoryIterator|OM(XPath|Node|C(omment|dataSection)|Text|Document(Fragment)?|ProcessingInstruction|E(ntityReference|lement)|Attr)|ateTime(Zone)?)|P(DO(Statement)?|arentIterator)|E(rrorException|mptyIterator|xception)|FilterIterator|LimitIterator|A(p(pendIterator|acheRequest)|rray(Iterator|Object)))\b
-    - name: string.unquoted.heredoc.php
-      endCaptures:
-        "1":
-          name: keyword.operator.heredoc.php
-        "2":
-          name: punctuation.definition.string.php
-      begin: (<<<)([a-zA-Z_]+[a-zA-Z0-9_]*)
-      beginCaptures:
+      match: (?i)\b(ob_gzhandler|zlib_get_coding_type|readgzfile|gz(compress|inflate|deflate|open|uncompress|encode|file))\b(?=\s*\()
+    - name: support.class.builtin.php
+      match: (?i)\b(Re(cursive(RegexIterator|CachingIterator|IteratorIterator|DirectoryIterator|FilterIterator|ArrayIterator)|flection(Method|Class|Object|Extension|P(arameter|roperty)|Function)?|gexIterator)|swf(s(hape|ound|prite)|text(field)?|displayitem|f(ill|ont(cha(r)?)?)|action|gradient|mo(vie|rph)|b(itmap|utton))|XMLReader|tidyNode|S(impleXML(Iterator|Element)|oap(Server|Header|Client|Param|Var|Fault)|pl(TempFileObject|ObjectStorage|File(Info|Object)))|NoRewindIterator|C(OMPersistHelper|achingIterator)|I(nfiniteIterator|teratorIterator)|D(irectoryIterator|OM(XPath|Node|C(omment|dataSection)|Text|Document(Fragment)?|ProcessingInstruction|E(ntityReference|lement)|Attr))|P(DO(Statement)?|arentIterator)|E(rrorException|mptyIterator|xception)|FilterIterator|LimitIterator|A(p(pendIterator|acheRequest)|rray(Iterator|Object)))\b(?=\s*\()
+  regex-double-quoted:
+    name: string.regexp.double-quoted.php
+    endCaptures:
+      "0":
+        name: punctuation.definition.string.end.php
+    begin: (?x)"/ (?= (\\.|[^"/])+/[imsxeADSUXu]*" )
+    beginCaptures:
+      "0":
+        name: punctuation.definition.string.begin.php
+    end: (/)([imsxeADSUXu]*)(")
+    patterns:
+    - include: "#interpolation"
+    - name: string.regexp.arbitrary-repitition.php
+      captures:
         "1":
-          name: punctuation.definition.string.php
-        "2":
-          name: keyword.operator.heredoc.php
-      end: ^(\2)(;?)$
+          name: punctuation.definition.arbitrary-repitition.php
+        "3":
+          name: punctuation.definition.arbitrary-repitition.php
+      match: (\{)\d+(,\d+)?(\})
+    - name: string.regexp.character-class.php
+      captures:
+        "0":
+          name: punctuation.definition.character-class.php
+      begin: \[(?:\^?\])?
+      end: \]
       patterns:
-      - include: "#var_complex_string_heredoc"
-    - name: keyword.operator.comparison.php
-      match: (===|==|!==|!=|<=|>=|<>|<|>)
-    - name: keyword.operator.error-control.php
-      match: (@)
-    - name: keyword.operator.increment-decrement.php
-      match: (\-\-|\+\+)
-    - name: keyword.operator.arithmetic.php
-      match: (\-|\+|\*|\/|%)
-    - name: keyword.operator.logical.php
-      match: (!|&&|\|\|)|\b(and|or|xor|as)\b
-    - name: keyword.operator.string.php
-      match: (\.=|\.)
-    - name: keyword.operator.type.php
-      match: \b(instanceof)\b
-    - name: constant.numeric.php
-      match: \b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b
-    - include: "#string-double-quoted"
-    - include: "#string-single-quoted"
-    - include: "#string-backtick"
-    - include: "#var_global"
-    - include: "#var_global_safer"
-    - include: "#var_basic"
+      - name: constant.character.escape.php
+        match: \\.
+    - name: keyword.operator.regexp.php
+      match: "[$^+*]"
+    - name: constant.character.escape.php
+      match: \\.
+  interpolation:
+    patterns:
     - captures:
+        "6":
+          name: keyword.operator.index-start.php
+        "7":
+          name: constant.numeric.index.php
+        "8":
+          name: variable.other.index.php
+        "9":
+          name: punctuation.definition.variable.php
         "1":
-          name: keyword.operator.php
+          name: variable.other.php
         "2":
+          name: punctuation.definition.variable.php
+        "4":
+          name: keyword.operator.class.php
+        "10":
+          name: keyword.operator.index-end.php
+        "5":
           name: variable.other.property.php
-      match: (?<=[a-zA-Z0-9_\x{7f}-\x{ff}])(->)([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?)\b
-    - include: "#language_constant"
+      match: "(?x)\n\
+        \t\t\t\t\t\t((\\$)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))\n\
+        \t\t\t\t\t\t(?:\n\
+        \t\t\t\t\t\t\t(->)\n\
+        \t\t\t\t\t\t\t(\\g<name>)\n\
+        \t\t\t\t\t\t\t|\n\
+        \t\t\t\t\t\t\t(\\[)\n\
+        \t\t\t\t\t\t\t\t(?:(\\d+|((\\$)\\g<name>)))\n\
+        \t\t\t\t\t\t\t(\\])\n\
+        \t\t\t\t\t\t)?\n\
+        \t\t\t\t\t\t"
+      comment: "Simple syntax: $foo, $foo[0], $foo[$bar], $foo->bar"
+    - captures:
+        "1":
+          name: variable.other.php
+        "2":
+          name: punctuation.definition.variable.php
+        "4":
+          name: punctuation.definition.variable.php
+      match: "(?x)\n\
+        \t\t\t\t\t\t((\\$\\{)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\}))\n\
+        \t\t\t\t\t\t"
+      comment: "Simple syntax with braces: \"foo${bar}baz\""
+    - endCaptures:
+        "0":
+          name: punctuation.definition.variable.php
+      begin: (?=(?<regex>(?#simple syntax)\$(?<name>[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)(?:\[(?<index>[a-zA-Z0-9_\x{7f}-\x{ff}]+|\$\g<name>)\]|->\g<name>(\(.*?\))?)?|(?#simple syntax with braces)\$\{(?:\g<name>(?<indices>\[(?:\g<index>|'(?:\\.|[^'\\])*'|"(?:\g<regex>|\\.|[^"\\])*")\])?|\g<complex>|\$\{\g<complex>\})\}|(?#complex syntax)\{(?<complex>\$(?<segment>\g<name>(\g<indices>*|\(.*?\))?)(?:->\g<segment>)*|\$\g<complex>|\$\{\g<complex>\})\}))\{
+      beginCaptures:
+        "0":
+          name: punctuation.definition.variable.php
+      end: \}
+      patterns:
+      - include: "#function-call"
+      - include: "#var_basic"
+      - include: "#object"
+      - include: "#numbers"
+      - name: keyword.operator.index-start.php
+        match: \[
+      - name: keyword.operator.index-end.php
+        match: \]
+      comment: |-
+        Complex syntax. It seems this now supports complex method calls, as of PHP5.
+        							   I've put wildcards into the function call parameter lists to handle this, but this may break the pattern.
+        							   It also might be better to disable it as I shouldn't imagine it's used often (hopefully) and it may confuse PHP4 users.
+    comment: http://www.php.net/manual/en/language.types.string.php#language.types.string.parsing
+  function-call:
+    name: meta.function-call.php
+    match: "[A-Za-z_][A-Za-z_0-9]*(?=\\s*\\()"
+  constants:
+    patterns:
+    - name: constant.language.php
+      match: (?i)\b(TRUE|FALSE|NULL|__(FILE|FUNCTION|CLASS|METHOD|LINE)__|ON|OFF|YES|NO|NL|BR|TAB)\b
     - name: support.constant.core.php
       match: \b(DEFAULT_INCLUDE_PATH|E_(ALL|COMPILE_(ERROR|WARNING)|CORE_(ERROR|WARNING)|(RECOVERABLE_)?ERROR|NOTICE|PARSE|STRICT|USER_(ERROR|NOTICE|WARNING)|WARNING)|PEAR_(EXTENSION_DIR|INSTALL_DIR)|PHP_(BINDIR|CONFIG_FILE_PATH|DATADIR|E(OL|XTENSION_DIR)|L(IBDIR|OCALSTATEDIR)|O(S|UTPUT_HANDLER_CONT|UTPUT_HANDLER_END|UTPUT_HANDLER_START)|SYSCONFDIR|VERSION))\b
     - name: support.constant.std.php
       match: \b(A(B(DAY_([1-7])|MON_([0-9]{1,2}))|LT_DIGITS|M_STR|SSERT_(ACTIVE|BAIL|CALLBACK|QUIET_EVAL|WARNING))|C(ASE_(LOWER|UPPER)|HAR_MAX|O(DESET|NNECTION_(ABORTED|NORMAL|TIMEOUT)|UNT_(NORMAL|RECURSIVE))|REDITS_(ALL|DOCS|FULLPAGE|GENERAL|GROUP|MODULES|QA|SAPI)|RNCYSTR|RYPT_(BLOWFISH|EXT_DES|MD5|SALT_LENGTH|STD_DES)|URRENCY_SYMBOL)|D(AY_([1-7])|ECIMAL_POINT|IRECTORY_SEPARATOR|_(FMT|T_FMT))|E(NT_(COMPAT|NOQUOTES|QUOTES)|RA(|_D_FMT|_D_T_FMT|_T_FMT|_YEAR)|XTR_(IF_EXISTS|OVERWRITE|PREFIX_(ALL|IF_EXISTS|INVALID|SAME)|SKIP))|FRAC_DIGITS|GROUPING|HTML_(ENTITIES|SPECIALCHARS)|IN(FO_(ALL|CONFIGURATION|CREDITS|ENVIRONMENT|GENERAL|LICENSE|MODULES|VARIABLES)|I_(ALL|PERDIR|SYSTEM|USER)|T_(CURR_SYMBOL|FRAC_DIGITS))|L(C_(ALL|COLLATE|CTYPE|MESSAGES|MONETARY|NUMERIC|TIME)|O(CK_(EX|NB|SH|UN)|G_(ALERT|AUTH(|PRIV)|CONS|CRIT|CRON|DAEMON|DEBUG|EMERG|ERR|INFO|KERN|LOCAL([0-7])|LPR|MAIL|NDELAY|NEWS|NOTICE|NOWAIT|ODELAY|PERROR|PID|SYSLOG|USER|UUCP|WARNING)))|M(ON_([0-9]{1,2}|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|YSQL_(ASSOC|BOTH|NUM)|_(1_PI|2_(PI|SQRTPI)|E|L(N10|N2|OG(10E|2E))|PI(|_2|_4)|SQRT1_2|SQRT2))|N(EGATIVE_SIGN|O(EXPR|STR)|_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN))|P(ATH(INFO_(BASENAME|DIRNAME|EXTENSION)|_SEPARATOR)|M_STR|OSITIVE_SIGN|_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN))|RADIXCHAR|S(EEK_(CUR|END|SET)|ORT_(ASC|DESC|NUMERIC|REGULAR|STRING)|TR_PAD_(BOTH|LEFT|RIGHT))|T(HOUS(ANDS_SEP|EP)|_(FMT(|_AMPM)))|YES(EXPR|STR))\b
-  var_basic:
-    name: variable.other.php
+    - name: constant.other.php
+      match: "[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*"
+      comment: |-
+        In PHP, any identifier which is not a variable is taken to be a constant.
+        				However, if there is no constant defined with the given name then a notice
+        				is generated and the constant is assumed to have the value of its name.
+  var_global:
+    name: variable.other.global.php
     captures:
       "1":
         name: punctuation.definition.variable.php
-    match: (\$+)[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?\b
-  string-backtick:
-    name: string.interpolated.php
-    endCaptures:
-      "0":
-        name: punctuation.definition.string.end.php
-    begin: `
-    beginCaptures:
-      "0":
-        name: punctuation.definition.string.begin.php
-    end: `
-    patterns:
-    - name: constant.character.escape.php
-      match: \\.
-    - include: "#var_complex_string_heredoc"
-  var_global_safer:
-    name: variable.other.global.safer.php
-    captures:
-      "2":
-        name: punctuation.definition.variable.php
-    match: ((\$)(GLOBALS|_(ENV|SERVER|SESSION)))|\b(global)\b
-  var_complex_string_heredoc:
-    name: variable.other.php
-    match: (?<regex>(?#simple syntax)\$(?<name>[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)(?:\[(?<index>[a-zA-Z0-9_\x{7f}-\x{ff}]+|\$\g<name>)\]|->\g<name>)?|(?#simple syntax with braces)\$\{(?:\g<name>(?<indices>\[(?:\g<index>|'(?:\\.|[^'\\])*'|"(?:\g<regex>|\\.|[^"\\])*")\])?|\g<complex>|\$\{\g<complex>\})\}|(?#complex syntax)\{(?<complex>\$(?<segment>\g<name>\g<indices>*)(?:->\g<segment>)*|\$\g<complex>|\$\{\g<complex>\})\})
-  string-single-quoted:
-    name: string.quoted.single.php
+    match: (\$)(_(COOKIE|FILES|GET|POST|REQUEST))\b
+  sql-string-single-quoted:
+    name: string.quoted.single.sql.php
     endCaptures:
       "0":
         name: punctuation.definition.string.end.php
-    begin: "'"
+    begin: "'\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER)\\b)"
     beginCaptures:
       "0":
         name: punctuation.definition.string.begin.php
     end: "'"
     patterns:
     - name: constant.character.escape.php
-      match: \\.
-  var_global:
-    name: variable.other.global.php
+      match: \\[\\']
+    - include: source.sql
+  parameter-default-types:
+    patterns:
+    - include: "#strings"
+    - include: "#numbers"
+    - include: "#string-backtick"
+    - include: "#variables"
+    - name: keyword.operator.key.php
+      match: =>
+    - name: keyword.operator.assignment.php
+      match: "="
+    - name: storage.modifier.reference.php
+      match: "&(?=\\s*\\$)"
+    - name: meta.array.php
+      endCaptures:
+        "0":
+          name: punctuation.definition.array.end.php
+      begin: (array)(\()
+      beginCaptures:
+        "1":
+          name: support.function.construct.php
+        "2":
+          name: punctuation.definition.array.begin.php
+      end: \)
+      patterns:
+      - include: "#parameter-default-types"
+    - include: "#instantiation"
+    - include: "#constants"
+  object:
     captures:
       "1":
+        name: keyword.operator.class.php
+      "2":
+        name: meta.function-call.object.php
+      "3":
+        name: variable.other.property.php
+      "4":
         name: punctuation.definition.variable.php
-    match: (\$)(_(COOKIE|FILES|GET|POST|REQUEST))\b
+    match: |-
+      (?x)(->)
+          				(?:
+          				    ([A-Za-z_][A-Za-z_0-9]*)\s*\(
+          				    |
+          				    ((\$+)?[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)
+          				)?
   php_doc:
     patterns:
     - name: invalid.illegal.missing-asterisk.phpdoc.php
@@ -655,6 +952,9 @@ repository:
         "1":
           name: keyword.other.phpdoc.php
       match: \{(@(link)).+?\}
+  numbers:
+    name: constant.numeric.php
+    match: \b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b
 uuid: 22986475-8CA5-11D9-AEDD-000D93C8BE28
 foldingStartMarker: (/\*|\{\s*$|<<<HTML)
 patterns:
@@ -664,15 +964,8 @@ patterns:
   begin: <\?(?i:php|=)?
   end: \?>
   patterns:
-  - name: comment.line.number-sign.php
-    captures:
-      "1":
-        name: punctuation.definition.comment.php
-    match: (#).*?(?=\?>)
-  - name: comment.line.double-slash.php
-    captures:
-      "1":
-        name: punctuation.definition.comment.php
-    match: (//).*?(?=\?>)
   - include: "#language"
 foldingStopMarker: (\*/|^\s*\}|^HTML;)
+comment: "TODO:\n\
+  \xE2\x80\xA2 Try to improve parameters list syntax \xE2\x80\x93 scope numbers, \xE2\x80\x98=\xE2\x80\x99, \xE2\x80\x98,\xE2\x80\x99 and possibly be intelligent about entity ordering\n\
+  \xE2\x80\xA2 Is meta.function-call the correct scope? I've added it to my theme but by default it's not highlighted"