From 394dfcc35b3dc5828e3546bd02db2f2a6bef625a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sun, 18 Dec 2011 22:46:27 +0000 Subject: [PATCH] lyx2lyx files: update GPL organization address and claim copyright also for the LyX team where it is necessary git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40523 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/lyx2lyx/LyX.py | 5 +++-- lib/lyx2lyx/generate_encoding_info.py | 2 +- lib/lyx2lyx/lyx2lyx | 7 ++++--- lib/lyx2lyx/lyx2lyx_version.py.in | 2 +- lib/lyx2lyx/parser_tools.py | 2 +- lib/lyx2lyx/profiling.py | 2 +- lib/lyx2lyx/test_parser_tools.py | 2 +- lib/lyx2lyx/unicode_symbols.py | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 23ef0d3195..878017dc4b 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -1,5 +1,6 @@ # This file is part of lyx2lyx # -*- coding: utf-8 -*- +# Copyright (C) 2002-2011 The LyX Team # Copyright (C) 2002-2004 Dekel Tsur # Copyright (C) 2002-2006 José Matos # @@ -15,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA " The LyX module has all the rules related with different lyx file formats." @@ -145,7 +146,7 @@ def trim_eol(line): def get_encoding(language, inputencoding, format, cjk_encoding): - " Returns enconding of the lyx file" + " Returns enconding of the LyX file" if format > 248: return "utf8" # CJK-LyX encodes files using the current locale encoding. diff --git a/lib/lyx2lyx/generate_encoding_info.py b/lib/lyx2lyx/generate_encoding_info.py index 211ea48405..6766ef0520 100644 --- a/lib/lyx2lyx/generate_encoding_info.py +++ b/lib/lyx2lyx/generate_encoding_info.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA """ This module parses lib/languages and prints it as a python dictionary, ready to use by other python modules""" diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx index c1c9f188d6..dbb31264f2 100755 --- a/lib/lyx2lyx/lyx2lyx +++ b/lib/lyx2lyx/lyx2lyx @@ -1,5 +1,6 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright (C) 2002-2011 The LyX Team # Copyright (C) 2002-2007 José Matos # Copyright (C) 2002-2004 Dekel Tsur # @@ -15,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA " Program used to convert between different versions of the lyx file format." import optparse @@ -27,7 +28,7 @@ def main(): args["usage"] = "usage: %prog [options] [file]" args["version"] = """lyx2lyx, version %s -Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__ +Copyright (C) 2011 The LyX Team, José Matos and Dekel Tsur""" % LyX.version__ args["description"] = """Convert old lyx file to newer format, files can be compressed with gzip. If there no file is specified then @@ -46,7 +47,7 @@ Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__ parser.add_option("--noisy", action="store_const", const=10, dest="debug") parser.add_option("-c", "--encoding", dest="cjk_encoding", - help="files in format 248 and lower are read and" + help="files in format 413 and lower are read and" " written in the format of CJK-LyX." "If encoding is not given or 'auto' the encoding" "is determined from the locale.") diff --git a/lib/lyx2lyx/lyx2lyx_version.py.in b/lib/lyx2lyx/lyx2lyx_version.py.in index 731ed0fb4c..e99da0bf64 100644 --- a/lib/lyx2lyx/lyx2lyx_version.py.in +++ b/lib/lyx2lyx/lyx2lyx_version.py.in @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA version = "@PACKAGE_VERSION@" diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py index cfc6a75433..47bee707ea 100644 --- a/lib/lyx2lyx/parser_tools.py +++ b/lib/lyx2lyx/parser_tools.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' diff --git a/lib/lyx2lyx/profiling.py b/lib/lyx2lyx/profiling.py index fbdb10a2c7..dd5cbeea00 100755 --- a/lib/lyx2lyx/profiling.py +++ b/lib/lyx2lyx/profiling.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # We need all this because lyx2lyx does not have the .py termination import imp diff --git a/lib/lyx2lyx/test_parser_tools.py b/lib/lyx2lyx/test_parser_tools.py index b1c84eea52..a8ef944df8 100644 --- a/lib/lyx2lyx/test_parser_tools.py +++ b/lib/lyx2lyx/test_parser_tools.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA " This modules tests the functions used to help parse lines." diff --git a/lib/lyx2lyx/unicode_symbols.py b/lib/lyx2lyx/unicode_symbols.py index 7f6d4bfb38..9df65e83f7 100644 --- a/lib/lyx2lyx/unicode_symbols.py +++ b/lib/lyx2lyx/unicode_symbols.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA " Import unicode_reps from this module for access to the unicode<->LaTeX mapping. " -- 2.39.5