diff --git a/ChangeLog b/ChangeLog index 9131a737a..1c443b45d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-02-13 Werner Lemberg + + * 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 Add new function `FT_Get_Transform`. diff --git a/src/tools/update-copyright-year b/src/tools/update-copyright-year index fdd270ac4..69d63b60a 100755 --- a/src/tools/update-copyright-year +++ b/src/tools/update-copyright-year @@ -106,19 +106,38 @@ while (<>) (?.*) } { - # 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.