[PATCH] gnu: Remove trademark acknowledgements.

[PATCH] gnu: Remove trademark acknowledgements.

[John Darrington]

* gnu/packages/imagemagick.scm (imagemagick), gnu/packages/python.scm
  (python-2.7), gnu/packages/wordnet.scm (wordnet) [description]:
   Remove trademark acknowledgements.
---
 gnu/packages/imagemagick.scm | 2 +-
 gnu/packages/python.scm      | 2 +-
 gnu/packages/wordnet.scm     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index c88fd7a..b7054c8 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -100,7 +100,7 @@
     (home-page "http://www.imagemagick.org/")
     (synopsis "Create, edit, compose, or convert bitmap images")
     (description
-     "ImageMagick® is a software suite to create, edit, compose, or convert
+     "ImageMagick is a software suite to create, edit, compose, or convert
 bitmap images.  It can read and write images in a variety of formats (over 100)
 including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
 and TIFF.  Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 15c957e..eb949fa 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5732,7 +5732,7 @@ object to help create WSGI responses.")
     (home-page "http://www.python-excel.org/")
     (synopsis "Library for extracting data from Excel files")
     (description "This packages provides a library to extract data from
-spreadsheets using Microsoft Excel® proprietary file formats @samp{.xls} and
+spreadsheets using Microsoft Excel proprietary file formats @samp{.xls} and
 @samp{.xlsx} (versions 2.0 onwards).  It has support for Excel dates and is
 Unicode-aware.  It is not intended as an end-user tool.")
     (license bsd-3)))
diff --git a/gnu/packages/wordnet.scm b/gnu/packages/wordnet.scm
index dbc7586..289ecde 100644
--- a/gnu/packages/wordnet.scm
+++ b/gnu/packages/wordnet.scm
@@ -83,7 +83,7 @@
     (home-page "http://wordnet.princeton.edu/")
     (synopsis "Lexical database for the English language")
     (description
-     "WordNet® is a large lexical database of English.  Nouns, verbs,
+     "WordNet is a large lexical database of English.  Nouns, verbs,
 adjectives and adverbs are grouped into sets of cognitive synonyms (synsets),
 each expressing a distinct concept.  Synsets are interlinked by means of
 conceptual-semantic and lexical relations.  The resulting network of
-- 
2.1.4

Re: [PATCH] gnu: Remove trademark acknowledgements.

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 3151 bytes --]

These somehow crept in, but are an explicit violation of GNU policy and
coding standards.
On Mon, Aug 22, 2016 at 08:24:55PM +0200, John Darrington wrote:
     * gnu/packages/imagemagick.scm (imagemagick), gnu/packages/python.scm
       (python-2.7), gnu/packages/wordnet.scm (wordnet) [description]:
        Remove trademark acknowledgements.
     ---
      gnu/packages/imagemagick.scm | 2 +-
      gnu/packages/python.scm      | 2 +-
      gnu/packages/wordnet.scm     | 2 +-
      3 files changed, 3 insertions(+), 3 deletions(-)
     
     diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
     index c88fd7a..b7054c8 100644
     --- a/gnu/packages/imagemagick.scm
     +++ b/gnu/packages/imagemagick.scm
     @@ -100,7 +100,7 @@
          (home-page "http://www.imagemagick.org/")
          (synopsis "Create, edit, compose, or convert bitmap images")
          (description
     -     "ImageMagick?? is a software suite to create, edit, compose, or convert
     +     "ImageMagick is a software suite to create, edit, compose, or convert
      bitmap images.  It can read and write images in a variety of formats (over 100)
      including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
      and TIFF.  Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
     diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
     index 15c957e..eb949fa 100644
     --- a/gnu/packages/python.scm
     +++ b/gnu/packages/python.scm
     @@ -5732,7 +5732,7 @@ object to help create WSGI responses.")
          (home-page "http://www.python-excel.org/")
          (synopsis "Library for extracting data from Excel files")
          (description "This packages provides a library to extract data from
     -spreadsheets using Microsoft Excel?? proprietary file formats @samp{.xls} and
     +spreadsheets using Microsoft Excel proprietary file formats @samp{.xls} and
      @samp{.xlsx} (versions 2.0 onwards).  It has support for Excel dates and is
      Unicode-aware.  It is not intended as an end-user tool.")
          (license bsd-3)))
     diff --git a/gnu/packages/wordnet.scm b/gnu/packages/wordnet.scm
     index dbc7586..289ecde 100644
     --- a/gnu/packages/wordnet.scm
     +++ b/gnu/packages/wordnet.scm
     @@ -83,7 +83,7 @@
          (home-page "http://wordnet.princeton.edu/")
          (synopsis "Lexical database for the English language")
          (description
     -     "WordNet?? is a large lexical database of English.  Nouns, verbs,
     +     "WordNet is a large lexical database of English.  Nouns, verbs,
      adjectives and adverbs are grouped into sets of cognitive synonyms (synsets),
      each expressing a distinct concept.  Synsets are interlinked by means of
      conceptual-semantic and lexical relations.  The resulting network of
     -- 
     2.1.4
     
     

-- 
Avoid eavesdropping.  Send strong encryted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] gnu: Remove trademark acknowledgements.

[Ricardo Wurmus]

John Darrington <john@darrington.wattle.id.au> writes:

> These somehow crept in, but are an explicit violation of GNU policy and
> coding standards.

Good catch!  Thanks for fixing this.

~~ Ricardo

Re: [PATCH] gnu: Remove trademark acknowledgements.

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

On Mon, 22 Aug 2016 22:03:58 +0200
Ricardo Wurmus <rekado@elephly.net> wrote:

> John Darrington <john@darrington.wattle.id.au> writes:
> 
> > These somehow crept in, but are an explicit violation of GNU policy and
> > coding standards.  
> 
> Good catch!  Thanks for fixing this.
> 
> ~~ Ricardo

How about the attached patch to catch such things earlier?

`~Eric

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-guix-lint-Check-descriptions-for-trademark-signs.patch --]
[-- Type: text/x-patch, Size: 1982 bytes --]

From d68b42ceff1993fa81c36f5187c9cfc12152bc1a Mon Sep 17 00:00:00 2001
From: Eric Bavier <ericbavier@openmailbox.org>
Date: Tue, 23 Aug 2016 02:08:02 -0500
Subject: [PATCH] guix: lint: Check descriptions for trademark signs.
To: guix-devel@gnu.org

From: Eric Bavier <bavier@member.fsf.org>

* guix/scripts/lint.scm (check-description-style): Emit a warning if
  trademark signs found in description.
---
 guix/scripts/lint.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 51191e7..98be4d8 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -161,6 +161,19 @@ markup is valid return a plain-text version of DESCRIPTION, otherwise #f."
                       'description)
         #f)))
 
+  (define (check-trademarks description)
+    "Check that DESCRIPTION does not contain '™' or '®' characters.  See
+http://www.gnu.org/prep/standards/html_node/Trademarks.html."
+    (for-each (lambda (sign)
+                (match (string-contains description sign)
+                  ((and (? number?) index)
+                   (emit-warning package
+                                 (format #f (_ "description should not contain ~
+trademark sign '~a' at ~d")
+                                         sign index)))
+                  (else #t)))
+              '("™" "®")))
+
   (define (check-proper-start description)
     (unless (or (properly-starts-sentence? description)
                 (string-prefix-ci? (package-name package) description))
@@ -191,6 +204,7 @@ by two spaces; possible infraction~p at ~{~a~^, ~}")
     (if (string? description)
         (begin
           (check-not-empty description)
+          (check-trademarks description)
           ;; Use raw description for this because Texinfo rendering
           ;; automatically fixes end of sentence space.
           (check-end-of-sentence-space description)
-- 
2.9.2

Re: [PATCH] gnu: Remove trademark acknowledgements.

[Ricardo Wurmus]

Eric Bavier <ericbavier@openmailbox.org> writes:

> On Mon, 22 Aug 2016 22:03:58 +0200
> Ricardo Wurmus <rekado@elephly.net> wrote:
>
>> John Darrington <john@darrington.wattle.id.au> writes:
>> 
>> > These somehow crept in, but are an explicit violation of GNU policy and
>> > coding standards.  
>> 
>> Good catch!  Thanks for fixing this.
>> 
>> ~~ Ricardo
>
> How about the attached patch to catch such things earlier?

I like it.  Thanks, Eric!

Not sure if we should use “for-each” here (going through the string
once for each character) or if we could just go through the string once,
checking for any character match.

Also, should we replace “sign” with “character”?

~~ Ricardo

Re: [PATCH] gnu: Remove trademark acknowledgements.

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

On Tue, 23 Aug 2016 12:15:17 +0200
Ricardo Wurmus <rekado@elephly.net> wrote:

> Eric Bavier <ericbavier@openmailbox.org> writes:
> 
> > On Mon, 22 Aug 2016 22:03:58 +0200
> > Ricardo Wurmus <rekado@elephly.net> wrote:
> >  
> >> John Darrington <john@darrington.wattle.id.au> writes:
> >>   
> >> > These somehow crept in, but are an explicit violation of GNU policy and
> >> > coding standards.    
> >> 
> >> Good catch!  Thanks for fixing this.
> >> 
> >> ~~ Ricardo  
> >
> > How about the attached patch to catch such things earlier?  
> 
> I like it.  Thanks, Eric!
> 
> Not sure if we should use “for-each” here (going through the string
> once for each character) or if we could just go through the string once,
> checking for any character match.
> 
> Also, should we replace “sign” with “character”?

In this updated patch I addressed both of these concerns.  It's also
about 14% faster (on a single benchmark :).

`~Eric

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-guix-lint-Check-descriptions-for-trademark-signs.patch --]
[-- Type: text/x-patch, Size: 1811 bytes --]

From 46a8f3322392fcd6a7641062ff6b3d23685f394b Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 23 Aug 2016 02:08:02 -0500
Subject: [PATCH] guix: lint: Check descriptions for trademark signs.

* guix/scripts/lint.scm (check-description-style): Emit a warning if
  trademark signs found in description.
---
 guix/scripts/lint.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 51191e7..07e46a9 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -161,6 +161,17 @@ markup is valid return a plain-text version of DESCRIPTION, otherwise #f."
                       'description)
         #f)))
 
+  (define (check-trademarks description)
+    "Check that DESCRIPTION does not contain '™' or '®' characters.  See
+http://www.gnu.org/prep/standards/html_node/Trademarks.html."
+    (match (string-index description (char-set #\™ #\®))
+      ((and (? number?) index)
+       (emit-warning package
+                     (format #f (_ "description should not contain ~
+trademark sign '~a' at ~d")
+                             (string-ref description index) index)))
+      (else #t)))
+
   (define (check-proper-start description)
     (unless (or (properly-starts-sentence? description)
                 (string-prefix-ci? (package-name package) description))
@@ -191,6 +202,7 @@ by two spaces; possible infraction~p at ~{~a~^, ~}")
     (if (string? description)
         (begin
           (check-not-empty description)
+          (check-trademarks description)
           ;; Use raw description for this because Texinfo rendering
           ;; automatically fixes end of sentence space.
           (check-end-of-sentence-space description)
-- 
2.9.2

Re: [PATCH] gnu: Remove trademark acknowledgements.

[Ludovic Courtès]

Hi!

Eric Bavier <ericbavier@openmailbox.org> skribis:

> From 46a8f3322392fcd6a7641062ff6b3d23685f394b Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Tue, 23 Aug 2016 02:08:02 -0500
> Subject: [PATCH] guix: lint: Check descriptions for trademark signs.
>
> * guix/scripts/lint.scm (check-description-style): Emit a warning if
>   trademark signs found in description.

This is very nice!

Before pushing, could you add a simple test in tests/lint.scm, along the
lines of the others ones that are already there?

Thank you!

Ludo’.

Re: [PATCH] gnu: Remove trademark acknowledgements.

[Eric Bavier]

On Sun, 28 Aug 2016 00:24:40 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Hi!
> 
> Eric Bavier <ericbavier@openmailbox.org> skribis:
> 
> > From 46a8f3322392fcd6a7641062ff6b3d23685f394b Mon Sep 17 00:00:00 2001
> > From: Eric Bavier <bavier@member.fsf.org>
> > Date: Tue, 23 Aug 2016 02:08:02 -0500
> > Subject: [PATCH] guix: lint: Check descriptions for trademark signs.
> >
> > * guix/scripts/lint.scm (check-description-style): Emit a warning if
> >   trademark signs found in description.  
> 
> This is very nice!
> 
> Before pushing, could you add a simple test in tests/lint.scm, along the
> lines of the others ones that are already there?

Done.  Pushed in 83f18e06530f025df9f6c5059bfe261a1291a24f.

`~Eroc

Re: [PATCH] gnu: Remove trademark acknowledgements.

[Leo Famulari]

On Mon, Aug 22, 2016 at 08:24:55PM +0200, John Darrington wrote:
> * gnu/packages/imagemagick.scm (imagemagick), gnu/packages/python.scm
>   (python-2.7), gnu/packages/wordnet.scm (wordnet) [description]:
>    Remove trademark acknowledgements.

Thanks!

The second two lines of the changelog should begin in the first column,
with no indentation.

> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 15c957e..eb949fa 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -5732,7 +5732,7 @@ object to help create WSGI responses.")
>      (home-page "http://www.python-excel.org/")
>      (synopsis "Library for extracting data from Excel files")
>      (description "This packages provides a library to extract data from
> -spreadsheets using Microsoft Excel® proprietary file formats @samp{.xls} and
> +spreadsheets using Microsoft Excel proprietary file formats @samp{.xls} and
>  @samp{.xlsx} (versions 2.0 onwards).  It has support for Excel dates and is
>  Unicode-aware.  It is not intended as an end-user tool.")
>      (license bsd-3)))

Please make the changelog reflect that this change is not in the
python-2.7 variable, but rather in the python-xlrd variable.