Release-1.2.10-20010923

5 files changed, 148 insertions, 14 deletions

diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex
index bc1dfbb..6f3313a 100644
--- a/doc/doxygen_manual.tex
+++ b/doc/doxygen_manual.tex
@@ -16,6 +16,7 @@
 \usepackage{a4wide}
 \usepackage{makeidx}
 \usepackage{fancyhdr}
+\usepackage{float}
 \usepackage{graphicx}
 \usepackage{epsf}
 \usepackage{doxygen}
diff --git a/doc/install.doc b/doc/install.doc
index 99e8e56..528c36e 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -514,13 +514,17 @@ Compilation is now done by performing the following steps:
 
 \subsection install_bin_windows Installating the binaries on Windows
 
-There is no fancy installation procedure at the moment (if anyone wants
-to add it please let me know).
+There is no fancy installation procedure at the moment (if anyone can
+add it in a location independent way please let me know).
 
 To install doxygen, just copy the binaries from the <code>bin</code> directory
 to a location somewhere in the path. Alternatively, you can include 
 the <code>bin</code> directory of the distribution to the path.
 
+For running doxywizard you need to install the non-commercial version of
+the Qt library first. This library can be downloaded from 
+http://www.trolltech.com/products/download/freelicense/noncommercial-dl.html
+
 \subsection build_tools Tools used to develop doxygen
 
 Doxygen was developed and tested under Linux using the following 
diff --git a/doc/language.doc b/doc/language.doc
index 101273f..ceb842b 100644
--- a/doc/language.doc
+++ b/doc/language.doc
@@ -25,7 +25,7 @@ Doxygen has built-in support for multiple languages. This means
 that the text fragments that doxygen generates can be produced in
 languages other than English (the default) at configuration time.
 
-Currently (version 1.2.10), 24 languages 
+Currently (version 1.2.10-20010909), 24 languages 
 are supported (sorted alphabetically): 
 Brazilian Portuguese, Chinese, Croatian, Czech, Danish, 
 Dutch, English, Finnish, French, German, 
diff --git a/doc/starting.doc b/doc/starting.doc
index 402a765..2ef5775 100644
--- a/doc/starting.doc
+++ b/doc/starting.doc
@@ -184,7 +184,8 @@ During parsing the following steps take place:
 <li> The special commands inside the documentation are executed. See
      section \ref commands for an overview of all commands.
 <li> If a line starts with some whitespace followed by one or more asterixes 
-     (<tt>*</tt>) then the whitespace and asterixes are removed.
+     (<tt>*</tt>) and then optionally more whitespace, 
+     then all whitespace and asterixes are removed.
 <li> All resulting blank lines are treated as a paragraph separators.
      This saves you from placing new-paragraph commands yourself 
      in order to make the generated documentation readable.
diff --git a/doc/translator.pl b/doc/translator.pl
index 207f191..e031674 100644
--- a/doc/translator.pl
+++ b/doc/translator.pl
@@ -55,6 +55,28 @@
 #    equal prototypes from the base class and from the derived
 #    classes (if they should be considered equal).
 #
+# 2001/08/28
+#  - "see details" added to the up-to-date translator list 
+#    (in translator report) to translators for which some details
+#    are listed below in the report.  This is usually the case
+#    when the up-to-date translator still implements a obsolete
+#    method that will never be called (i.e. the code should be removed).
+#
+# 2001/09/10
+#  - The script now always exits with 0.  If the sources are not
+#    found, translator report is not generated.  If the $flangdoc
+#    is not also found and no sources are available, the simplified
+#    result with remarks inside is generated from the template.
+#    The consequences, translator.pl should never break the "make",
+#    and the language.doc should always be present after running
+#    this script -- no problem should occur when generating doxygen
+#    documentation.
+#
+# 2001/09/11
+#  - Minor (say cosmetic) enhancement.  The code for generating
+#    the simplified language.doc from the template was moved to 
+#    the separate function CopyTemplateToLanguageDoc().
+#
 ################################################################
 
 use 5.005;
@@ -642,6 +664,64 @@ xxxTABLE_FOOTxxx
 }
 ##}}}
 
+################################################################
+# CopyTemplateToLanguageDoc takes the $flangtpl template and 
+# generates $flangdoc without using information from other
+# sources.  This function is called when source files were not found.
+# The marks inside the template are replaced by warning-like
+# explanations that something could not be done because sources
+# were not available.  Writes directly to the file, returns nothing.
+#
+sub CopyTemplateToLanguageDoc ##{{{
+{
+    # The template file will be the source.
+    #
+    my $fin = "$docdir/$flangtpl"; 
+            
+    # Let's open the template and read it all into one string.
+    #
+    open(FIN, "< $fin") or die "\nError when open < $fin: $!";
+    my @content = <FIN>;
+    close FIN;
+    my $cont = join("", @content);
+    
+    # Replace the template marks by some notices.
+    #
+    $cont =~ s{<notice>.+?</notice>}
+{Warning: this file was generated from the $flangtpl template 
+ *          by the $0 script.  As doxygen sources were not available 
+ *          in that time, some information could not be extracted 
+ *          and inserted into this file.
+ *
+ *          Do not edit this file.  Edit the above mentioned files!}sx;
+            
+    $cont =~ s{\$version}{$doxversion};
+            
+    $cont =~ s{\$numlang}
+  {<b>[number of supported languages could not be extracted -- no sources]</b>};
+            
+    $cont =~ s{\$languages}
+        {<b>[names of languages could not be extracted -- no sources]</b>};
+            
+    $cont =~ s{\$information_table}
+        {<b>[Information table could not be extracted -- no sources.]</b>};
+            
+    $cont =~ s{\$translator_report_file_name}
+        {$ftranslatortxt <b>[translator report could not be 
+         generated -- no sources]</b>}x;
+            
+    $cont =~ s{\$translator_report_link}{<b>[no sources, no link]</b>};
+            
+    # Let's open the output file and copy the template content there.
+    #
+    my $fout = "$docdir/$flangdoc";
+            
+    open(FOUT, "> $fout") or die "\nError when open > $fout: $!";
+    print FOUT $cont;
+    close FOUT;
+}
+##}}}
+
 
 ################################################################
 # Body
@@ -672,16 +752,42 @@ print STDERR "\n\n";
 
     ##}}}
     
-    # The translator base class must be present.  Exit otherwise. #{{{
+    # The translator base class must be present.  Exit otherwise,
+    # but be kind to those who already have the documentation
+    # generated by this script ready, but who do not have sources. 
+    # If no $flangdoc is present, copy the template to it. #{{{
     #
-    if (!-f "$srcdir/translator.h")
-    {
-        print STDERR "\n\nThe translator.h not found in $srcdir.\n\n\a";
-        exit 1;
+    if (!-f "$srcdir/translator.h") {
+        print STDERR "\nThe $0 warning:\n"
+                     . "\tThe translator.h not found in $srcdir.\n"
+                     . "\tThe $ftranslatortxt will not be "
+                     . "generated (you don't need it).\n";
+
+        # $flangdoc is present, copy the template to it.
+        #
+        if (!-f "$docdir/$flangdoc") {
+
+            # Copy the template document to $flandoc with simplified
+            # replacement of the markers inside the template.
+            #
+            CopyTemplateToLanguageDoc();
+            
+            # Generate the warning about $flangdoc content.
+            #
+            print STDERR "\nThe $0 warning:\n"
+                . "\tThe $flangdoc not found in the '$docdir' directory.\n"
+                . "\tThe $flangtpl template content copied into it.\n"
+                . "\tAs the sources are not available, some information\n"
+                . "\tcould not be extracted and inserted into $flangdoc.\n";
+        }
+        
+        # Exit as if nothing happened.
+        #
+        exit 0;
     }
     ##}}}
 
-    # Find all translator_xx.h files. #{{{
+    # Find all translator_xx.h file names. #{{{
     #
     my @entries = ();  # init
 
@@ -700,9 +806,12 @@ print STDERR "\n\n";
     my @expected = GetPureVirtualFrom("$srcdir/translator.h");
 
     # The details for translators will be collected into the output
-    # string.
+    # string. If some details are listed for a translator, the flag
+    # will be set to produce possible warning to the list of
+    # up-to-date translators.
     #
     my $output = '';
+    my %details = ();
 
     # Remove the argument identifiers from the method prototypes
     # to get only the required form of the prototype. Fill the
@@ -728,7 +837,8 @@ print STDERR "\n\n";
     foreach (@files) {                               
 
         # Get the information from the sources.  Remember the base
-        # class for each of the classes. #{{{
+        # class for each of the classes.  Clear the flag for
+        # details for the class. #{{{
         #
         my @info = GetInfoFrom("$srcdir/$_");
         
@@ -736,6 +846,8 @@ print STDERR "\n\n";
         my $base = shift @info;
 
         $cb{$class} = $base;
+        $details{$class} = 0;
+        
         ##}}}
         
         # Set the value of the required methods to 1 (true).  Let
@@ -821,7 +933,12 @@ print STDERR "\n\n";
             if (@old_methods) {
                 $output .= "\nObsolete methods (should be removed):\n\n";
                 foreach (sort @old_methods) { $output .= "  $_\n"; }
-            }    
+            }
+                
+            # Some details were listed, set the details flag for
+            # the class.
+            #
+            $details{$class} = 1;
         }
         ##}}}
     }
@@ -863,15 +980,26 @@ print STDERR "\n\n";
                  . "release.  Anyway, there\n"
                  . "still may be some details listed even for "
                  . "the up-to-date translators.\n"
-                 . "Please, check the text below.\n\n";
+                 . "Please, check the text below if the translator "
+                 . "is marked so.\n\n";
         
         foreach (@list) { 
+            
+            # Print the class name.
+            #
             print FOUT "  $_";
             
             # For almost up-to-date translators, show also the base class.
             #
             if ($cb{$_} ne 'Translator') { print FOUT "\t($cb{$_})"; }
             
+            # If some details were listed for the translator class,
+            # add a notice.
+            #
+            if ($details{$_}) {
+                print FOUT "\t-- see details below in the report"; 
+            }
+            
             print FOUT "\n"; 
         }
     }