Improv copyright detection even more

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/cluecode/copyrights.py

@@ -791,6 +791,7 @@ def build_detection_from_node(
     (r'^A11yance', 'NNP'),
     (r'^Fu$', 'NNP'),
     (r'^W3C\(r\)$', 'COMP'),
+    (r'^TeX$', 'NNP'),
 
     # Three or more AsCamelCase GetQueueReference, with some exceptions
     (r'^(?:OpenStreetMap|AliasDotCom|AllThingsTalk).?$', 'NAME'),
@@ -1633,6 +1634,9 @@ def build_detection_from_node(
     (r'^Adapted$', 'JUNK'),
     (r'^Thumb$', 'NN'),
 
+    # SEEN IN  Copyright (c) 1997 Dan error_act ([email protected])
+    (r'^error_act$', 'NN'),
+
     # alone this is not enough for an NNP
     (r'^Free$', 'NN'),
 
@@ -1687,6 +1691,7 @@ def build_detection_from_node(
     (r'^Compression$', 'NN'),
     (r'^Letter$', 'NN'),
     (r'^Moved$', 'NN'),
+    (r'^Phone$', 'NN'),
 
     # dual caps that are not NNP
     (r'^Make[A-Z]', 'JUNK'),
@@ -1790,6 +1795,11 @@ def build_detection_from_node(
     (r'various\.?$', 'NNP'),
     (r'SuSE$', 'COMPANY'),
     (r'Suse$', 'COMPANY'),
+    (r'\(Winbond\),?$', 'COMP'),
+
+    #     copyright           : (C) 2002 by karsten wiese
+    (r'karsten$', 'NNP'),
+    (r'wiese$', 'NNP'),
 
     # treat Attributable as proper noun as it is seen in Author tags such as in:
     # @author not attributable
@@ -1823,8 +1833,10 @@ def build_detection_from_node(
     (r'^.+,Inc\.$', 'COMPANY'),
 
     (r'^[Cc]ompany[,\.]?\)?$', 'COMP'),
-    (r'^Limited[,\.]??$', 'COMP'),
-    (r'^LIMITED[,\.]??$', 'COMP'),
+    (r'^Limited[,\.]?$', 'COMP'),
+    (r'^LIMITED[,\.]?$', 'COMP'),
+
+    (r'^COMPANY,LTD$', 'COMP'),
 
     # Caps company suffixes
     (r'^INC[\.,\)]*$', 'COMP'),
@@ -1874,6 +1886,9 @@ def build_detection_from_node(
     # Iceland
     (r'^(ehf|hf|svf|ohf)\.,?$', 'COMP'),
 
+    # company abbreviations
+    (r'^(SPRL|srl)[\.,]?$', 'COMP'),
+
     # company suffix : AS: this is frequent beyond Norway.
     (r'^AS', 'CAPS'),
     # that's the ASF, not some legal form
@@ -2412,6 +2427,9 @@ def build_detection_from_node(
     # Project contributors
     COMPANY: {<COMP> <CONTRIBUTORS>}   #256
 
+    # Copyright (C) 2013 Ideas on board SPRL
+    COMPANY: {<NNP>  <JUNK>  <NN>  <COMP>} #259
+
     COMPANY: {<LINUX>? <COMP>+}        #260
 
     # Nokia Corporation and/or its subsidiary(-ies)
@@ -2437,12 +2455,22 @@ def build_detection_from_node(
     # NAME-YEAR starts or ends with a YEAR range
     NAME-YEAR: {<YR-RANGE> <NNP> <NNP>+} #350
 
+    COPYRIGHT: {<COPY>  <YR-RANGE>  <NNP>  <NN>  <NNP>  <NNP>  <NNP>  <EMAIL>} #350.1
+
+    # Copyright (C) 1995-06 ICP vortex, Achim Leubner
+    COPYRIGHT: {<COPY>  <COPY>  <YR-RANGE>  <CAPS>  <NN>  <NNP> <NNP> } #350.2
+
     # Academy of Motion Picture Arts
     NAME: {<NNP|PN>+ <NNP>+}        #351
 
     # Distributed Management Task Force
     NAME: {<NN> <NNP>{3}} #881111
 
+    # Rudolf Marek <[email protected]>
+    # David Hubbard <[email protected]>
+    # Daniel J Blueman <[email protected]>
+    # NAME: { <NAME> <EMAIL> } #351.0
+
     # @author <a href="mailto:[email protected]">Stephane Hillion</a>
     NAME: { <NN>? <NN>? <EMAIL> <NAME> } #351.1
 
@@ -3000,7 +3028,7 @@ def build_detection_from_node(
     AUTHOR: {<BY|MAINT> <NAME-EMAIL> <YR-RANGE>?}  #26382
 
     # Russ Dill <[email protected]> 2001-2003
-    COPYRIGHT: {<NAME-EMAIL> <YR-RANGE>}       #2638
+    # COPYRIGHT: {<NAME-EMAIL> <YR-RANGE>}       #2638
 
     # (C) 2001-2009, <s>Takuo KITAME, Bart Martens, and  Canonical, LTD</s>
     COPYRIGHT: {<COPYRIGHT> <NNP> <COMPANY>}       #26381

src/cluecode/copyrights_hint.py

@@ -71,6 +71,8 @@
     '</s>',
     '<s/>',
     'by ',  # note the trailing space
+    # common for emails
+    '@',
 )
 
 '''

src/licensedcode/data/licenses/cmigemo.LICENSE

@@ -12,6 +12,7 @@ other_urls:
     - http://fedoraproject.org/wiki/Licensing/CMigemo
 ignorable_authors:
     - MURAOKA Taro
+    - Translator Mamoru Tasaka <[email protected]>
 ignorable_emails:
     - [email protected]
     - [email protected]
@@ -84,4 +85,4 @@ below.
 
 THE MAIN RULE ENDS HERE
 If you cannot agree with the conditions above, please
-stop using this software.
+stop using this software.

src/licensedcode/data/licenses/first-works-appreciative-1.2.LICENSE

@@ -6,7 +6,7 @@ category: Proprietary Free
 owner: Jonathan Michael Davis
 spdx_license_key: LicenseRef-scancode-first-works-appreciative-1.2
 ignorable_copyrights:
-    - Copyright (c) 2005 Jonathan Michael Davis <[email protected]>
+    - Copyright (c) 2005 Jonathan Michael Davis <[email protected]> <[email protected]>
 ignorable_holders:
     - Jonathan Michael Davis
 ignorable_emails:
@@ -137,4 +137,4 @@ License.
    whether in contract, strict liability, or tort (including negligence or
    otherwise) arising in any way out of the use or distribution of the Original
    Work or the exercise of any rights granted hereunder, even if advised of
-   the possibility of such damages.
+   the possibility of such damages.

src/licensedcode/data/licenses/nvidia-cuda-supplement-2020.LICENSE

@@ -45,7 +45,8 @@ ignorable_holders:
     - Yann Collet
     - Zoltan Herczeg
 ignorable_authors:
-    - Ahmad Abdelfattah ([email protected]) David Keyes ([email protected])
+    - Ahmad Abdelfattah ([email protected]) David Keyes ([email protected]) Hatem
+        Ltaief ([email protected])
     - Ahmad M. Abdelfattah, David Keyes, and Hatem Ltaief
     - D. E. Shaw Research
     - Davide Barbieri

src/licensedcode/data/licenses/pcre.LICENSE

@@ -16,6 +16,8 @@ ignorable_holders:
     - the University of Cambridge, England
 ignorable_authors:
     - Philip Hazel
+    - Philip Hazel <[email protected]> University of Cambridge Computing Service, Cambridge, England
+
 ignorable_urls:
     - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
 ignorable_emails:
@@ -68,4 +70,4 @@ which it is incompatible.
 The documentation for PCRE, supplied in the "doc" directory, is
 distributed under the same terms as the software itself.
 
-End PCRE LICENCE
+End PCRE LICENCE

src/licensedcode/data/licenses/pygres-2.2.LICENSE

@@ -7,6 +7,8 @@ owner: Unspecified
 spdx_license_key: LicenseRef-scancode-pygres-2.2
 text_urls:
     - http://shell.vex.net/viewvc.cgi/pygresql/trunk/module/pgmodule.c?view=markup&pathrev=431
+ignorable_authors:
+    - Pascal Andre, [email protected]
 ignorable_copyrights:
     - Copyright (c) 1995, Pascal Andre ([email protected])
     - copyright 1997, 1998, 1999 by D'Arcy J.M. Cain ([email protected])
@@ -42,4 +44,4 @@ AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
 ENHANCEMENTS, OR MODIFICATIONS.
 
 Further modifications copyright 1997, 1998, 1999 by D'Arcy J.M. Cain
-([email protected]) subject to the same terms and conditions as above.
+([email protected]) subject to the same terms and conditions as above.

src/licensedcode/data/rules/pcre_13.RULE

@@ -9,6 +9,7 @@ ignorable_holders:
     - the University of Cambridge, England
 ignorable_authors:
     - Philip Hazel
+    - Philip Hazel <[email protected]> University of Cambridge Computing Service, Cambridge, England
 ignorable_urls:
     - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
 ignorable_emails:

tests/cluecode/data/copyright_fossology/testdata134.yml

@@ -9,4 +9,5 @@ holders:
   - Free Software Foundation, Inc.
 authors:
   - Ian Jackson, Erick Branderhorst, Galen Hazelwood, and Josip Rodin. Today
-  - the Debian
+  - the Debian TeX Task Force <[email protected]>
+  - Karl Berry <[email protected]>

tests/cluecode/data/copyright_fossology/testdata136.yml

@@ -8,5 +8,3 @@ copyrights:
 holders:
   - Free Software Foundation
   - Eazel, Inc
-authors:
-  - maintainers Rodney Dawes <[email protected]>