diff options
author | Georg Brandl <georg@python.org> | 2017-01-22 18:50:35 +0000 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2017-01-22 18:50:35 +0000 |
commit | 041b80fab1922800ae0618fd4d3d8d78bf7063b4 (patch) | |
tree | 79540afc389a29e894804229b6ba2dbc78c67760 /doc | |
parent | 635f722ec3eb791e19f41b3231d74923d73bd729 (diff) | |
parent | dbfa7bbacf9ec1a987f632f01c040285269f690b (diff) | |
download | pygments-041b80fab1922800ae0618fd4d3d8d78bf7063b4.tar.gz |
Merged in tprynn/pygments-main/command-line-lexer-formatter (pull request #559)
Custom Lexer/Formatter File Loading
Diffstat (limited to 'doc')
-rw-r--r-- | doc/_themes/pygments14/layout.html | 2 | ||||
-rw-r--r-- | doc/_themes/pygments14/static/pygments14.css_t | 2 | ||||
-rw-r--r-- | doc/docs/lexerdevelopment.rst | 2 | ||||
-rw-r--r-- | doc/docs/lexers.rst | 2 | ||||
-rw-r--r-- | doc/docs/unicode.rst | 2 | ||||
-rw-r--r-- | doc/languages.rst | 1 |
6 files changed, 6 insertions, 5 deletions
diff --git a/doc/_themes/pygments14/layout.html b/doc/_themes/pygments14/layout.html index 2cc03e03..e8860827 100644 --- a/doc/_themes/pygments14/layout.html +++ b/doc/_themes/pygments14/layout.html @@ -82,7 +82,7 @@ {% block footer %} <div class="footer" role="contentinfo"> - © Copyright 2006-2015, Georg Brandl and Pygments contributors. + © Copyright 2006-2017, Georg Brandl and Pygments contributors. Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}. <br/> Pygments logo created by <a href="http://joelunger.com">Joel Unger</a>. diff --git a/doc/_themes/pygments14/static/pygments14.css_t b/doc/_themes/pygments14/static/pygments14.css_t index 5c37aaf9..7f09f623 100644 --- a/doc/_themes/pygments14/static/pygments14.css_t +++ b/doc/_themes/pygments14/static/pygments14.css_t @@ -4,7 +4,7 @@ * * Sphinx stylesheet -- pygments14 theme. Heavily copied from sphinx13. * - * :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS. + * :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ diff --git a/doc/docs/lexerdevelopment.rst b/doc/docs/lexerdevelopment.rst index c55c98a9..63bd01a3 100644 --- a/doc/docs/lexerdevelopment.rst +++ b/doc/docs/lexerdevelopment.rst @@ -400,7 +400,7 @@ There are a few more things you can do with states: tokens = {...} def get_tokens_unprocessed(self, text, stack=('root', 'otherstate')): - for item in RegexLexer.get_tokens_unprocessed(text, stack): + for item in RegexLexer.get_tokens_unprocessed(self, text, stack): yield item Some lexers like the `PhpLexer` use this to make the leading ``<?php`` diff --git a/doc/docs/lexers.rst b/doc/docs/lexers.rst index 9262efb0..ef40f140 100644 --- a/doc/docs/lexers.rst +++ b/doc/docs/lexers.rst @@ -31,7 +31,7 @@ Currently, **all lexers** support these options: If this option is set to ``"guess"``, a simple UTF-8 vs. Latin-1 detection is used, if it is set to ``"chardet"``, the - `chardet library <http://chardet.feedparser.org/>`_ is used to + `chardet library <https://chardet.github.io/>`_ is used to guess the encoding of the input. .. versionadded:: 0.6 diff --git a/doc/docs/unicode.rst b/doc/docs/unicode.rst index 17853a36..dca91116 100644 --- a/doc/docs/unicode.rst +++ b/doc/docs/unicode.rst @@ -55,4 +55,4 @@ encoding is handled differently, see :doc:`the command line docs <cmdline>`. options dict with lexers and formatters, and still have different input and output encodings. -.. _chardet: http://chardet.feedparser.org/ +.. _chardet: https://chardet.github.io/ diff --git a/doc/languages.rst b/doc/languages.rst index ffe1bdb6..7fa8eb2f 100644 --- a/doc/languages.rst +++ b/doc/languages.rst @@ -26,6 +26,7 @@ Programming languages * Common Lisp * Coq * Cryptol (incl. Literate Cryptol) +* `Crystal <http://crystal-lang.org>`_ * `Cython <http://cython.org>`_ * `D <http://dlang.org>`_ * Dart |