Menu
▾
▴
[Zaf-commit] SF.net SVN: zaf:[9938] trunk/dict
|
From: <ta...@us...> - 2009-11-02 21:13:44
|
Revision: 9938
http://zaf.svn.sourceforge.net/zaf/?rev=9938&view=rev
Author: tagdev
Date: 2009-11-02 21:13:34 +0000 (Mon, 02 Nov 2009)
Log Message:
-----------
Updated the build framework to enable releases of Aspell 0.60 dictionaries (incorporating "aspell-lang" package version 20071024)
Modified Paths:
--------------
trunk/dict/README
trunk/dict/VERSION.aspell
trunk/dict/af/aspell/info.in
trunk/dict/en_ZA/aspell/info.in
trunk/dict/nr/aspell/info.in
trunk/dict/nso/aspell/info.in
trunk/dict/ss/aspell/info.in
trunk/dict/st/aspell/info.in
trunk/dict/sw/aspell/info.in
trunk/dict/tn/aspell/info.in
trunk/dict/ts/aspell/info.in
trunk/dict/utils/Makefile.language
trunk/dict/utils/aspell/README.aspell
trunk/dict/utils/aspell/configure
trunk/dict/utils/aspell/proc
trunk/dict/xh/aspell/info.in
trunk/dict/zu/aspell/info.in
Added Paths:
-----------
trunk/dict/af/aspell/VERSION.complete
trunk/dict/af/aspell/af.dat
trunk/dict/en_ZA/aspell/VERSION.complete
trunk/dict/en_ZA/aspell/en.dat
trunk/dict/nr/aspell/nr.dat
trunk/dict/nso/aspell/ns.dat
trunk/dict/ss/aspell/ss.dat
trunk/dict/st/aspell/st.dat
trunk/dict/sw/aspell/sw.dat
trunk/dict/tn/aspell/tn.dat
trunk/dict/ts/aspell/ts.dat
trunk/dict/xh/aspell/xh.dat
trunk/dict/zu/aspell/VERSION.complete
trunk/dict/zu/aspell/zu.dat
Modified: trunk/dict/README
===================================================================
--- trunk/dict/README 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/README 2009-11-02 21:13:34 UTC (rev 9938)
@@ -31,9 +31,9 @@
Prerequisites
============
-aspell - needs word-list-compress which is contained in the aspell package for
-your system. Other tools needed to package and build are located in the utils
-directory
+aspell - needs prezip-bin (since 0.60, was word-list-compress for 0.50),
+which is contained in the aspell package for your system. Other tools
+needed to package and build are located in the utils directory
myspell - the tools needed are in the utils directory
@@ -51,14 +51,17 @@
Copyright - details of the copyright holders etc. The actual copyright text
is added based on a line in the info.in file.
info.in - some basic definitions for the aspell package including copyright
-holders, license, language name etc. Check the Afrikaans one for a good
-understanding of its construction. If you need more details then look at the
-instructions in the latest aspell dictionary build system. ?URL?
-What can be problematic in this file is the "special" line:
+holders, license, language name etc.
+lang.dat - the language data file, used along with info.in.
+What can be problematic in the language data file is the "special" line:
special ' **- - -*- 4 -*- 6 -*-
It is simple to understand. The above says ' (apostrophe) is permissible at the
beginning of a word and the middle. - (dash) is allowed in the middle of a
word, etc
+Check the Afrikaans one for a good understanding of its construction. If
+you need more details then look at the README instructions in the latest
+aspell dictionary build system (the aspell-lang package):
+ ftp://ftp.gnu.org/gnu/aspell/aspell-lang-20071024.tar.bz2
myspell
-------
Modified: trunk/dict/VERSION.aspell
===================================================================
--- trunk/dict/VERSION.aspell 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/VERSION.aspell 2009-11-02 21:13:34 UTC (rev 9938)
@@ -1 +1 @@
-0.50
+0.60
Added: trunk/dict/af/aspell/VERSION.complete
===================================================================
--- trunk/dict/af/aspell/VERSION.complete (rev 0)
+++ trunk/dict/af/aspell/VERSION.complete 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1 @@
+1.{VERSION}-0
Property changes on: trunk/dict/af/aspell/VERSION.complete
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Copied: trunk/dict/af/aspell/af.dat (from rev 9890, trunk/dict/af/aspell/info.in)
===================================================================
--- trunk/dict/af/aspell/af.dat (rev 0)
+++ trunk/dict/af/aspell/af.dat 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1,4 @@
+name af
+charset iso-8859-1
+special ' **- - -*- 4 -*- 6 -*-
+soundslike none
Modified: trunk/dict/af/aspell/info.in
===================================================================
--- trunk/dict/af/aspell/info.in 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/af/aspell/info.in 2009-11-02 21:13:34 UTC (rev 9938)
@@ -1,4 +1,6 @@
name_english Afrikaans
+name_ascii Afrikaans
+name_native Afrikaans
lang af
author:
name Dwayne Bailey
@@ -8,11 +10,12 @@
email origen at icon co za
author:
name Renier de Vos
-copyright LGPL
+author:
+ name Tiaan A. Geldenhuys (Tiaan.com)
+copyright LGPLv2.1
version {VERSION}
-charset iso8859-1
-special ' **- - -*- 4 -*- 6 -*-
-soundslike none
+complete almost
+accurate unknown
alias af afrikaans
dict:
name af
Added: trunk/dict/en_ZA/aspell/VERSION.complete
===================================================================
--- trunk/dict/en_ZA/aspell/VERSION.complete (rev 0)
+++ trunk/dict/en_ZA/aspell/VERSION.complete 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1 @@
+1.{VERSION}-0
Property changes on: trunk/dict/en_ZA/aspell/VERSION.complete
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Copied: trunk/dict/en_ZA/aspell/en.dat (from rev 9890, trunk/dict/en_ZA/aspell/info.in)
===================================================================
--- trunk/dict/en_ZA/aspell/en.dat (rev 0)
+++ trunk/dict/en_ZA/aspell/en.dat 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1,4 @@
+name en
+charset iso-8859-1
+special ' *** - -*-
+soundslike none
Modified: trunk/dict/en_ZA/aspell/info.in
===================================================================
--- trunk/dict/en_ZA/aspell/info.in 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/en_ZA/aspell/info.in 2009-11-02 21:13:34 UTC (rev 9938)
@@ -1,13 +1,16 @@
name_english English
+name_ascii English
+name_native English
lang en
author:
name Dwayne Bailey
email dwayne at translate org za
-copyright LGPL
+author:
+ name Tiaan A. Geldenhuys (Tiaan.com)
+copyright LGPLv2.1
version {VERSION}
-charset iso8859-1
-special ' *** - -*-
-soundslike none
+complete almost
+accurate unknown
alias en english
dict:
name en
Modified: trunk/dict/nr/aspell/info.in
===================================================================
--- trunk/dict/nr/aspell/info.in 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/nr/aspell/info.in 2009-11-02 21:13:34 UTC (rev 9938)
@@ -3,11 +3,12 @@
author:
name Zuza Software Foundation
email info at translate org za
-copyright LGPL
+author:
+ name Tiaan A. Geldenhuys (Tiaan.com)
+copyright LGPLv2.1
version {VERSION}
-charset iso8859-1
-special ' **- - -*- 4 -*- 6 -*-
-soundslike none
+complete false
+accurate unknown
alias nr ndebele
dict:
name nr
Copied: trunk/dict/nr/aspell/nr.dat (from rev 9890, trunk/dict/nr/aspell/info.in)
===================================================================
--- trunk/dict/nr/aspell/nr.dat (rev 0)
+++ trunk/dict/nr/aspell/nr.dat 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1,4 @@
+name nr
+charset iso-8859-1
+special ' **- - -*- 4 -*- 6 -*-
+soundslike none
Modified: trunk/dict/nso/aspell/info.in
===================================================================
--- trunk/dict/nso/aspell/info.in 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/nso/aspell/info.in 2009-11-02 21:13:34 UTC (rev 9938)
@@ -3,11 +3,12 @@
author:
name Dwayne Bailey
email dwayne at translate org za
-copyright LGPL
+author:
+ name Tiaan A. Geldenhuys (Tiaan.com)
+copyright LGPLv2.1
version {VERSION}
-charset iso8859-15
-special - -*- ' -**
-soundslike none
+complete false
+accurate unknown
alias ns northern-sotho
dict:
name ns
Copied: trunk/dict/nso/aspell/ns.dat (from rev 9890, trunk/dict/nso/aspell/info.in)
===================================================================
--- trunk/dict/nso/aspell/ns.dat (rev 0)
+++ trunk/dict/nso/aspell/ns.dat 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1,4 @@
+name ns
+charset iso-8859-15
+special - -*- ' -**
+soundslike none
Modified: trunk/dict/ss/aspell/info.in
===================================================================
--- trunk/dict/ss/aspell/info.in 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/ss/aspell/info.in 2009-11-02 21:13:34 UTC (rev 9938)
@@ -3,11 +3,12 @@
author:
name Dwayne Bailey
email dwayne at translate org za
-copyright LGPL
+author:
+ name Tiaan A. Geldenhuys (Tiaan.com)
+copyright LGPLv2.1
version {VERSION}
-charset iso8859-1
-special - -*- ' -**
-soundslike none
+complete false
+accurate unknown
alias ss swati
dict:
name ss
Copied: trunk/dict/ss/aspell/ss.dat (from rev 9890, trunk/dict/ss/aspell/info.in)
===================================================================
--- trunk/dict/ss/aspell/ss.dat (rev 0)
+++ trunk/dict/ss/aspell/ss.dat 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1,4 @@
+name ss
+charset iso-8859-1
+special - -*- ' -**
+soundslike none
Modified: trunk/dict/st/aspell/info.in
===================================================================
--- trunk/dict/st/aspell/info.in 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/st/aspell/info.in 2009-11-02 21:13:34 UTC (rev 9938)
@@ -3,11 +3,12 @@
author:
name Dwayne Bailey
email dwayne at translate org za
-copyright LGPL
+author:
+ name Tiaan A. Geldenhuys (Tiaan.com)
+copyright LGPLv2.1
version {VERSION}
-charset iso8859-1
-special - -*- ' -**
-soundslike none
+complete false
+accurate unknown
alias st southern-sotho
dict:
name st
Copied: trunk/dict/st/aspell/st.dat (from rev 9890, trunk/dict/st/aspell/info.in)
===================================================================
--- trunk/dict/st/aspell/st.dat (rev 0)
+++ trunk/dict/st/aspell/st.dat 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1,4 @@
+name st
+charset iso-8859-1
+special - -*- ' -**
+soundslike none
Modified: trunk/dict/sw/aspell/info.in
===================================================================
--- trunk/dict/sw/aspell/info.in 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/sw/aspell/info.in 2009-11-02 21:13:34 UTC (rev 9938)
@@ -1,17 +1,18 @@
name_english Swahili
+name_ascii Kiswahili
+name_native Kiswahili
lang sw
-copyright LGPL
-version {VERSION}
-charset iso8859-1
-soundslike none
-special ' -*- - -*-
author:
name Jason M Githeko
email githeko at avo org
+author:
+ name Tiaan A. Geldenhuys (Tiaan.com)
+copyright LGPLv2.1
+version {VERSION}
+complete unknown
+accurate unknown
dict:
name sw
alias kiswahili
alias swahili
add sw
-name_ascii Kiswahili
-name_native Kiswahili
Copied: trunk/dict/sw/aspell/sw.dat (from rev 9890, trunk/dict/sw/aspell/info.in)
===================================================================
--- trunk/dict/sw/aspell/sw.dat (rev 0)
+++ trunk/dict/sw/aspell/sw.dat 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1,4 @@
+name sw
+charset iso-8859-1
+special ' -*- - -*-
+soundslike none
Modified: trunk/dict/tn/aspell/info.in
===================================================================
--- trunk/dict/tn/aspell/info.in 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/tn/aspell/info.in 2009-11-02 21:13:34 UTC (rev 9938)
@@ -7,13 +7,14 @@
author:
name Thapelo Otlogetswe
email Thapelo.Otlogetswe at itri brighton ac uk
-copyright GPL
+author:
+ name Tiaan A. Geldenhuys (Tiaan.com)
+copyright GPLv2
version {VERSION}
url http://borel.slu.edu/crubadan/index.html
-source-version 1.0
-charset iso8859-2
-special ' -*- - -*- ` -*-
-soundslike generic
+source_version 1.0
+complete false
+accurate unknown
alias tn setswana tswana
dict:
name tn
Copied: trunk/dict/tn/aspell/tn.dat (from rev 9890, trunk/dict/tn/aspell/info.in)
===================================================================
--- trunk/dict/tn/aspell/tn.dat (rev 0)
+++ trunk/dict/tn/aspell/tn.dat 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1,4 @@
+name tn
+charset iso-8859-15
+special ' -*- - -*- ` -*-
+soundslike generic
Modified: trunk/dict/ts/aspell/info.in
===================================================================
--- trunk/dict/ts/aspell/info.in 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/ts/aspell/info.in 2009-11-02 21:13:34 UTC (rev 9938)
@@ -3,11 +3,12 @@
author:
name Zuza Software Foundation (Translate.org.za)
email info at translate org za
-copyright LGPL
+author:
+ name Tiaan A. Geldenhuys (Tiaan.com)
+copyright LGPLv2.1
version {VERSION}
-charset iso8859-1
-special - -*- ' -*-
-soundslike none
+complete false
+accurate unknown
alias ts tsonga
dict:
name ts
Copied: trunk/dict/ts/aspell/ts.dat (from rev 9890, trunk/dict/ts/aspell/info.in)
===================================================================
--- trunk/dict/ts/aspell/ts.dat (rev 0)
+++ trunk/dict/ts/aspell/ts.dat 2009-11-02 21:13:34 UTC (rev 9938)
@@ -0,0 +1,4 @@
+name ts
+charset iso-8859-1
+special - -*- ' -*-
+soundslike none
Modified: trunk/dict/utils/Makefile.language
===================================================================
--- trunk/dict/utils/Makefile.language 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/utils/Makefile.language 2009-11-02 21:13:34 UTC (rev 9938)
@@ -10,6 +10,26 @@
VERSION=$(shell cat VERSION)
VERSION_ASPELL=$(shell cat ../VERSION.aspell)
+# Select the Aspell "mode" (see the README file of the "aspell-lang"
+# package). Currently, only the default value corresponding with
+# "aspell6" (i.e., aspell version 0.60.x) is really implemented yet.
+# Also set additional Aspell-related variables, such as the full package
+# version, which uses either a default prefix/suffix versioning scheme
+# or the explicit full version specified using a "VERSION.complete"
+# file that can be placed in the language's aspell subdirectory.
+ifeq ($(VERSION_ASPELL),0.50)
+ASPELL_MODE=aspell5
+else
+ASPELL_MODE=aspell6
+endif
+ifeq ($(strip $(wildcard aspell/VERSION.complete)),)
+ASPELL_PACK_VER=0.$(VERSION)-0
+else
+ASPELL_PACK_VER=$(shell sed "s/{VERSION}/$(VERSION)/" < aspell/VERSION.complete)
+endif
+ASPELL_PACK_NAME=$(ASPELL_MODE)-$(LANG)-$(ASPELL_PACK_VER)
+ASPELL_DIST_NAME=$(ASPELL_PACK_NAME).tar.bz2
+
# KAM 2009-08
ifdef REGION
@@ -33,7 +53,7 @@
TARGETS_ISPELL=ispell/$(LANGNAMELOW).hash ispell/$(LANGNAMELOW)-ispell-$(VERSION).tar.bz2 ispell/wordlist.$(CHARSET) ispell/wordlist.$(CHARSET).cnt ispell/wordlist.$(CHARSET).stat
-TARGET_ASPELL=aspell/wordlist.$(CHARSET) aspell/$(LANG).rws aspell/aspell-$(LANG)-$(VERSION_ASPELL)-$(VERSION).tar.bz2 aspell/proc aspell/configure aspell/$(LANG).cwl aspell/info aspell/Makefile aspell/Makefile.pre aspell/$(LANG).* aspell/*.alias aspell/COPYING aspell/README aspell/aspell-$(LANG)-$(VERSION_ASPELL)-$(VERSION)
+TARGET_ASPELL=aspell/$(LANG).wl aspell/$(LANG).rws aspell/$(ASPELL_DIST_NAME) aspell/proc aspell/configure aspell/$(LANG).cwl aspell/info aspell/Makefile aspell/Makefile.pre aspell/$(LANG).multi aspell/*.alias aspell/COPYING aspell/README aspell/$(ASPELL_PACK_NAME)
TARGETS_HUNSPELL=hunspell/wordlist.$(CHARSET) hunspell/pack-$(LANG)-$(REGION)-$(VERSION).zip hunspell/$(LANG)_$(REGION).zip hunspell/$(LANG)_$(REGION).dic hunspell/$(LANG)_$(REGION)_unalias.dic hunspell/$(LANG)_$(REGION).aff hunspell/spell.txt hunspell/VERSION_$(LANG)_$(REGION).txt
@@ -190,30 +210,27 @@
# Aspell Rules
-aspell: aspell/aspell-$(LANG)-$(VERSION_ASPELL)-$(VERSION).tar.bz2
+aspell: aspell/$(ASPELL_DIST_NAME)
clean-aspell:
rm -rf $(TARGET_ASPELL)
-aspell/$(LANG).cwl: aspell/wordlist.$(CHARSET)
- (export LC_COLLATE=C; cat $< | sort -u | word-list-compress compress > $@)
-
aspell/proc: ../utils/aspell/proc
cp -p $< $@
aspell/configure: ../utils/aspell/configure
cp -p $< $@
-aspell/wordlist.$(CHARSET): wordlists/wordlist.$(CHARSET)
+aspell/$(LANG).wl: wordlists/wordlist.$(CHARSET)
cat $< | egrep -v '(^#| |\.|-$$|[0-9]|/|=$$)' | LC_COLLATE=C sort --unique >$@
-aspell/aspell-$(LANG)-$(VERSION_ASPELL)-$(VERSION).tar.bz2: aspell/$(LANG).cwl aspell/configure aspell/Makefile.pre aspell/Copyright
- cd aspell; ./configure; make dist && make distcheck && rm -rf aspell-$(LANG)-$(VERSION_ASPELL)-$(VERSION)
+aspell/$(ASPELL_DIST_NAME): aspell/$(LANG).wl aspell/configure aspell/Makefile.pre aspell/Copyright
+ cd aspell; ./configure; make dist && make distcheck && rm -rf $(ASPELL_PACK_NAME)
aspell/info: aspell/info.in ../VERSION.aspell VERSION
- sed "s/{VERSION}/$(VERSION_ASPELL)\-$(VERSION)/" < $< > $@
+ sed "s/{VERSION}/$(ASPELL_PACK_VER)/" < $< > $@
-aspell/Makefile.pre: aspell/proc aspell/info
+aspell/Makefile.pre: aspell/proc aspell/info aspell/$(LANG).dat
(cd aspell; export LC_COLLATE=C; ./proc create)
# Hunspell rules
Modified: trunk/dict/utils/aspell/README.aspell
===================================================================
--- trunk/dict/utils/aspell/README.aspell 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/utils/aspell/README.aspell 2009-11-02 21:13:34 UTC (rev 9938)
@@ -1,4 +1,4 @@
Aspell needs these files:
-proc & configure - ftp://ftp.gnu.org/gnu/aspell/dict/0gen/aspell-gen-0.50.4.tar.bz2
+proc & configure - ftp://ftp.gnu.org/gnu/aspell/aspell-lang-20071024.tar.bz2
Generates the files needed for an aspell dictionary package
Modified: trunk/dict/utils/aspell/configure
===================================================================
--- trunk/dict/utils/aspell/configure 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/utils/aspell/configure 2009-11-02 21:13:34 UTC (rev 9938)
@@ -54,7 +54,7 @@
--help)
echo "Usage: ./configure [--help | --vars VAR1=VAL1 ...]"
echo " Note: Variables may also be set in the environment brefore running config"
- echo " Useful vars: ASPELL ASPELL_PARMS WORD_LIST_COMPRESS DESTDIR"
+ echo " Useful vars: ASPELL ASPELL_PARMS PREZIP DESTDIR"
exit 0
;;
*)
@@ -67,8 +67,8 @@
#echo $ASPELL
if test x = "x$ASPELL"
then ASPELL=aspell; fi
-if test x = "x$WORD_LIST_COMPRESS"
- then WORD_LIST_COMPRESS=word-list-compress; fi
+if test x = "x$PREZIP"
+ then PREZIP=prezip-bin; fi
#echo $ASPELL
echo $ECHO_N "Finding Dictionary file location ... $ECHO_C"
@@ -81,7 +81,7 @@
echo "ASPELL = `which $ASPELL`" > Makefile
echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile
-echo "WORD_LIST_COMPRESS = `which $WORD_LIST_COMPRESS`" >> Makefile
+echo "PREZIP = `which $PREZIP`" >> Makefile
echo "DESTDIR = $DESTDIR" >> Makefile
echo "dictdir = $dictdir" >> Makefile
echo "datadir = $datadir" >> Makefile
Modified: trunk/dict/utils/aspell/proc
===================================================================
--- trunk/dict/utils/aspell/proc 2009-11-02 20:52:41 UTC (rev 9937)
+++ trunk/dict/utils/aspell/proc 2009-11-02 21:13:34 UTC (rev 9938)
@@ -2,22 +2,32 @@
################################################################
#
-# Aspell Word List Package proc script
-# Copyright 2001,2002,2004 under the GNU Lesser General Public License (LGPL)
+# Aspell Word List Package proc
+# Copyright 2001-2007 under the GNU Lesser General Public License (LGPL)
+# version 2.1
+# 2004-08-10
#
use Data::Dumper;
+use IO::File;
+use Encode qw(is_utf8 decode_utf8 encode_utf8 decode encode resolve_alias);
+
+use utf8;
+use open ':utf8';
+
use strict;
use warnings;
-no warnings qw(uninitialized);
+no warnings qw(uninitialized utf8);
no locale;
-my $VERSION = "0.50.4";
+my $VERSION = "0.60.4";
my $action = 'create';
my $check_mode = 'safe';
+my $UTF8 = resolve_alias 'utf-8';
+
foreach my $arg (@ARGV) {
$arg =~ s/^-*//;
if ($arg eq 'check' || $arg eq 'create') {
@@ -88,13 +98,22 @@
return join '', map {" $_\n"} @_;
}
+sub try_read ( $ ) {
+ my $IN;
+ my $res = open $IN, "$_[0]";
+ close $IN;
+ error_message ("Unable to read the file $_[0]") unless $res;
+ return $res;
+}
+
################################################################
#
# insr initialization
#
-my ($key,$val,$info,$insr,@authors,%dicts,%copying);
-my $lang = "[a-z]{2}";
+my ($key,$val,$info,$insr,@authors,%alt_encodings,%dicts,%copying,%files);
+my $lang;
+my $mode;
my $version;
sub lower() {["[a-z]+",
@@ -110,7 +129,7 @@
sub any() {[".+","ERROR"]}
sub generic() {"is not in the proper format"}
-sub dict() {return ["$lang(_[A-Z]{2}|)(|-[a-z0-9-]+)(-[0-9]{2}|)",
+sub dict() {return ["$lang(_[A-Z]{2}|)(|-[a-z0-9_-]+)(-[0-9]{2}|)",
generic]}
sub split_dict ( $ ) {my $dict = dict->[0];
@@ -132,11 +151,15 @@
my %aliases_to;
my %global_info;
my %global_insr =
- (default_fill_order => [qw (name_ascii name_native strip_accents)],
- author =>
+ (default_fill_order => [qw (name_ascii name_native strip_accents doc_encoding mode)],
+ mode => {required=>false,
+ oneof=>['aspell5', 'aspell6'],
+ default=>'aspell6'},
+ author =>
{
singular => false,
name => {check=>any},
+ name_native => {check=>any, required=>false},
email => {required=>false, check=>[".+ at .+",generic]},
maintainer => {required=>false,
oneof=>['true', 'false'], default=>'false'},
@@ -146,6 +169,8 @@
}
},
copyright => {oneof => ["LGPL", "GPL", "FDL", "LGPL/GPL", # FSF Licenses
+ "LGPLv2.1", "GPLv2", "LGPLv3", "GPLv3",
+ "FDLv1.1", "FDLv1.2",
"Artistic", # Perl Artistic Licence
"Copyrighted", # Copyright message must remain
"Open Source", # Meets OSI defination
@@ -160,37 +185,52 @@
url => {required=>false},
source_url => {required=>false},
source_version => {required=>false},
- name_english => {check=>["[A-Z][a-z]+( [A-Z][a-z]+)*",generic]},
+ name_english => {check=>["[A-Z][a-z]+([ -]+[A-Z][a-z]+)*",generic]},
name_ascii => {default => "=name_english"},
name_native => {default => "=name_ascii", check=>any},
- lang => {check => ["[a-z]{2,3}",
+ lang => {check => ["[a-z]{2,3}(|_[A-Z]{2})(|-[a-z0-9]+)",
"must consist of two or three lowercase ASCII characters"],
- code => sub {$lang = $val},
- store => true
- },
- readme_file => {required=>false, check=> upper,
- normal=>"README", generate => sub {README}},
- copying_file => {required=>false, check=> upper, normal=>"COPYING",
+ code => sub {
+ $lang = $val;
+ try_read "$lang.dat";
+ push @{$files{data}}, "$lang.dat";
+ },
+ store => true
+ },
+ doc_encoding => {default => $UTF8, store=>true,
+ code => sub {
+ my $enc = resolve_alias $val;
+ error "The encoding \"$val\" is not known" unless $enc;
+ }},
+ alt_encoding => {required => false,
+ check=> ['\S+ \S+', generic],
+ code => sub {
+ $val =~ /^(\S+) (\S+)/ or die;
+ my $enc = resolve_alias $1;
+ error "The encoding \"$1\" is not known" unless $enc;
+ $alt_encodings{$enc} = $2;
+ }},
+ data_file => {required => false,
+ code => sub {
+ try_read $val;
+ push @{$files{data}}, $val;
+ }},
+ readme_file => {required => false, check=> upper,
+ normal=>"README", generate => sub {README}},
+ readme_extra => {required => false, store=> true,
+ code => sub {
+ my ($file) = $val =~ /^(.+?)(| .+)$/;
+ try_read "doc/$file";
+ }},
+ copying_file => {required=>false, check=> upper, normal=>"COPYING",
generate => sub {$copying{$info->{copyright}}}},
copyright_file => {required=>false, check=> upper,
normal=>"Copyright"},
- charset =>
- {
- oneof => [qw(iso8859-1 iso8859-2 iso8859-3 iso8859-4 iso8859-5
- iso8859-6 iso8859-7 iso8859-8 iso8859-9 iso8859-10
- iso8859-14 iso8859-15
- koi8-f koi8-r koi8-u viscii)]
- },
- special => {required => false},
- soundslike => {oneof => ['generic','phonet','none']},
- keyboard => {required => false},
- run_together => {required => false},
- run_together_limit => {required => false},
- run_together_min => {required => false},
- run_together_mid => {required => false},
- strip_accents => {default => 'false', oneof => ['true','false']},
- alias =>
- {check => any,
+ complete => {oneof => [qw(true almost false unknown)]},
+ accurate => {oneof => [qw(true false unknown)]},
+ notes => {required => false},
+ alias =>
+ {check => any,
code => sub {
error "The \"lang\" entry must be defined before any global aliases."
unless exists $global_info{lang};
@@ -205,7 +245,6 @@
}
push @{$aliases_from{$d[0]}}, @d[1..$#d];
}
-
},
dict =>
{
@@ -257,7 +296,8 @@
return $inf;
}
}
- );
+ );
+my %copyright_map = qw(LGPL LGPLv2.1 GPL GPLv2 FDL FDLv1.1);
sub doc_entries() {qw (readme_file copying_file copyright_file)}
@@ -306,6 +346,7 @@
$info = \%global_info;
$insr = \%global_insr;
$line = 0;
+
while (<IN>) {
++$line;
@@ -368,14 +409,22 @@
die "There were $error_count errors with the info file, aborting.\n" if $error_count > 0;
+if (exists $copyright_map{$info->{copyright}}) {
+ error_message("Unversioned copyright \"$info->{copyright}\" is deprecated using \"$copyright_map{$info->{copyright}}\".",
+ {warn => true});
+ # FIXME: Make Warning
+ $info->{copyright} = $copyright_map{$info->{copyright}}
+}
+
sub handle_key() {
my $check = $key_insr->{check};
+ error "The value \"$val\" for $key is not valid UTF-8."
+ unless is_utf8($val, 1);
$check = &$check if ref $check eq 'CODE';
error "The value for $key $check->[1]$multi_message."
if $val !~ /^$check->[0]$/;
error "The value for $key is not one of: ".join(', ',@{$key_insr->{oneof}})
if exists $key_insr->{oneof} && !memberof($val, $key_insr->{oneof});
-
if ($key_insr->{store}) {
error "A value for $key already defined$multi_message."
if exists $info->{$key};
@@ -469,6 +518,37 @@
$date = sprintf "%04d-%02d-%02d",$date{year},$date{month}+1,$date{day};
}
+$mode = $info->{mode};
+
+my ($prezip, $prezip_c, $prezip_d, $aspell_version, $cwl_note);
+if ($mode eq 'aspell5') {
+ $prezip = "word-list-compress";
+ $prezip_c = " c";
+ $prezip_d = " d";
+ $aspell_version = '0.50';
+ $cwl_note = <<"---";
+The individual word lists have an extension of ".cwl" and are
+compressed to save space. To uncompress a word list use
+"word-list-compress < BASE.cwl > BASE.wl" or simply
+"word-list-compress < BASE.cwl" to dump it to standard output.
+---
+} else {
+ $prezip = "prezip-bin";
+ $prezip_c = " -z";
+ $prezip_d = " -d";
+ $aspell_version = '0.60';
+ $cwl_note = <<"---";
+The individual word lists have an extension of ".cwl" and are
+compressed to save space. To uncompress a word list use
+"preunzip BASE.cwl" which will uncompress it and rename the file
+to "BASE.wl". To dump a compressed word list to standard output use
+"precat BASE.cwl". To uncompress all word lists in the current
+directory use "preunzip *.cwl". For more help on "preunzip" use
+"preunzip --help".
+---
+}
+chop $cwl_note;
+
################################################################
#
# Finish processing
@@ -508,8 +588,6 @@
while (my $key = shift @toproc) {
my $val = $dicts{$key};
- $val->{ext} = $val->{awli} eq 'true' ? 'multi' : 'alias';
-
my @d = split_dict $key;
next unless @d;
@@ -632,6 +710,11 @@
$val->{is_alias} = (@{$val->{insr}} == 1
&& $val->{dicts}[0]{type} eq 'multi');
+
+ $val->{ext} = $val->{awli} eq 'true' ? 'multi' : 'alias';
+ #$val->{ext} = ($mode eq 'aspell5'
+ # ? ($val->{awli} eq 'true' ? 'multi' : 'alias')
+ # : $val->{is_alias} ? 'alias' : 'multi');
}
unshift @{$val->{insr}}, "strip-accents true"
@@ -642,7 +725,6 @@
my $val = $dicts{$_[0]};
return $val->{equivalent_to} if exists $val->{equivalent_to};
if (@{$val->{insr}} == 1 && $val->{dicts}[0]{type} eq 'multi') {
-
$val->{equivalent_to} = &find_equivalent_to($val->{dicts}[0]{name});
push @{$val->{equivalent_to}}, $_[0];
} else {
@@ -664,45 +746,39 @@
return map {"$_->{name}.$_->{type}"} @{$dicts{$name}->{dicts}};
};
-sub try_read ( $ ) {
- my $res = open IN, "$_[0]";
- close IN;
- error_message ("Unable to read the file $_[0]") unless $res;
- return $res;
-}
-
my $word_list_compress_working =
- system("word-list-compress 2> /dev/null") != -1 ? true : false;
-error_message("Unable to execute word-list-compress. I will not be able "
- ."to check the integrity of the *.cwl files.")
+ system("$prezip > /dev/null 2> /dev/null") != -1 ? true : false;
+error_message("Unable to execute prezip-bin. I will not be able "
+ ."to check the integrity of the *.cwl files.")
unless $word_list_compress_working;
-foreach my $wl (keys %word_lists) {
- try_read "$wl.cwl" or next;
- next unless $word_list_compress_working;
- if ($check_mode ne 'unsafe') {
- open IN, "word-list-compress d < $wl.cwl|" or die;
+if ($check_mode ne 'unsafe' && $word_list_compress_working) {
+ foreach my $wl (keys %word_lists) {
+ next unless -e "$wl.cwl";
+ open IN, "$prezip$prezip_d < $wl.cwl|" or die;
+ if (eof IN) {
+ error_message "No data received from $prezip.";
+ last;
+ }
my $prev = '';
while (<IN>) {
+ chop;
if ($prev gt $_) {
- error_message ("The file $wl.cwl is not in the proper format. "
- ."Did you remember to set LC_COLLATE to C before sorting "
- ."and compressing with \"word-list-compress c\".");
- last;
+ error_message ("The file $wl.cwl is not in the proper format. "
+ ."Did you remember to set LC_COLLATE to C before sorting "
+ ."and compressing with \"$prezip\".");
+ last;
} elsif ($prev eq $_) {
- error_message ("The file $wl.cwl contains duplicates. "
- ."Sort with \"sort -u\" to remove them.");
- last;
+ print "'$prev' eq '$_'";
+ error_message ("The file $wl.cwl contains duplicates. "
+ ."Sort with \"sort -u\" to remove them.");
+ last;
}
$prev = $_;
}
}
}
-if ($info->{soundslike} eq 'phonet') {
- try_read "${lang}_phonet.dat";
-}
-
foreach my $key (doc_entries) {
my $file;
if (exists $info->{$key}) {
@@ -780,30 +856,17 @@
# Create files
#
-my (%files, $make);
+my $make;
$files{extra} = ['configure', 'info', 'Makefile.pre'];
-push @{$files{data}}, "$lang.dat";
-push @{$files{data}}, "${lang}_phonet.dat"
- if $info->{soundslike} eq 'phonet';
-
$info->{name} = $lang;
-$info->{soundslike} = $lang if $info->{soundslike} eq 'phonet';
-open OUT, ">$lang.dat";
-print OUT "# Generated with Aspell Dicts \"proc\" script version $VERSION\n";
+my $doc_encoding = resolve_alias $info->{doc_encoding};
+die unless $doc_encoding; # FIXME
+delete $alt_encodings{$doc_encoding};
+$alt_encodings{$UTF8}='utf8' if $doc_encoding ne $UTF8;
-foreach my $key (qw(name charset special soundslike keyboard
- run_together run_together_limit
- run_together_min run_together_mid)) {
- next unless exists $info->{$key};
- my $akey = $key;
- $akey =~ tr/_/-/;
- print OUT "$akey $info->{$key}\n";
-}
-close OUT;
-
foreach my $key (doc_entries) {
my $specific = $info->{$key};
@@ -825,12 +888,21 @@
next unless defined $data;
- open OUT, ">$normal";
+ open OUT, ">:encoding($doc_encoding)", "$normal";
print OUT $data;
close OUT;
-
push @{$files{doc}}, $normal;
+ while (my ($enc, $ext) = each %alt_encodings) {
+ my $d = encode($enc, $data);
+ my $d2 = encode($doc_encoding, $data);
+ next if $d eq $d2;
+ open OUT, ">:bytes", "$normal.$ext";
+ print OUT $d;
+ close OUT;
+ push @{$files{doc}}, "$normal.$ext";
+ }
+
} else {
push @{$files{doc}}, $normal;
@@ -859,11 +931,17 @@
$make .= <<"---";
-.SUFFIXES: .cwl .rws
+.SUFFIXES: .cwl .rws .wl
.cwl.rws:
- \${WORD_LIST_COMPRESS} d < \$< | \${ASPELL} \${ASPELL_FLAGS} --lang=$lang create master ./\$@
+ \${PREZIP}$prezip_d < \$< | \${ASPELL} \${ASPELL_FLAGS} --lang=$lang create master ./\$@
+.wl.cwl:
+ cat \$< | LC_COLLATE=C sort -u | \${PREZIP}$prezip_c > \$@
+
+.pz:
+ \${PREZIP}$prezip_d < \$< > \$@
+
---
open OUT, ">Makefile.pre";
@@ -878,10 +956,9 @@
print OUT "${_}_files = ", join(' ', @{$files{$_}}), "\n";
}
print OUT "\n";
+print OUT "distdir=$mode-\${lang}-\${version}\n\n";
+
print OUT << '---';
-
-distdir=aspell-${lang}-${version}
-
all: ${rws_files} ${data_files}
install: all
@@ -899,13 +976,13 @@
rm -f Makefile
maintainer-clean: distclean
- rm -f ${multi_files} Makefile.pre
+ rm -f ${multi_files} configure Makefile.pre
uninstall:
-cd ${DESTDIR}${dictdir}/ && rm ${rws_files} ${multi_files} ${link_files}
-cd ${DESTDIR}${datadir}/ && rm ${data_files}
-dist:
+dist: ${cwl_files}
perl proc
./configure
@make dist-nogen
@@ -914,7 +991,8 @@
-rm -r ${distdir}.tar.bz2 ${distdir}
mkdir ${distdir}
cp -p ${extra_files} ${cwl_files} ${multi_files} ${doc_files} ${data_files} ${distdir}/
- -cp -pr doc/ ${distdir}/
+ -test -e doc && mkdir ${distdir}/doc && chmod 755 ${distdir}/doc && cp -pr doc/* ${distdir}/doc/
+ -test -e misc && mkdir ${distdir}/misc && chmod 755 ${distdir}/misc && cp -pr misc/* ${distdir}/misc/
tar cf ${distdir}.tar ${distdir}/
bzip2 -9 ${distdir}.tar
rm -r ${distdir}/
@@ -931,21 +1009,123 @@
print OUT $make;
+open OUT, ">configure";
+
+print OUT <<"---";
+#!/bin/sh
+
+# Note: future version will have a syntax something like
+# ./configure [OPTIONS]
+# Where OPTIONS is any of:
+# --help
+# --codes CODE1 ...
+# --sizes SIZE1 ...
+# --jargons JARGON1 ...
+# --extras EXTRA1 ...
+# --vars VAR1=VAL1 ...
+# which is why I warn when --vars is not used before VAR1=VAL1
+
+# Avoid depending upon Character Ranges.
+# Taken from autoconf 2.50
+cr_az='abcdefghijklmnopqrstuvwxyz'
+cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+cr_09='0123456789'
+cr_alnum=\$cr_az\$cr_AZ\$cr_09
+
+# also taken form autoconf
+case `echo "testing\\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\\c' ECHO_T= ;;
+esac
+
+
+mode=none
+for option
+do
+ case \$option in
+ --vars)
+ mode=vars
+ ;;
+ *=*)
+ if test \$mode != vars; then
+ echo "Warning: future versions will require --vars before variables are set"
+ mode=vars
+ fi
+ # Taken from autoconf 2.50
+ envvar=`expr "x\$option" : 'x\\([^=]*\\)='`
+ optarg=`expr "x\$option" : 'x[^=]*=\\(.*\\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x\$envvar" : ".*[^_\$cr_alnum]" >/dev/null &&
+ { echo "\$as_me: error: invalid variable name: \$envvar" >&2
+ { (exit 1); exit 1; }; }
+ #echo \$envvar \$optarg
+ optarg=`echo "\$optarg" | sed "s/'/'\\\\\\\\\\\\\\\\''/g"`
+ eval "\$envvar='\$optarg'"
+ export \$envvar
+ ;;
+ --help)
+ echo "Usage: ./configure [--help | --vars VAR1=VAL1 ...]"
+ echo " Note: Variables may also be set in the environment brefore running config"
+ echo " Useful vars: ASPELL ASPELL_PARMS PREZIP DESTDIR"
+ exit 0
+ ;;
+ *)
+ echo "Error: unrecognized option \$option";
+ exit 1
+ ;;
+ esac
+done
+
+#echo \$ASPELL
+if test x = "x\$ASPELL"
+ then ASPELL=aspell; fi
+if test x = "x\$PREZIP"
+ then PREZIP=$prezip; fi
+#echo \$ASPELL
+
+echo \$ECHO_N "Finding Dictionary file location ... \$ECHO_C"
+dictdir=`\$ASPELL dump config dict-dir`
+echo \$dictdir
+
+echo \$ECHO_N "Finding Data file location ... \$ECHO_C"
+datadir=`\$ASPELL dump config data-dir`
+echo \$datadir
+
+echo "ASPELL = `which \$ASPELL`" > Makefile
+echo "ASPELL_FLAGS = \$ASPELL_FLAGS" >> Makefile
+echo "PREZIP = `which \$PREZIP`" >> Makefile
+echo "DESTDIR = \$DESTDIR" >> Makefile
+echo "dictdir = \$dictdir" >> Makefile
+echo "datadir = \$datadir" >> Makefile
+echo >> Makefile
+cat Makefile.pre >> Makefile
+---
+
close OUT;
+chmod 0755, 'configure';
sub README() {
+ my $lang_name = $info->{name_english};
+ $lang_name .= " ($info->{name_native})" if $info->{name_native} ne $info->{name_english};
my $maintainer_list;
my $author_list;
foreach (@authors) {
my $which = $_->{maintainer} eq 'true' ? \$maintainer_list : \$author_list;
$$which .= " $_->{name}";
- $$which .= " ($_->{email})" if exists $_->{email};
+ $$which .= " ($_->{name_native})" if exists $_->{name_native};
+ $$which .= " <$_->{email}>" if exists $_->{email};
$$which .= "\n";
}
my $author_info;
- $author_info = "Maintained By:\n$maintainer_list" if $maintainer_list;
- $author_info = "Original Word List By:\n$author_list" if $author_list;
+ if ($maintainer_list) {
+ $author_info = "Maintained By:\n$maintainer_list";
+ $author_info .= "Original Word List Also By:\n$author_list" if $author_list;
+ } else {
+ $author_info = "Original Word List By:\n$author_list";
+ }
chop $author_info;
my $dict_list;
foreach my $key (sort keys %dicts) {
@@ -975,17 +1155,30 @@
$extra_info .= "Wordlist URL: $info->{url}\n" if exists $info->{url};
$extra_info .= "Source Verson: $info->{source_version}\n" if exists $info->{source_version};
$extra_info .= "Source URL: $info->{source_url}\n" if exists $info->{source_url};
- return <<"---"
-GNU Aspell $info->{name_english} Word List Package
+
+ if ($info->{complete} eq 'true' && $info->{accurate} eq 'true') {
+ $extra_info .= "This word list is considered both complete and accurate.\n";
+ } elsif ($info->{complete} eq 'true' && $info->{accurate} eq 'false') {
+ $extra_info .= "This word list is considered complete but inaccurate.\n";
+ } elsif ($info->{complete} eq 'false' && $info->{accurate} eq 'true') {
+ $extra_info .= "This word list is considered accurate but incomplete.\n";
+ } elsif ($info->{complete} eq 'true') {
+ $extra_info .= "This word list is considered complete.\n";
+ } elsif ($info->{accurate} eq 'true') {
+ $extra_info .= "This word list is considered accurate.\n";
+ }
+
+ my $readme = <<"---";
+GNU Aspell $aspell_version $lang_name Dictionary Package
Version $version
$date
-by Kevin Atkinson (kevina\@gnu.org)
$author_info
Copyright Terms: $info->{copyright} (see the file Copyright for the exact terms)
$extra_info
-This is the Aspell word list for $info->{name_english}.
+This is the $info->{name_english} dictionary for Aspell. It requires Aspell
+version $aspell_version or better.
-If Aspell is installed and aspell and word-list-compress are all
+If Aspell is installed and aspell and $prezip are all
in the path first do a:
./configure
@@ -1003,7 +1196,7 @@
make install
If any of the above mentioned programs are not in your path than the
-variables, ASPELL and/or WORD_LIST_COMPRESS need to be set to the
+variables, ASPELL and/or PREZIP need to be set to the
commands (with path) to run the utilities. These variables may be set
in the environment before configure is run or specified at the command
line using the following syntax
@@ -1016,36 +1209,60 @@
To uninstall the files:
make uninstall
-After the word lists are installed you can use the main one ($lang) by
+After the dictionaries are installed you can use the main one ($lang) by
setting the LANG environmental variable to $lang or running Aspell
-with --lang=$lang. You may also chose the dictionary directly
-with the -d or --master option of Aspell. You can chose from any of
+with "--lang=$lang". You may also chose the dictionary directly
+with the "-d" or "--master" option of Aspell. You can chose from any of
the following dictionaries:
$dict_list
Whereas the names in parentheses are alternate names for the
dictionary preceding the parentheses.
+$cwl_note
+
If you have any problem with installing or using the word lists please
-let me (Kevin Atkinson) know.
+let the Aspell maintainer, Kevin Atkinson, know at kevina\@gnu.org.
If you have problems with the actual word lists please contact one of
-the Word lists authors as I do not maintain the actual Word Lists.
+the Word lists authors as the Aspell maintainer does not maintain the
+actual Word Lists.
Any additional documentation that came with the original word list can
be found in the doc/ directory.
---
+ if (exists $info->{readme_extra}) {
+ #$readme .= "A $info->{name_english} version of the above follows ";
+ #$readme .= "with any special instructions:\n\n";
+ my ($file, $enc) = $info->{readme_extra} =~ /^(.+?)(?:| (.+))$/;
+ $enc = $UTF8 unless length $enc > 0;
+ open RF, '<:bytes', "doc/$file";
+ while (<RF>) {
+ if ($enc eq $UTF8) {
+ if (!is_utf8($_, 1)) {
+ error_message "The file $file contains an invalid UTF-8 sequence.";
+ last;
+ }
+ $readme .= $_;
+ } else {
+ $readme .= decode($enc, $_);
+ }
+ }
+ close RF;
+ }
+ return $readme;
}
INIT {
-%copying =
- (GPL => <<'---',
+%copying = (
+############################################################################
+'GPLv2' => <<'---',
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -1058,7 +1275,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -1098,7 +1315,7 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -1153,7 +1370,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -1211,7 +1428,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -1268,7 +1485,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -1321,7 +1538,7 @@
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
@@ -1346,11 +1563,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- 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
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
@@ -1379,15 +1595,16 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
---
- LGPL => <<'---',
+############################################################################
+'LGPLv2.1' => <<'---',
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -1870,7 +2087,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@@ -1886,12 +2103,1535 @@
That's all there is to it!
---
- FDL => <<'---',
+############################################################################
+'GPLv3' => <<'---',
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from ...
[truncated message content] |
