Commits

Anonymous committed 7f73b8a

[svn] Change Pygments license to BSD.

Comments (0)

Files changed (51)

 -----------
 (released Dec XX, 2006)
 
+- License change to BSD.
+
 - Added a Scheme lexer (thanks to Marek Kubica).
 
 - Added some functions to iterate over existing lexers, formatters
-Pygments - Python syntax highlighting package
-Copyright (C) 2006 by the respective authors (see AUTHORS)
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Copyright (c) 2006 by the respective authors (see AUTHORS file).
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * The names of the contributors may not be used to endorse or
+      promote products derived from this software without specific
+      prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 - pygmentize presets?
 
-- short cmdline options for common -O options
+- short cmdline options for common ``-O`` options
 
 - html formatter: full document, external css file?
 
 
 - more unit tests (pygmentize, all formatters)
 
-- help for -O and -a cmdline options
+- help for ``-O`` and ``-a`` cmdline options
 
 - allow "overlay" token types (e.g. Diff + X) 
   - highlight specials: nth line, a word etc.
   - dhtml: overlays toggleable by javascript
 
 - lexers:
+    * bash
+    * haskell
     * (Q)BASIC
+    * lisp
     * apacheconf
     * python TBs
-    * haskell
     * ls -alG
-    * python help() ?
     * HTML with special formatting?
+    * latex special formatting?
     * ocaml
     * nemerle
-    * lisp
     * windows batch files
     * assembler
     * objective c
-    * bash
     * mysql/postgresql/sqlite
     * tcl
-    * latex special formatting?
+    * python help() ?
 
 - tell the PHP and DelphiLexer how to differ between Operators and
   text.
     Generates a bunch of html files containing the documentation.
 
     :copyright: 2006 by Armin Ronacher, Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import os

pygments/__init__.py

     is installable via *easy_install* with ``easy_install Pygments==dev``.
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher, Lukas Meuser and others.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 __version__ = '0.6'
 __docformat__ = 'restructuredtext'
-__license__ = 'GNU Lesser General Public License (LGPL)'
+__license__ = 'BSD License'
 __author__ = 'Georg Brandl <g.brandl@gmx.net>'
 __url__ = 'http://pygments.pocoo.org/'
 

pygments/console.py

     Format colored console output.
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 esc = "\x1b["

pygments/formatter.py

     Base formatter class.
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.util import get_bool_opt

pygments/formatters/__init__.py

     Pygments formatters.
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 import os.path
 from pygments.formatters.html import HtmlFormatter

pygments/formatters/bbcode.py

     BBcode formatter.
 
     :copyright: 2006 by Lukas Meuser.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 

pygments/formatters/html.py

     Formatter for HTML output.
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 import cStringIO
 

pygments/formatters/latex.py

     Formatter for LaTeX fancyvrb output.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 import cStringIO
 

pygments/formatters/other.py

     Other formatters: NullFormatter, RawTokenFormatter.
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.formatter import Formatter

pygments/formatters/terminal.py

     Formatter for terminal output with ANSI sequences.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.formatter import Formatter

pygments/lexer.py

     Base lexer classes.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 import re
 

pygments/lexers/__init__.py

     Pygments lexers.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 import fnmatch
 import types

pygments/lexers/_luabuiltins.py

     Do not edit the MODULES dict by hand.
 
     :copyright: 2006 by Lukas Meuser.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 MODULES = {'basic': ['_G',

pygments/lexers/_mapping.py

     Do not alter the LEXERS dictionary by hand.
 
     :copyright: 2006 by Armin Ronacher, Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 LEXERS = {

pygments/lexers/_phpbuiltins.py

              a server ;-)
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 

pygments/lexers/agile.py

 
     :copyright: 2006 by Georg Brandl, Armin Ronacher,
                 Lukas Meuser, Marek Kubica.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import re
             # find the remaining variables
             (valid_name, Name.Variable),
 
-            # the famous parantheses!
+            # the famous parentheses!
             (r'(\(|\))', Punctuation),
         ],
     }

pygments/lexers/compiled.py

     Lexers for compiled languages: C/C++, Delphi, Java.
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher, Christoph Hack.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import re

pygments/lexers/dotnet.py

     .net languages
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 import re
 

pygments/lexers/other.py

     Lexers for other languages: SQL, BrainFuck.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import re

pygments/lexers/special.py

     Special lexers.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import re

pygments/lexers/templates.py

     Lexers for various template engines.
 
     :copyright: 2006 by Armin Ronacher, Georg Brandl, Matt Good.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import re

pygments/lexers/text.py

     Lexers for non-source code file types: Diff, Makefiles, Ini configs etc.
 
     :copyright: 2006 by Armin Ronacher, Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import re

pygments/lexers/web.py

     Lexers for web-related languages: JavaScript, CSS, HTML, XML, PHP.
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import re

pygments/plugin.py

 
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 try:
     import pkg_resources

pygments/scanner.py

     this scanner.
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 import re
 

pygments/style.py

     Basic style object.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.token import Token, STANDARD_TYPES

pygments/styles/__init__.py

     Contains built-in styles.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 from pygments.plugin import find_plugin_styles
 

pygments/styles/autumn.py

     A colorful style, inspired by the terminal highlighting style.
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/borland.py

     Style similar to the style used in the borland ides.
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/colorful.py

     A colorful style, inspired by CodeRay.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/default.py

     The default highlighting style for Pygments.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/friendly.py

     A modern style based on the VIM pyte theme.
 
     :copyright: 2006 by Georg Brandl, Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/manni.py

     This is a port of the style used in the `php port`_ of pygments
     by Manni. The style is called 'default' there.
 
-    By now Mannis php highlighter isn't licensed under a open source
-    license but because it uses code from the pygments library it must
-    be LGPL compatible sooner or later. ;-)
-
-    .. _php port:: http://svn.fnord.name/manni/fnord.bb/lib/Highlighter/
-
     :copyright: 2006 by Armin Ronacher, Manni <manni@fnord.name>.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/murphy.py

     Murphy's style from CodeRay.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/native.py

     pygments version of my "native" vim theme.
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/pastie.py

     .. _pastie: http://pastie.caboo.se/
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/perldoc.py

     .. _perldoc: http://perldoc.perl.org/
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/styles/trac.py

     Port of the default trac highlighter design.
 
     :copyright: 2006 by Edgewall, Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from pygments.style import Style

pygments/token.py

     Basic token types and the standard tokens.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 class _TokenType(tuple):
     Utility functions.
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 import re
 

scripts/check_sources.py

 
     # check for copyright and license fields
     license = llist[-2:-1]
-    if license != ["    :license: GNU LGPL, see LICENSE for more details.\n"]:
+    if license != ["    :license: BSD, see LICENSE for more details.\n"]:
         yield 0, "no correct license info"
 
     ci = -3

scripts/find_abandoned_lexers.py

     to check the mimetypes, filename patterns and aliases too.
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 import re
 import sys

scripts/vim2pygments.py

     style classes meant for putting into modules.
 
     :copyright 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import sys
     zip_safe = False,
     include_package_data = True,
     classifiers = [
-        'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
+        'License :: OSI Approved :: BSD License',
         'Intended Audience :: Developers',
         'Intended Audience :: End Users/Desktop',
         'Intended Audience :: System Administrators',

tests/test_basic_api.py

     ~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import unittest

tests/test_clexer.py

     ~~~~~~~~~~~~~~~~~
 
     :copyright: 2006 by Armin Ronacher.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import unittest

tests/test_cmdline.py

     ~~~~~~~~~~~~~~~~~
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 # Test the command line interface

tests/test_examplefiles.py

     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: 2006 by Georg Brandl.
-    :license: GNU LGPL, see LICENSE for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 import unittest