]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge the 2.a36 release.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 21 Jun 2000 12:55:49 +0000 (12:55 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 21 Jun 2000 12:55:49 +0000 (12:55 +0000)
git-svn-id: https://svn.dealii.org/trunk@3050 0785d39b-7218-0410-832d-ea1e28bc413d

12 files changed:
deal.II/contrib/kdoc/src/Iter.pm
deal.II/contrib/kdoc/src/Version
deal.II/contrib/kdoc/src/debian/changelog
deal.II/contrib/kdoc/src/debian/control
deal.II/contrib/kdoc/src/debian/copyright
deal.II/contrib/kdoc/src/debian/rules
deal.II/contrib/kdoc/src/doc/Makefile.in
deal.II/contrib/kdoc/src/doc/kdoc.pod
deal.II/contrib/kdoc/src/kdoc
deal.II/contrib/kdoc/src/kdocAstUtil.pm
deal.II/contrib/kdoc/src/kdocCxxHTML.pm
deal.II/contrib/kdoc/src/kdocParseDoc.pm

index 337825ddadfceeafb97b60b14492dfb563a02495..f134b66e569ae2205ad13ba81b6dd879c183fd3c 100644 (file)
@@ -331,8 +331,9 @@ sub MembersByType
                        return;
        }
 
-       foreach my $access ( qw/public protected private/ ) {
-               next if $access eq "private" && !$main::doPrivate;
+       foreach my $acc ( qw/public protected private/ ) {
+               next if $acc eq "private" && !$main::doPrivate;
+               $access = $acc;
 
                my @types = ();
                my @data = ();
@@ -386,23 +387,23 @@ sub MembersByType
                }
 
                # apply
-               $access = ucfirst( $access );
+               $uc_access = ucfirst( $access );
                
-               doGroup( "$access Types", $node, \@types, $startgrpsub,
+               doGroup( "$uc_access Types", $node, \@types, $startgrpsub,
                        $methodsub, $endgrpsub);
                doGroup( "Modules", $node, \@modules, $startgrpsub,
                        $methodsub, $endgrpsub);
                doGroup( "Interfaces", $node, \@interfaces, $startgrpsub,
                        $methodsub, $endgrpsub);
-               doGroup( "$access Methods", $node, \@methods, $startgrpsub,
+               doGroup( "$uc_access Methods", $node, \@methods, $startgrpsub,
                        $methodsub, $endgrpsub);
-               doGroup( "$access Slots", $node, \@slots, $startgrpsub,
+               doGroup( "$uc_access Slots", $node, \@slots, $startgrpsub,
                        $methodsub, $endgrpsub);
                doGroup( "Signals", $node, \@signals, $startgrpsub,
                        $methodsub, $endgrpsub);
-               doGroup( "$access Static Methods", $node, \@static, 
+               doGroup( "$uc_access Static Methods", $node, \@static, 
                        $startgrpsub, $methodsub, $endgrpsub);
-               doGroup( "$access Members", $node, \@data, $startgrpsub,
+               doGroup( "$uc_access Members", $node, \@data, $startgrpsub,
                        $methodsub, $endgrpsub);
        }
 }
@@ -411,13 +412,22 @@ sub doGroup
 {
        my ( $name, $node, $list, $startgrpsub, $methodsub, $endgrpsub ) = @_;
 
-       return if $#$list < 0;
+        my ( $hasMembers ) = 0;
+        foreach my $kid ( @$list ) {
+                if ( !exists $kid->{DocNode}->{Reimplemented} ) {
+                        $hasMembers = 1;
+                        break;
+                }
+        }
+       return if !$hasMembers;
 
        $startgrpsub->( $name ) if defined $startgrpsub;
        
        if ( defined $methodsub ) {
                foreach my $kid ( @$list ) {
-                       $methodsub->( $node, $kid );
+                        if ( !exists $kid->{DocNode}->{Reimplemented} ) {
+                               $methodsub->( $node, $kid );
+                        }
                }
        }
 
index 9b3dad19f9d546c7912dbef00671ff308133e897..bcdcc1dbe4edca46712e9461a1c21a25c0198770 100644 (file)
@@ -1 +1,2 @@
-2.0a35
+2.0a36
+
index 71a274e5922bc8e5d779e22812bf206521231422..41c789faa22aa479cf895a39a60f06178472d4de 100644 (file)
@@ -1,3 +1,9 @@
+kdoc (2.0a35-1.0) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 21 Feb 2000 23:30:06 -0700
+
 kdoc (2.0a15-1.0) unstable; urgency=low
 
   * New upstream version
index a430a44988eb73c639edbcbe7dc6fc12493d2bba..f015cab6647c8df04b4329ee24a721436ae96f47 100644 (file)
@@ -1,8 +1,9 @@
 Source: kdoc
+Build-Depends: debhelper, automake, autoconf, perl5
 Section: devel
 Priority: optional
 Maintainer: Bernd Gehrmann <bernd@physik.hu-berlin.de>
-Standards-Version: 3.0.1
+Standards-Version: 3.1.1
 
 Package: kdoc
 Architecture: all
index 8af64498d47feec4226cf82c41aab00bff98e0fa..f7b975382a6216571daad533d81124fb34b80e6f 100644 (file)
@@ -4,4 +4,4 @@ Copyright:
 
 KDOC is released under the terms of the GNU GPL.
 
-See /usr/doc/copyright/GPL for the full license.
+See /usr/share/common-licenses/GPL for the full license.
index 8e7b7271a0d99631281575dafd2cdc7b29454c99..b1c1c093fe2317cac9587271972393ca7cb747c8 100755 (executable)
@@ -8,7 +8,7 @@
 
 build:
        dh_testdir
-       ./configure --prefix=/usr
+       ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
        $(MAKE) 
        touch build
 
index 955d049a08d0b3f34e260e4acfa660901df5fdb5..1b0e3548c7e421c81e98e1e16620fd948a4535a9 100644 (file)
@@ -5,9 +5,9 @@ docdir=@docdir@
 install=@INSTALL@
 
 MANPAGES = kdoc.1 makekdedoc.1 qt2kdoc.1
-MAINDOC = @srcdir@/kdoc.docbook @top_srcdir@/README
+MAINDOC = @srcdir@/index.docbook @top_srcdir@/README
 
-all: ${MANPAGES}
+all: ${MANPAGES} htmldoc
 
 install:
        ${install} -d $(DESTDIR)${mandir}
@@ -39,8 +39,9 @@ qt2kdoc.1: @top_srcdir@/qt2kdoc @top_srcdir@/Version
 clean:
        rm -rf kdoc.1 makekdedoc.1 qt2kdoc.1
 
-
-html: kdoc.docbook
-       mkdir html; (cd html && jade -d \
+# This needs to be improved, obviously
+htmldoc: @srcdir@/index.docbook
+       -rm -rf html; mkdir html; (cd html && jade -d \
         /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/html/docbook.dsl -t sgml \
        ../$< )
+
index b784557f2c4113ac403ded843cb3bd62844389a5..466abc45130960d10eea4e25014967c27ec29c93 100644 (file)
@@ -104,6 +104,11 @@ is required for this, but this requirement will change before
 2.0. Directories for inclusion in the preprocessor header search path
 can be specified via the B<-I> option.
 
+=item B<--docincluded>
+
+Parse files that are included by the preprocessor #include macro.
+This is off by default.
+
 =item B<-cppcmd> <command>, B<-C> <command>
 
 Specify the preprocessor command that will be used. The default is:
index 86219e287f12124db024774d369bb5084bb3766d..cbdd46bd1c0cbe7dafc509d608cc0fe8d10cdea7 100755 (executable)
@@ -21,12 +21,12 @@ use kdocAstUtil;
 use kdocParseDoc;
 
 use vars qw/ %rootNodes $declNodeType %options @formats_wanted
-        @includeclasses $includeclasses
+        @includeclasses $includeclasses $skipInternal
        $libdir $libname $outputdir @libs $striphpath $doPrivate $readstdin
        $Version $quiet $debug $parseonly $currentfile $cSourceNode $exe
        %formats %flagnames $rootNode @classStack $cNode 
-       $lastLine $docNode @includes $cpp $defcppcmd $cppcmd $inExtern
-       %stats /;
+       $lastLine $docNode @includes $cpp $defcppcmd $cppcmd $docincluded
+       $inExtern %stats /;
      
 ## globals
 
@@ -84,7 +84,7 @@ Getopt::Long::config qw( no_ignore_case permute bundling auto_abbrev );
 GetOptions( \%options,
        "format|f=s", \@formats_wanted,
        "url|u=s",
-        "skip-internal|i",
+       "skip-internal", \$skipInternal,
        "skip-deprecated|e", 
        "document-all|a",
        "compress|z",
@@ -105,7 +105,8 @@ GetOptions( \%options,
        "classes|c=s",    \@includeclasses,
        
        "cpp|P",        \$cpp,
-       "cppcmd|C",     \$cppcmd,
+       "docincluded",  \$docincluded,
+       "cppcmd|C=s",   \$cppcmd,
        "includedir|I=s", \@includes,
 
        "quiet|q",      \$quiet,
@@ -212,18 +213,19 @@ sub parseFiles
                if ( $currentfile =~ /\.idl\s*$/ ) {
                        # IDL file
                        $lang = "IDL";
-
-                       open( INPUT, "$currentfile" ) 
-                               || croak "Can't read from $currentfile";
                }
+
                # assume cxx file
-               elsif( $cpp ) {
+               if( $cpp ) {
                        # pass through preprocessor
                        my $cmd = $cppcmd;
                        foreach my $dir ( @includes ) {
                                $cmd .= " -I $dir ";
                        }
-                       open( INPUT, $cmd." -DQOBJECTDEFS_H $currentfile|" )
+
+                       $cmd .= " -DQOBJECTDEFS_H $currentfile";
+
+                       open( INPUT, "$cmd |" )
                                || croak "Can't preprocess $currentfile";
                }
                else {
@@ -351,9 +353,16 @@ LOOP:
                        || $p =~ /^\s*Q_OBJECT/         # QObject macro
                        );
 
+               next if ( $p =~ /^\s*Q_ENUMS/           # ignore Q_ENUMS
+                        || $p =~ /^\s*Q_PROPERTY/       # and Q_PROPERTY
+                        || $p =~ /^\s*K_SYCOCATYPE/     # and K_SYCOCA stuff
+                        || $p =~ /^\s*K_SYCOCAFACTORY/  # 
+                        || $p =~ /^\s*K_DCOP/           # and DCOP stuff
+                       );
+
                # remove all preprocessor macros
                if( $p =~ /^\s*#\s*(\w+)/ ) {
-                       if ($p =~ /^\s*#\s*[0-9]+\s*\".*$/ 
+                       if (!$docincluded && $p =~ /^\s*#\s*[0-9]+\s*\".*$/ 
                                        && not($p =~ /\"$currentfile\"/)) {
                                # include file markers
                                while( <INPUT> ) {
index 40e1238f54aee845c7ff23bea4708237b57b247d..5da9647cbc9d1eeed54595bd491fd9e049274e56 100644 (file)
@@ -593,7 +593,10 @@ sub makeClassList
                                my $her = join ( "::", heritage( $node ) );
                                $node->AddProp( "FullName", $her );
 
-                               push @$list, $node;
+                               if ( !exists $node->{DocNode}->{Internal} ||
+                                    !$main::skipInternal ) {
+                                       push @$list, $node;
+                               }
        } );
 
        @$list = sort { $a->{FullName} cmp $b->{FullName} } @$list;
index 58c1cddfda9568d1e723d5239a76219497839522..73ce4f8903c720d09753bf8375917ae3af9d9f61 100644 (file)
@@ -450,8 +450,9 @@ sub writeClassDoc
        else {
                Iter::MembersByType ( $node, 
                        sub { print CLASS "<h4>", $_[0], "</h4><ul>"; },
-                       sub {   my ($node, $kid ) = @_; 
-                               listMember( $node, $kid ); },
+                       sub {   my ($node, $kid ) = @_;
+                                listMember( $node, $kid ); 
+                            },
                        sub { print CLASS "</ul>"; }
                );
        }
@@ -493,8 +494,11 @@ sub writeClassDoc
                                $ref = kdocAstUtil::findOverride( $rootnode, 
                                                $node, $kid->{astNodeName} );
                                if ( defined $ref ) {
-                                       print CLASS "<p>Reimplemented from ",
-                                               refName( $ref ), "</p>\n";
+                                       print CLASS "<p>Reimplemented from ", refName( $ref );
+                                        if ( exists $kid->{DocNode}->{Reimplemented} ) {
+                                                print CLASS " for internal reasons; the API is not affected";
+                                        }
+                                        print CLASS ".</p>\n";
                                }
                        }
 
index 143eccc12b2a808c70b8b111a7569b763e626490..ec5b14983dc4e83a2c1c324996a523ead89fefd9 100644 (file)
@@ -83,6 +83,9 @@ PARSELOOP:
                elsif ( $text =~ /^\s*\@deprecated\s*/ ) {
                        codeProp( "Deprecated", 1 );
                }
+               elsif ( $text =~ /^\s*\@reimplemented\s*/ ) {
+                       codeProp( "Reimplemented", 1 );
+               }
                elsif ( $text =~ /^\s*\@group\s*/ ) {
                        # logical group tag in which this node belongs
                        # multiples allowed
@@ -136,7 +139,7 @@ PARSELOOP:
                elsif( $text =~ /^\s*\@(?:throws|exception|raises)\s*/ ) {
                        docListProp( "Throws" );
                }
-               elsif( $text =~ /^\s*\@image\s+(\w+)\s*/ ) {
+               elsif( $text =~ /^\s*\@image\s+([^\s]+)\s*/ ) {
                        textProp( "Image" );
                        $extraprops{ "Path" } = $1;
                }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.