Add support for detecting scm strings in intltool-update -m.

1 files changed, 18 insertions, 5 deletions

diff --git a/intltool-update.in b/intltool-update.in
index 5b3bf42..e4fdebe 100644
--- a/intltool-update.in
+++ b/intltool-update.in
@@ -451,10 +451,19 @@ sub FindLeftoutFiles
 	my $in_comment = 0;
 	my $in_macro = 0;
         my $in_string = 0;
+        my @multiline_quotes = ("'''", '"""');
+        if ($file =~ /\.scm/) {
+            @multiline_quotes = ('"');
+        }
 
 	open FILE, "<$file";
 	while (<FILE>)
 	{
+            if ($file =~ /\.scm/) {
+                # Strip single quotes from .scm files.
+                s-\'--g;
+            }
+
 	    # Handle continued multi-line comment.
 	    if ($in_comment)
 	    {
@@ -465,7 +474,11 @@ sub FindLeftoutFiles
             # Handle continued multi-line string.
             if ($in_string)
             {
-                next unless s/.*(\'\'\'|\"\"\")//;
+                my $pattern = join '|', @multiline_quotes;
+                if (!s/.*$pattern//) {
+                    s///s;
+                    next;
+                };
                 $in_string = 0;
             }
 
@@ -499,11 +512,11 @@ sub FindLeftoutFiles
 		{
 		    s-//.*--;
 		}
-                elsif ($match eq "\"\"\"" or $match eq "\'\'\'")
+                elsif (grep($match, @multiline_quotes))
                 {
-                    if (!s-$match.*?$match--)
+                    if (!s-$match(\\$match|[^$match])*$match-QUOTEDTEXT-g)
                     {
-                        s-$match.*--;
+                        s-$match.*-QUOTEDTEXT-s;
                         $in_string = 1;
                     }
                 }
@@ -529,7 +542,7 @@ sub FindLeftoutFiles
 	    }
 
             ## C_ N_ NC_ Q_ and _ are the macros defined in gi8n.h
-	    if (/(NC_|[NCQ]_|[^_]_|(^|$)[_]) *\(QUOTEDTEXT/m)
+	    if (/(NC_|[NCQ]_|[^_]_|(^|$)[_]) *\(?QUOTEDTEXT/m)
 	    {
                 AddFileToListIfMissing($file, \@buf_allfiles);
 		last;