Improve license detection more

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

Author: pombredanne

src/cluecode/copyrights.py

@@ -2152,7 +2152,10 @@ def build_detection_from_node(
     (r'^\$?date-of-software$', 'YR'),
     (r'^\$?date-of-document$', 'YR'),
 
-    # cardinal numbers
+    # small-cardinal numbers, under 30
+    (r'^[0-3]?[0-9]?[\.,]?$', 'CDS'),
+
+    # all other cardinal numbers
     (r'^-?[0-9]+(.[0-9]+)?[\.,]?$', 'CD'),
 
     ############################################################################
@@ -2330,19 +2333,19 @@ def build_detection_from_node(
 
     YR-RANGE: {<YR>+ <CC>+ <YR>}        #20
     YR-RANGE: {<YR> <DASH|TO>* <YR|BARE-YR>+}        #30
-    YR-RANGE: {<CD|BARE-YR>? <YR> <BARE-YR>?}        #40
+    YR-RANGE: {<CD|CDS|BARE-YR>? <YR> <BARE-YR>?}        #40
     YR-RANGE: {<YR>+ <BARE-YR>? }        #50
     YR-AND: {<CC>? <YR>+ <CC>+ <YR>}        #60
     YR-RANGE: {<YR-AND>+}        #70
     YR-RANGE: {<YR-RANGE>+ <DASH|TO> <YR-RANGE>+}        #71
     YR-RANGE: {<YR-RANGE>+ <DASH>?}        #72
     # Copyright (c) 1999, 2000, 01, 03, 06 Ralf Baechle
-    YR-RANGE: {<YR-RANGE> <CD>+}        #72.2
+    YR-RANGE: {<YR-RANGE> <CD|CDS>+}        #72.2
 
     CD: {<BARE-YR>} #bareyear
 
     # 5 Jan 2003
-    YR-RANGE: {<CD>  <NNP>  <YR-RANGE>} #72.3
+    YR-RANGE: {<CDS>  <NNP>  <YR-RANGE>} #72.3
 
 
 #######################################
@@ -2437,8 +2440,9 @@ def build_detection_from_node(
     # AT&T Laboratories, Cambridge
     COMPANY: {<COMP> <COMP> <NNP>}       #145
 
+    COMPANY: {<COMP> <CD|CDS> <COMP>}        #170
+
     # rare "Software in the public interest, Inc."
-    COMPANY: {<COMP> <CD> <COMP>}        #170
     COMPANY: {<NNP> <IN><NN> <NNP> <NNP>+<COMP>?}        #180
 
     # Commonwealth Scientific and Industrial Research Organisation (CSIRO)
@@ -2613,7 +2617,7 @@ def build_detection_from_node(
 
     URL: {<PARENS> <URL> <PARENS>}        #5700
 
-    NAME-YEAR:  {<NAME-YEAR>  <CD>  <NNP>} #5700.1
+    NAME-YEAR:  {<NAME-YEAR>  <CDS>  <NNP>} #5700.1
 
     #also accept trailing email and URLs
     # and "VAN" e.g. Du: Copyright (c) 2008 Alek Du <[email protected]>
@@ -2625,7 +2629,7 @@ def build_detection_from_node(
     NAME: {<NN|NNP|CAPS>+ <CC> <OTH>}        #600
     NAME: {<NNP> <CAPS>}        #610
     NAME: {<CAPS> <DASH>? <NNP|NAME>}        #620
-    NAME: {<NNP> <CD> <NNP>}        #630
+    NAME: {<NNP> <CD|CDS> <NNP>}        #630
     NAME: {<COMP> <NAME>+}        #640
 
     # Copyright 2018-2019 @paritytech/substrate-light-ui authors & contributors
@@ -3144,7 +3148,7 @@ def build_detection_from_node(
     COPYRIGHT: {<COPYRIGHT2> <CAPS|COMPANY> <NN|LINUX> <COMPANY>} #2008
 
     # Copyright (c) 2016-2018 JSR 371 expert group and contributors
-    COPYRIGHT: {<COPYRIGHT2>  <CAPS>  <CD>  <COMPANY>  <NAME>} #2009.1
+    COPYRIGHT: {<COPYRIGHT2>  <CAPS>  <CD|CDS>  <COMPANY>  <NAME>} #2009.1
 
     # COPYRIGHT (c) 2006 - 2009 DIONYSOS
     COPYRIGHT: {<COPYRIGHT2> <CAPS>} #2009
@@ -3273,7 +3277,7 @@ def build_detection_from_node(
     COPYRIGHT: {<COPY>  <NNP>  <NAME-YEAR> <COMPANY>?} #15720
 
     # Copyright (c) 2008-1010 Intel Corporation
-    COPYRIGHT: {<COPY>  <COPY>  <CD>  <COMPANY>} #rare-cd-not-year
+    COPYRIGHT: {<COPY>  <COPY>  <CD|CDS>  <COMPANY>} #rare-cd-not-year
 
     # Copyright (C) 2005-2006  dann frazier <[email protected]>
     COPYRIGHT: {<COPYRIGHT2>  <NN>  <NN>  <EMAIL>} #999991
@@ -3461,11 +3465,11 @@ def build_detection_from_node(
 
     COPYRIGHT: {<COMPANY><COPY>+<ALLRIGHTRESERVED>}        #99900
 
-    COPYRIGHT: {<COPYRIGHT|COPYRIGHT2|COPY|NAME-COPY> <COPY|NNP|AUTHDOT|CAPS|CD|YR-RANGE|NAME|NAME-EMAIL|NAME-YEAR|NAME-COPY|NAME-CAPS|AUTHORANDCO|COMPANY|YEAR|PN|COMP|UNI|CC|OF|IN|BY|OTH|VAN|URL|EMAIL|URL2|MIXEDCAP|NN>+ <ALLRIGHTRESERVED>}        #99999
+    COPYRIGHT: {<COPYRIGHT|COPYRIGHT2|COPY|NAME-COPY> <COPY|NNP|AUTHDOT|CAPS|CD|CDS|YR-RANGE|NAME|NAME-EMAIL|NAME-YEAR|NAME-COPY|NAME-CAPS|AUTHORANDCO|COMPANY|YEAR|PN|COMP|UNI|CC|OF|IN|BY|OTH|VAN|URL|EMAIL|URL2|MIXEDCAP|NN>+ <ALLRIGHTRESERVED>}        #99999
 
     # * Copyright (C) 2004  Red Hat, Inc.
     # * Copyright (C) 200  Matthias Clasen <[email protected]>
-    COPYRIGHT: {<COPY>  <COPY> <CD>  <NAME-EMAIL>}        #9999970
+    COPYRIGHT: {<COPY>  <COPY> <CD|CDS>  <NAME-EMAIL>}        #9999970
 
     # <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Copyright">Copyright</a>
     COPYRIGHT: {<COPYRIGHT> <COPY>}        #9999980

src/licensedcode/data/licenses/array-input-method-pl.LICENSE

@@ -11,8 +11,6 @@ ignorable_copyrights:
     - copyright holder of Array Input Method
 ignorable_holders:
     - Array Input Method
-ignorable_authors:
-    - Array Input
 ---
 
 Array Input Method Public License
@@ -80,4 +78,4 @@ or other liability obligations and/or rights consistent with this License. Howev
 obligations, licensee may act only on his own behalf and on his sole responsibility, not on behalf of
 anyone else, and only if the licensee agrees toindemnify, defend, and hold everyone else harmless
 for any liability incurred by, or claims asserted against, such everyone else by reason of licensee's
-accepting any such warranty or additional liability.
+accepting any such warranty or additional liability.

src/licensedcode/data/licenses/wxwidgets.LICENSE

@@ -10,10 +10,10 @@ text_urls:
     - http://www.wxwidgets.org/about/licence.htm
 ignorable_copyrights:
     - Copyright (c) 1997 Julian Smart, Markus Holzem
-    - copyrighted by the wxWidgets
+    - copyrighted by the wxWidgets authors
 ignorable_holders:
     - Julian Smart, Markus Holzem
-    - the wxWidgets
+    - the wxWidgets authors
 ignorable_emails:
     - [email protected]
 ---
@@ -238,4 +238,4 @@ library for tweaking knobs) written by James Random Hacker.
 
 <signature of Ty Coon>, 1 April 1990
 
-Ty Coon, President of Vice
+Ty Coon, President of Vice

src/licensedcode/data/rules/apache-1.1_114.RULE

@@ -10,7 +10,6 @@ ignorable_holders:
     - Leo Galambos
 ignorable_authors:
     - the Egothor Project
-    - the Egothor Project. Under
 ignorable_urls:
     - http://egothor.sf.net/
 ignorable_emails:
@@ -71,4 +70,4 @@ 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.
+OF THE POSSIBILITY OF SUCH DAMAGE.

tests/cluecode/data/copyrights/misco2/mmiv.txt.yml

@@ -4,7 +4,7 @@ what:
   - holders_summary
   - authors
 copyrights:
-  - Copyright (c) MMIV-MMV Anselm R. Garbe
+  - Copyright (c) MMIV-MMV Anselm R. Garbe garbeam at gmail dot com
 holders:
   - MMIV-MMV Anselm R. Garbe
 holders_summary:

tests/cluecode/data/copyrights/misco4/more-linux/aan.txt

@@ -0,0 +1 @@
+Copyright 2016 Tom aan de Wiel

tests/cluecode/data/copyrights/misco4/more-linux/aan.txt.yml

@@ -0,0 +1,8 @@
+what:
+  - copyrights
+  - holders
+  - authors
+copyrights:
+  - Copyright 2016 Tom aan de Wiel
+holders:
+  - Tom aan de Wiel

tests/cluecode/data/copyrights/misco4/more-linux/fsf.txt

@@ -0,0 +1 @@
+Copyright (c) 1989 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, MA

tests/cluecode/data/copyrights/misco4/more-linux/fsf.txt.yml

@@ -0,0 +1,8 @@
+what:
+  - copyrights
+  - holders
+  - authors
+copyrights:
+  - Copyright (c) 1989 Free Software Foundation, Inc.
+holders:
+  - Free Software Foundation, Inc.

tests/cluecode/data/ics/chromium-chrome-browser-resources/about_credits.html.yml

@@ -68,7 +68,7 @@ copyrights:
   - Copyright (c) 1998-2003 Daniel Veillard
   - Copyright (c) 2001-2002 Daniel Veillard
   - Copyright (c) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard
-  - Copyright (c) 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, MA
+  - Copyright (c) 1991 Free Software Foundation, Inc.
   - copyrighted by the Free Software Foundation
   - Copyright (c) 2005, 2006 Nick Galbreath - nickg at modp dot com
   - Copyright 2008 MolokoCacao
@@ -173,7 +173,7 @@ holders:
   - Daniel Veillard
   - Daniel Veillard
   - Thomas Broyer, Charlie Bozeman and Daniel Veillard
-  - Free Software Foundation, Inc. 675 Mass Ave, Cambridge, MA
+  - Free Software Foundation, Inc.
   - the Free Software Foundation
   - Nick Galbreath
   - MolokoCacao
@@ -219,7 +219,7 @@ holders_summary:
   - value: Google
     count: 11
   - value: Free Software Foundation
-    count: 7
+    count: 8
   - value: the Initial Developer
     count: 6
   - value: Glenn Randers-Pehrson
@@ -278,8 +278,6 @@ holders_summary:
     count: 1
   - value: Expat maintainers
     count: 1
-  - value: Free Software Foundation, Inc. 675 Mass Ave, Cambridge, MA
-    count: 1
   - value: Giampaolo Rodola
     count: 1
   - value: Gilbert Wellisch