[SCM] GNU shishi branch, master, updated. shishi-1-0-2-44-g78f403d

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=78f403d8c77c8493f4cea9902e7fe27715ed1e04

The branch, master has been updated
       via  78f403d8c77c8493f4cea9902e7fe27715ed1e04 (commit)
      from  cac0e3c7d14f16a361386ccdc0f80a8300e3b638 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 78f403d8c77c8493f4cea9902e7fe27715ed1e04
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Jul 11 14:33:49 2014 +0200

    gdoc: Render principal strings in all modes.
    
    An identifier like "address@hidden" was never captured
    correctly, since it was parsed as a parameter
    identifier.

-----------------------------------------------------------------------

Summary of changes:
 doc/gdoc |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/gdoc b/doc/gdoc
index 9391f45..83f3312 100755
--- a/doc/gdoc
+++ b/doc/gdoc
@@ -162,7 +162,8 @@ my ($modulename, $pkgname, $seeinfo, $sourceversion, 
$verbatimcopying);
 # Matching expressions used to find embedded type information.
 my $type_constant = '%(\w+)';
 my $type_func  = '(\w+\(\))';
-my $type_param = '@(\w+|\.\.\.)';
+my $type_param = '\B@(\w+|\.\.\.)';
+my $type_addr  = 'address@hidden';
 my $type_struct        = '#(\w+)';
 my $type_env   = '\$(\w+)';
 
@@ -180,6 +181,7 @@ my %highlights_html = (
 );
 
 my %highlights_texinfo = (
+       $type_addr      => '@@',
        $type_constant  => '@code{$1}',
        $type_func      => '@code{$1}',
        $type_struct    => '@code{$1}',
@@ -368,11 +370,10 @@ sub just_highlight {
     #
     # The ordering of hash keys cannot be guaranteed!
 
-    my @patterns = grep ! m/^@/, keys %highlights;
+    my @patterns = grep { $_ ne $type_param; } keys %highlights;
 
     unshift @patterns, $type_param
-       if defined $highlights{$type_param}
-           and grep m/^@/, keys %highlights;
+       if defined $highlights{$type_param};
 
     foreach my $pattern (@patterns) {
        if ($verbose > 1) {


hooks/post-receive
-- 
GNU shishi