diff options
| -rw-r--r-- | rf.1 | 14 | ||||
| -rwxr-xr-x | rf.pl | 14 |
2 files changed, 14 insertions, 14 deletions
@@ -59,7 +59,7 @@ Default: (%a %y) .It Sy \&Fl Defines the format for the reference list, which is usually located at the end of the document. .Pp -Default: %a (%y). %t. %q. %n, %d. %c: %p. {Available: %w.} +Default: %a (%y). {\\fI%t\\fR}. {\\*Q%q\\*U}. %n, %d. %c: %p. {Available: %w.} .It Sy \&Fx Defines the format for .Dq alternate @@ -172,16 +172,16 @@ For example: By wrapping an interpolation in braces, you can specify a prefix and/or suffix that should be included only if the interpolation is successful. For example: .Bd -literal -offset indent -\&.Ff (%a {,%y}). \\" The comma is removed if there is no year. +\&.Ff (%a{, %y}). \\" Here, ', ' is removed if there is no year. .Ed .Pp -You need not worry about excessive spaces, as -.Nm -removes these automatically. -.Pp -All fields are inserted literally, except +Note that all fields are inserted literally, except .Em %a , from which the forenames of the authors are removed. +.Pp +Finally, you usually don't need to worry about excessive spaces and stray punctuation marks, as +.Nm +removes many of these these automatically. . .Sh AUTHORS .Nm @@ -7,7 +7,7 @@ use warnings; my $format_full = '(%a %y)'; my $format_extra = '(%y)'; -my $format_list = '%a (%y). %t. %q. %n, %d. %c: %p. {Available: %w.}'; +my $format_list = '%a (%y). {\fI%t\fR}. {\*Q%q\*U}. %n, %d. %c: %p. {Available: %w.}'; # Internal variables @@ -112,17 +112,17 @@ sub fmt { no warnings; my $val = $ref{$fld}; $val = fmta($val) if $fld eq 'a' and not $full; - $fmt =~ s/\{(.*?)%$fld(.*?)}/$1$val$3/g; - $fmt =~ s/%$fld/$val/g; + $fmt =~ s/\{([^{}%]*)%\Q$fld\E([^{}]*)}/$1$val$2/g; + $fmt =~ s/%\Q$fld\E/$val/g; } else { no warnings; - $fmt =~ s/\{(.*?)%$fld(.*?)}//g; - $fmt =~ s/[.(]?%$fld[.,:;)]?//g; + $fmt =~ s/[.(]?\{([^{}%]*)%\Q$fld\E([^{}]*)}[.,:;)]?//g; + $fmt =~ s/[.(]?%\Q$fld\E[.,:;)]?//g; } } $fmt =~ s/ +/ /g; - $fmt =~ s/([(]) */$1/; - $fmt =~ s/ *([.,)])/$1/; + #$fmt =~ s/([(]) +/$1/; + #$fmt =~ s/ +([.,)])/$1/; $fmt =~ s/^ *//; $fmt =~ s/ *$//; return $fmt; |