← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gtk-doc/saucy

« back to all changes in this revision

Viewing changes to gtkdoc-mkdb.in

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-26 14:50:27 UTC
  • mfrom: (4.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100526145027-5z4e2cwvincjmrxj
Tags: 1.15-1ubuntu1
* Merge with debian unstable, remaining changes:
  + debian/control.in:
    - drop optional highlight build-dep (in universe)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtkdoc-mkdb.in
306
306
    'out' => "Parameter for returning results. Default is <acronym>transfer full</acronym>.",
307
307
    'transfer container' => "Free data container after the code is done.",
308
308
    'transfer full' => "Free data after the code is done.",
309
 
    'transfer none' => "Don't free data after the code is done."
 
309
    'transfer none' => "Don't free data after the code is done.",
 
310
    'scope call' => "The callback is valid only during the call to the method.",
 
311
    'scope async' => "The callback is valid until first called.",
 
312
    'scope notfied' => "The callback is valid until the GDestroyNotify argument is called."
310
313
);
311
314
 
312
315
# Create the root DocBook output directory if it doens't exist.
2616
2619
                    $annotation_extra = " $1";
2617
2620
                }
2618
2621
                $AnnotationsUsed{$match_annotation} = 1;
2619
 
                $param_annotations .= "<acronym>$match_annotation</acronym>$annotation_extra. ";
 
2622
                $param_annotations .= "[<acronym>$match_annotation</acronym>$annotation_extra]";
2620
2623
            }
2621
2624
            else {
2622
2625
                &LogWarning (&GetSymbolSourceFile ($symbol), &GetSymbolSourceLine($symbol),
2623
2626
                    "unknown annotation \"$annotation\" in documentation for $symbol.");
2624
 
                $param_annotations=$annotation;
 
2627
                $param_annotations .= "[$annotation]";
2625
2628
            }
2626
2629
        }
2627
2630
        chomp($param_desc);
2628
 
        $param_desc =~ m/^(.*)\.*\s*$/s;
 
2631
        $param_desc =~ m/^(.*?)\.*\s*$/s;
2629
2632
        $param_desc = "$1. ";
2630
 
    }    
 
2633
    }
 
2634
    if ($param_annotations ne "") {
 
2635
        $param_annotations = "<emphasis role=\"annotation\">$param_annotations</emphasis>";
 
2636
    }
2631
2637
    return ($param_desc, $param_annotations);
2632
2638
}
2633
2639
 
3782
3788
                $symbol = $1;
3783
3789
                #print "SECTION DOCS found in source for : '$symbol'\n";
3784
3790
                $ignore_broken_returns = 1;
3785
 
            } elsif (m%^\s*([\w:-]*\w)\s*:?\s*$%) {
 
3791
            } elsif (m%^\s*([\w:-]*\w)\s*:?\s*(\([a-z ]+\)\s*)*$%) {
3786
3792
                $symbol = $1;
3787
3793
                #print "SYMBOL DOCS found in source for : '$symbol'\n";
3788
3794
            }