shithub: freetype+ttf2subf

Download patch

ref: 7849316ccfc794026176d462b9008e7f4c4240fe
parent: d51452e3ece19f797f0d81d5a5e85be88bfe38c3
author: Werner Lemberg <[email protected]>
date: Sat Feb 13 04:21:37 EST 2021 

* src/tools/update-copyright-year: Fix single-year entry handling.

The fix from 2021-01-17 didn't cover the case where the year to be
updated is identical to the current year.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2021-02-13  Werner Lemberg  <[email protected]>
 
+	* src/tools/update-copyright-year: Fix single-year entry handling.
+
+	The fix from 2021-01-17 didn't cover the case where the year to be
+	updated is identical to the current year.
+
+2021-02-13  Werner Lemberg  <[email protected]>
+
 	Add new function `FT_Get_Transform`.
 
 	See
--- a/src/tools/update-copyright-year
+++ b/src/tools/update-copyright-year
@@ -106,19 +106,38 @@
         (?<end>.*)
       }
       {
-        # Fill line to the same length (if appropriate); we insert three
-        # spaces, the string `(C)', a `-', and the current year.
-        my $space = length($+{space1})
-                    + length($+{space2})
-                    + length($+{space3})
-                    - (length($year) + length("(C)") + 3 + 1);
+        if ($+{first} < $year)
+        {
+          # Fill line to the same length (if appropriate); we insert three
+          # spaces, the string `(C)', a `-', and the current year.
+          my $space = length($+{space1})
+                      + length($+{space2})
+                      + length($+{space3})
+                      - (length($year) + length("(C)") + 3 + 1);
 
-        print "$+{begin}";
-        print "Copyright\ (C)\ $+{first}-$year\ by";
-        # If $space is negative this inserts nothing.
-        print ' ' x $space if length($+{end});
-        print "$+{end}\n";
-        $replaced = 1;
+          print "$+{begin}";
+          print "Copyright\ (C)\ $+{first}-$year\ by";
+          # If $space is negative this inserts nothing.
+          print ' ' x $space if length($+{end});
+          print "$+{end}\n";
+          $replaced = 1;
+        }
+        else
+        {
+          # Fill line to the same length (if appropriate); we insert three
+          # spaces and the string `(C)'.
+          my $space = length($+{space1})
+                      + length($+{space2})
+                      + length($+{space3})
+                      - (length("(C)") + 3);
+
+          print "$+{begin}";
+          print "Copyright\ (C)\ $+{first}\ by";
+          # If $space is negative this inserts nothing.
+          print ' ' x $space if length($+{end});
+          print "$+{end}\n";
+          $replaced = 1;
+        }
       }ex
     ||
     # Otherwise print line unaltered.