Commits

Georg Brandl committed 1edbba8 Merge

merge with tim

Comments (0)

Files changed (2)

 
 - Fix a bug when backslashes are used in odd locations in Python (#395)
 
-- Fix various bugs in Matlab and S-Plus lexers, thanks to Winston Chang (#411,
-  #413, #414)
+- Fix various bugs in Matlab and S-Plus lexers, thanks to Winston Chang (#410,
+  #411, #413, #414)
 
 
 Version 1.0

pygments/lexers/math.py

             ("(" + "|".join(elfun+specfun+elmat) + r')\b',  Name.Builtin),
 
             # operators:
-            (r'-|==|~=|<|>|<=|>=|&&|&|~', Operator),
+            (r'-|==|~=|<|>|<=|>=|&&|&|~|\|\|?', Operator),
             # operators requiring escape for re:
             (r'\.\*|\*|\+|\.\^|\.\\|\.\/|\/|\\', Operator),
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.