X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=plugins%2F15merge;fp=plugins%2F15merge;h=801bcf0986ab6133e36aeb05b365163ec7bf38ea;hb=5fea61b142fcdeaaca2f6640f17e16a0d4e7b5c9;hp=7b48711562969776490d7ff5d5e9807afdcbad09;hpb=f96cd91ac242f68bc9c7b14b5e4ef45af00cfe60;p=htag.git

diff --git a/plugins/15merge b/plugins/15merge
index 7b48711..801bcf0 100644
--- a/plugins/15merge
+++ b/plugins/15merge
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2000-2001 Simon Huggins
+# Copyright (C) 2000-2003 Simon Huggins
 # merge merges the sig and the tag but also merges the sig and the new style
 # plugin things (i.e. all those silly files in $cfg{'tmpdir'}
 
@@ -52,7 +52,7 @@ sub merge($$) {
 	my ($plugin,$len,$align,$wascr);
 	$wascr=0;
 
-	while ($sig =~ /@([A-Za-z]?)([1-9][0-9]*)([RC]?)@/) {
+	while ($sig =~ /@([A-Za-z]?)(\*|(?:[1-9][0-9]*))([RC]?)@/) {
 		# Ick.
 		if (defined $3) {
 			$plugin = $1;
@@ -77,53 +77,61 @@ print STDERR "plugin,len,type = #$plugin#,#$len#,#$align#\n" if $anal_merge_debu
 			$chunk = getplugin($plugin);
 			print STDERR "Got plugin $plugin and $chunk\n"
 				if $anal_merge_debug;
+			$len = quotemeta $len; # escape * if it is *
 			$sig =~ s/\@$plugin$len[RC]?@/$chunk/;
 			print STDERR "Sig is now:\n$sig" if $anal_merge_debug;
 			$chunk = "";
 		} else {
 			my $extra;
 			$notag=0;
-			$chunk =  substr $tag, 0, $len;
+			if ($len ne "*") {
+				$chunk =  substr $tag, 0, $len;
 print STDERR "chunk,tag = #$chunk#,#$tag#".length($tag)." ".length($chunk)."\n"
 	if $anal_merge_debug;
-			if ($chunk =~ s/^([^\n]+)\n+(.*)$/$1/s) {
-				$extra = $2;
-				print STDERR "\$extra = [$extra]\n"
-					if $anal_merge_debug;
-			}
-			if (length($chunk) < $len) {
-				print STDERR "length(chunk) < $len\n"
-					if $anal_merge_debug;
-				$chunk=&chunksizealign($chunk,$len,$align);
-				print STDERR "chunk = #$chunk#\n"
-					if $anal_merge_debug;
-			}
-			if (length($tag) < $len + 1) {
-				$tag= $extra ? $extra : "";
+				if ($chunk =~ s/^([^\n]+)\n+(.*)$/$1/s) {
+					$extra = $2;
+					print STDERR "\$extra = [$extra]\n"
+						if $anal_merge_debug;
+				}
+				if (length($chunk) < $len) {
+					print STDERR "length(chunk) < $len\n"
+						if $anal_merge_debug;
+					$chunk=&chunksizealign($chunk,$len,$align);
+					print STDERR "chunk = #$chunk#\n"
+						if $anal_merge_debug;
+				}
+				if (length($tag) < $len + 1) {
+					$tag= $extra ? $extra : "";
 print STDERR "length(tag) < $len + 1, tag now = #$tag#(extra = #$extra#)\n"
 	if $anal_merge_debug;
-			} elsif (substr $tag, 0,  $len + 1 eq ' ') {
-				$tag=substr $tag, $len + 1;
-				$tag=$extra . $tag if defined $extra;
+				} elsif (substr $tag, 0,  $len + 1 eq ' ') {
+					$tag=substr $tag, $len + 1;
+					$tag=$extra . $tag if defined $extra;
 print STDERR "substr tag, 0, $len + 1 was a space.  tag now = #$tag#\n"
 	if $anal_merge_debug;
-			} else {
-				$tag=substr $tag, $len;
-				### Back up a word in $chunk
-				$tag=$extra . $tag if defined $extra;
+				} else {
+					$tag=substr $tag, $len;
+					### Back up a word in $chunk
+					$tag=$extra . $tag if defined $extra;
 print STDERR "didn't break at space.  Backing up word.  tag now = #$tag#\n"
 	if $anal_merge_debug;
-				if ($chunk =~ s/(.*) (.*)$/$1/) {
-					$tag=$2 . $tag;
-					$chunk=&chunksizealign($chunk,$len,$align);
-				}
+					if ($chunk =~ s/(.*) (.*)$/$1/) {
+						$tag=$2 . $tag;
+						$chunk=&chunksizealign($chunk,$len,$align);
+					}
 print STDERR "If space in chunk then change chunk and add word to tag.".
 "Reformat chunk now = #$chunk# (tag = #$tag#)\n" if $anal_merge_debug;
+				}
+			} else {
+				$chunk = $tag;
+				$tag = "";
 			}
+			$len = quotemeta $len; # escape * if it's *
 			$sig =~ s/\@$plugin$len[RC]?@/$chunk/;
 		}
 	}
 	$sig =~ s/@([0-9]+)[RC]?@/" " x $1/eg;
+	$sig =~ s/@\*[RC]?@//g;
 	$cfg{'notag'} = $notag;
 	if ($tag and not $notag) {
 		return undef;
@@ -158,12 +166,19 @@ while(<SIG>) {
 	$sig .= $_;
 }
 close(SIG);
-open(TAG, "<$cfg{'tmptagfile'}") or htagdie "$1: Could not open $cfg{'tmptagfile'}: $!\n";
-while(<TAG>) {
-	$tag .= $_;
+my $ret = 0;
+if (grep { /\@NOTAG\@/ } $sig) {
+	$tag="";
+	$ret=26;
+	$sig =~ s/\@NOTAG\@\n//;
+} else {
+	open(TAG, "<$cfg{'tmptagfile'}") or htagdie "$1: Could not open $cfg{'tmptagfile'}: $!\n";
+	while(<TAG>) {
+		$tag .= $_;
+	}
+	close(TAG);
 }
-close(TAG);
-if (defined $sig and $sig =~ /@[A-Za-z]?[1-9][0-9]*[RC]?@/) {
+if (defined $sig and $sig =~ /@[A-Za-z]?\*|(?:[1-9][0-9]*)[RC]?@/) {
 	$sig =  merge($tag,$sig);
 } else {
 	my $formatted_tag = Text::Wrap::wrap($cfg{'first'},$cfg{'leader'},$tag);
@@ -176,7 +191,7 @@ if (defined $sig) {
 	print SIG "\n" while $cfg{'newline'}--;
 	print SIG $sig;
 	close(SIG);
-	return;
+	return $ret;
 } else {
 	return(10);
 }