Commit fd8fc64efb9b355a73192dc4d01d5daa8ecd31cd

Werner Lemberg 2019-02-23T10:05:37

* src/tools/update-copyright-year: Insert `(C)'.

diff --git a/ChangeLog b/ChangeLog
index 40564a3..c629027 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-02-23  Werner Lemberg  <wl@gnu.org>
+
+	* src/tools/update-copyright-year: Insert `(C)'.
+
 2019-02-21  Armin Hasitzka  <prince.cherusker@gmail.com>
 
 	[truetype] Mask numeric overflows.
diff --git a/src/tools/update-copyright-year b/src/tools/update-copyright-year
index e191702..ce1d27a 100755
--- a/src/tools/update-copyright-year
+++ b/src/tools/update-copyright-year
@@ -67,7 +67,8 @@ while (<>)
     s {
         (?<begin>.*)
         Copyright
-        (?<space1>\ +)
+        (?<space1>(\ +
+                   | \ +\(C\)\ +))
         (?<first>[12][0-9][0-9][0-9])
         (?<middle>.+)
         (?<last>[12][0-9][0-9][0-9])
@@ -78,14 +79,15 @@ while (<>)
       }
       {
         # Fill line to the same length (if appropriate); we skip the middle
-        # part but insert two spaces and `-'.
+        # part but insert `(C)', three spaces, and `-'.
         my $space = length($+{space1}) - 1
                     + length($+{middle}) - 1
                     + length($+{space2}) - 1
-                    + length($+{space3});
+                    + length($+{space3})
+                    - (length("(C)") + 1);
 
         print "$+{begin}";
-        print "Copyright\ $+{first}-$year\ by";
+        print "Copyright\ (C)\ $+{first}-$year\ by";
         print ' ' x $space if length($+{end});
         print "$+{end}\n";
         $replaced = 1;
@@ -95,7 +97,8 @@ while (<>)
     s {
         (?<begin>.*)
         Copyright
-        (?<space1>\ +)
+        (?<space1>(\ +
+                   | \ +\(C\)\ +))
         (?<first>[12][0-9][0-9][0-9])
         (?<space2>\ +)
         by
@@ -103,7 +106,7 @@ while (<>)
         (?<end>.*)
       }
       {
-        # Fill line to the same length (if appropriate); we insert two
+        # Fill line to the same length (if appropriate); we insert three
         # spaces, a `-', and the current year.
         my $space = length($+{space1}) - 1
                     + length($+{space2}) - 1
@@ -111,7 +114,7 @@ while (<>)
                     - (length($year) + 1);
 
         print "$+{begin}";
-        print "Copyright $+{first}-$year by";
+        print "Copyright\ (C)\ $+{first}-$year\ by";
         # If $space is negative this inserts nothing.
         print ' ' x $space if length($+{end});
         print "$+{end}\n";