From: Peter Bernard West <pbwest@apache.org>
Date: Thu, 19 Feb 2004 01:49:30 +0000 (+0000)
Subject: Tidied up the start and end conditions for the changes.
X-Git-Tag: Alt-Design_pre_awt_renderer_import~48
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=486687dad38b5d06e52425b0812e0e40047a5c02;p=xmlgraphics-fop.git

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 eb36e3ac8..09337a961 100644
--- 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 eb36e3ac8..09337a961 100644
--- 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;