Tidied up the start and end conditions for the changes.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197356 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/bin/lic_to_2 b/bin/lic_to_2
index eb36e3ac85091da0b76cd6b3a8c2ace6b6223b52..09337a9615479d9ea59e5fe9adcd87cf144d9af0 100644 (file)
--- a/bin/lic_to_2
+++ b/bin/lic_to_2
@@ -23,8 +23,7 @@ $lic2rem = $2;
 
 # Slurp the input file
 $_ = <>;
-s|\n                    # Start with a newline
-  [^\n]*=+\s+           # Non-newlines followed by multiple '='
+s|[^\n]*=+\s+           # Non-newlines followed by multiple '='
                         # ...followed by whitespace (incl. newline)
   [^\n]*                # Non-newlines (incl spaces)
   The\ Apache\ Software\ License,\ Version\ 1\.1
@@ -34,7 +33,7 @@ s|\n                    # Start with a newline
   James\ Tauber
   .*                    # Anything
   \<http://www.apache.org/\>\.
-  \s+                   # Any whitespace
+  \s*\n                 # Any whitespace ending in a newline
 |$lic2begin$1$lic2rem|xs;
 
 print;

diff --git a/lic_to_2 b/lic_to_2
index eb36e3ac85091da0b76cd6b3a8c2ace6b6223b52..09337a9615479d9ea59e5fe9adcd87cf144d9af0 100644 (file)
--- a/lic_to_2
+++ b/lic_to_2
@@ -23,8 +23,7 @@ $lic2rem = $2;
 
 # Slurp the input file
 $_ = <>;
-s|\n                    # Start with a newline
-  [^\n]*=+\s+           # Non-newlines followed by multiple '='
+s|[^\n]*=+\s+           # Non-newlines followed by multiple '='
                         # ...followed by whitespace (incl. newline)
   [^\n]*                # Non-newlines (incl spaces)
   The\ Apache\ Software\ License,\ Version\ 1\.1
@@ -34,7 +33,7 @@ s|\n                    # Start with a newline
   James\ Tauber
   .*                    # Anything
   \<http://www.apache.org/\>\.
-  \s+                   # Any whitespace
+  \s*\n                 # Any whitespace ending in a newline
 |$lic2begin$1$lic2rem|xs;
 
 print;