diff --git a/ChangeLog b/ChangeLog index 40564a307..c6290277d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2019-02-23 Werner Lemberg + + * src/tools/update-copyright-year: Insert `(C)'. + 2019-02-21 Armin Hasitzka [truetype] Mask numeric overflows. diff --git a/src/tools/update-copyright-year b/src/tools/update-copyright-year index e191702f8..ce1d27a10 100755 --- a/src/tools/update-copyright-year +++ b/src/tools/update-copyright-year @@ -67,7 +67,8 @@ while (<>) s { (?.*) Copyright - (?\ +) + (?(\ + + | \ +\(C\)\ +)) (?[12][0-9][0-9][0-9]) (?.+) (?[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 { (?.*) Copyright - (?\ +) + (?(\ + + | \ +\(C\)\ +)) (?[12][0-9][0-9][0-9]) (?\ +) by @@ -103,7 +106,7 @@ while (<>) (?.*) } { - # 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";