Some generated files were not updated.

fixed relative path issue when using HTML_EXTRA_STYLESHEET.

INSTALL

@@ -4,4 +4,4 @@ Please read the installation section of the manual
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (11 August 2012)
+Dimitri van Heesch (12 August 2012)

README

@@ -26,4 +26,4 @@ forum.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (11 August 2012)
+Dimitri van Heesch (dimitri@stack.nl) (12 August 2012)

src/Makefile.in

@@ -33,21 +33,27 @@ tmake:
 	$(ENV) $(PERL) $(TMAKE) libdoxycfg.pro >Makefile.libdoxycfg
 	$(ENV) $(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
 
+# clean objects
 clean: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen 
 	$(MAKE) -f Makefile.libdoxygen clean 
 	$(MAKE) -f Makefile.libdoxycfg clean 
 	$(MAKE) -f Makefile.doxygen    clean 
 
+# also clean flex/bison generated files
 distclean: clean
 	-$(RM) scanner.cpp code.cpp config.cpp pre.cpp ce_lex.cpp \
                ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \
 	       declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \
 	       pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \
 	       vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp vhdlparser.h \
-	       vhdlparser.cpp index_xsd.h compound_xsd.h layout_default.h \
-               header_html.h footer_html.h search_functions_php.h search_opensearch_php.h \
+	       vhdlparser.cpp \
+
+# clean also the generated files which are in SVN
+realclean: distclean
+	-$(RM) index_xsd.h compound_xsd.h layout_default.h \
+	       header_html.h footer_html.h search_functions_php.h search_opensearch_php.h \
 	       search_js.h search_css.h doxygen_css.h navtree_js.h navindex_js.h resize_js.h \
-               jquery_fx_js.h jquery_p1_js.h jquery_p2_js.h \
+	       jquery_fx_js.h jquery_p1_js.h jquery_p2_js.h \
 	       jquery_p3_js.h jquery_ui_js.h navtree_css.h svgpan_js.h dynsections_js.h \
 	       doxygen_bst.h bib2xhtml.h configoptions.cpp
 

src/configoptions.cpp

@@ -208,7 +208,9 @@ void addConfigOptions(Config *cfg)
                  "only done if one of the specified strings matches the left-hand part of\n"
                  "the path. The tag can be used to show relative paths in the file list.\n"
                  "If left blank the directory from which doxygen is run is used as the\n"
-                 "path to strip."
+                 "path to strip. Note that you specify absolute paths here, but also\n"
+                 "relative paths, which will be relative from the directory where doxygen is\n"
+                 "started."
                 );
   cl->addValue("");
   cl->addDependency("FULL_PATH_NAMES");
@@ -281,7 +283,7 @@ void addConfigOptions(Config *cfg)
                  "TAB_SIZE",
                  "The TAB_SIZE tag can be used to set the number of spaces in a tab.\n"
                  "Doxygen uses this value to replace tabs by spaces in code fragments.",
-                 1,16,8
+                 1,16,4
                 );
   //----
   cl = cfg->addList(
@@ -339,14 +341,15 @@ void addConfigOptions(Config *cfg)
   cl = cfg->addList(
                  "EXTENSION_MAPPING",
                  "Doxygen selects the parser to use depending on the extension of the files it\n"
-                 "parses. With this tag you can assign which parser to use for a given extension.\n"
-                 "Doxygen has a built-in mapping, but you can override or extend it using this\n"
-                 "tag. The format is ext=language, where ext is a file extension, and language\n"
-                 "is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,\n"
-                 "C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make\n"
-                 "doxygen treat .inc files as Fortran files (default is PHP), and .f files as C\n"
-                 "(default is Fortran), use: inc=Fortran f=C. Note that for custom extensions\n"
-                 "you also need to set FILE_PATTERNS otherwise the files are not read by doxygen."
+                 "parses. With this tag you can assign which parser to use for a given\n"
+                 "extension. Doxygen has a built-in mapping, but you can override or extend it\n"
+                 "using this tag. The format is ext=language, where ext is a file extension,\n"
+                 "and language is one of the parsers supported by doxygen: IDL, Java,\n"
+                 "Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,\n"
+                 "C++. For instance to make doxygen treat .inc files as Fortran files (default\n"
+                 "is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note\n"
+                 "that for custom extensions you also need to set FILE_PATTERNS otherwise the\n"
+                 "files are not read by doxygen."
                 );
   //----
   cb = cfg->addBool(
@@ -360,6 +363,15 @@ void addConfigOptions(Config *cfg)
                  TRUE
                 );
   //----
+  cb = cfg->addBool(
+                 "AUTOLINK_SUPPORT",
+                 "When enabled doxygen tries to link words that correspond to documented classes,\n"
+                 "or namespaces to their corresponding documentation. Such a link can be\n"
+                 "prevented in individual cases by by putting a % sign in front of the word or\n"
+                 "globally by setting AUTOLINK_SUPPORT to NO.",
+                 TRUE
+                );
+  //----
   cb = cfg->addBool(
                  "BUILTIN_STL_SUPPORT",
                  "If you use STL classes (i.e. std::string, std::vector, etc.) but do not want\n"
@@ -388,12 +400,7 @@ void addConfigOptions(Config *cfg)
   //----
   cb = cfg->addBool(
                  "IDL_PROPERTY_SUPPORT",
-                 "For Microsoft's IDL there are propget and propput attributes to indicate getter\n"
-                 "and setter methods for a property. Setting this option to YES (the default)\n"
-                 "will make doxygen replace the get and set methods by a property in the\n"
-                 "documentation. This will only work if the methods are indeed getting or\n"
-                 "setting a simple type. If this is not the case, or you want to show the\n"
-                 "methods anyway, you should set this option to NO.",
+                 "For Microsoft's IDL there are propget and propput attributes to indicate getter and setter methods for a property. Setting this option to YES (the default) will make doxygen replace the get and set methods by a property in the documentation. This will only work if the methods are indeed getting or setting a simple type. If this is not the case, or you want to show the methods anyway, you should set this option to NO.",
                  TRUE
                 );
   //----
@@ -501,7 +508,8 @@ void addConfigOptions(Config *cfg)
   //----
   cb = cfg->addBool(
                  "EXTRACT_PACKAGE",
-                 "If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.",
+                 "If the EXTRACT_PACKAGE tag is set to YES all members with package or internal\n"
+                 "scope will be included in the documentation.",
                  FALSE
                 );
   //----
@@ -1212,10 +1220,23 @@ void addConfigOptions(Config *cfg)
                  "HTML_STYLESHEET",
                  "The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n"
                  "style sheet that is used by each HTML page. It can be used to\n"
-                 "fine-tune the look of the HTML output. If the tag is left blank doxygen\n"
-                 "will generate a default style sheet. Note that doxygen will try to copy\n"
-                 "the style sheet file to the HTML output directory, so don't put your own\n"
-                 "style sheet in the HTML output directory as well, or it will be erased!"
+                 "fine-tune the look of the HTML output. If left blank doxygen will\n"
+                 "generate a default style sheet. Note that it is recommended to use\n"
+                 "HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this\n"
+                 "tag will in the future become obsolete."
+                );
+  cs->setWidgetType(ConfigString::File);
+  cs->addDependency("GENERATE_HTML");
+  //----
+  cs = cfg->addString(
+                 "HTML_EXTRA_STYLESHEET",
+                 "The HTML_EXTRA_STYLESHEET tag can be used to specify an additional\n"
+                 "user-defined cascading style sheet that is included after the standard\n"
+                 "style sheets created by doxygen. Using this option one can overrule\n"
+                 "certain style aspects. This is preferred over using HTML_STYLESHEET\n"
+                 "since it does not replace the standard style sheet and is therefor more\n"
+                 "robust against future updates. Doxygen will copy the style sheet file to\n"
+                 "the output directory."
                 );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
@@ -1334,9 +1355,9 @@ void addConfigOptions(Config *cfg)
   //----
   cs = cfg->addString(
                  "DOCSET_PUBLISHER_ID",
-                 "When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify\n"
-                 "the documentation publisher. This should be a reverse domain-name style\n"
-                 "string, e.g. com.mycompany.MyDocSet.documentation."
+                 "When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely\n"
+                 "identify the documentation publisher. This should be a reverse domain-name\n"
+                 "style string, e.g. com.mycompany.MyDocSet.documentation."
                 );
   cs->setDefaultValue("org.doxygen.Publisher");
   cs->addDependency("GENERATE_DOCSET");

src/doxygen_css.h

@@ -6,7 +6,7 @@
 "\n"
 "/* @group Heading Levels */\n"
 "\n"
-"h1 {\n"
+"h1.groupheader {\n"
 "	font-size: 150%;\n"
 "}\n"
 "\n"
@@ -16,7 +16,7 @@
 "	margin: 10px 2px;\n"
 "}\n"
 "\n"
-"h2 {\n"
+"h2.groupheader {\n"
 "	border-bottom: 1px solid ##99;\n"
 "	color: ##44;\n"
 "	font-size: 150%;\n"
@@ -27,7 +27,7 @@
 "	width: 100%;\n"
 "}\n"
 "\n"
-"h3 {\n"
+"h3.groupheader {\n"
 "	font-size: 100%;\n"
 "}\n"
 "\n"
@@ -857,7 +857,10 @@
 "	display:block;\n"
 "	text-decoration: none;\n"
 "	outline: none;\n"
+"	color: ##30;\n"
 "	font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;\n"
+"	text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);\n"
+"	text-decoration: none;        \n"
 "}\n"
 "\n"
 ".navpath li.navelem a:hover\n"

src/header_html.h

@@ -12,6 +12,7 @@
 "$search\n"
 "$mathjax\n"
 "<link href=\"$relpath$$stylesheet\" rel=\"stylesheet\" type=\"text/css\" />\n"
+"$extrastylesheet\n"
 "</head>\n"
 "<body>\n"
 "<div id=\"top\"><!-- do not remove this div, it is closed by doxygen! -->\n"

src/htmlgen.cpp

@@ -1082,7 +1082,7 @@ static QCString substituteHtmlKeywords(const QCString &s,
   extraCssFile = Config_getString("HTML_EXTRA_STYLESHEET");
   if (!extraCssFile.isEmpty())
   {
-    extraCssText = "<link href=\"$relpath$"+extraCssFile+"\" rel=\"stylesheet\" type=\"text/css\"/>\n";
+    extraCssText = "<link href=\"$relpath$"+stripPath(extraCssFile)+"\" rel=\"stylesheet\" type=\"text/css\"/>\n";
   }
 
   if (timeStamp) {