Commit f6d511e5 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Some generated files were not updated.

fixed relative path issue when using HTML_EXTRA_STYLESHEET.
parent 34cc61be
...@@ -4,4 +4,4 @@ Please read the installation section of the manual ...@@ -4,4 +4,4 @@ Please read the installation section of the manual
(http://www.doxygen.org/install.html) for instructions. (http://www.doxygen.org/install.html) for instructions.
-------- --------
Dimitri van Heesch (11 August 2012) Dimitri van Heesch (12 August 2012)
...@@ -26,4 +26,4 @@ forum. ...@@ -26,4 +26,4 @@ forum.
Enjoy, Enjoy,
Dimitri van Heesch (dimitri@stack.nl) (11 August 2012) Dimitri van Heesch (dimitri@stack.nl) (12 August 2012)
...@@ -33,21 +33,27 @@ tmake: ...@@ -33,21 +33,27 @@ tmake:
$(ENV) $(PERL) $(TMAKE) libdoxycfg.pro >Makefile.libdoxycfg $(ENV) $(PERL) $(TMAKE) libdoxycfg.pro >Makefile.libdoxycfg
$(ENV) $(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen $(ENV) $(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
# clean objects
clean: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen clean: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen
$(MAKE) -f Makefile.libdoxygen clean $(MAKE) -f Makefile.libdoxygen clean
$(MAKE) -f Makefile.libdoxycfg clean $(MAKE) -f Makefile.libdoxycfg clean
$(MAKE) -f Makefile.doxygen clean $(MAKE) -f Makefile.doxygen clean
# also clean flex/bison generated files
distclean: clean distclean: clean
-$(RM) scanner.cpp code.cpp config.cpp pre.cpp ce_lex.cpp \ -$(RM) scanner.cpp code.cpp config.cpp pre.cpp ce_lex.cpp \
ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \ ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \
declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \ declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \
pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \ pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \
vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp vhdlparser.h \ vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp vhdlparser.h \
vhdlparser.cpp index_xsd.h compound_xsd.h layout_default.h \ vhdlparser.cpp \
header_html.h footer_html.h search_functions_php.h search_opensearch_php.h \
# 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 \ 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 \ jquery_p3_js.h jquery_ui_js.h navtree_css.h svgpan_js.h dynsections_js.h \
doxygen_bst.h bib2xhtml.h configoptions.cpp doxygen_bst.h bib2xhtml.h configoptions.cpp
......
...@@ -208,7 +208,9 @@ void addConfigOptions(Config *cfg) ...@@ -208,7 +208,9 @@ void addConfigOptions(Config *cfg)
"only done if one of the specified strings matches the left-hand part of\n" "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" "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" "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->addValue("");
cl->addDependency("FULL_PATH_NAMES"); cl->addDependency("FULL_PATH_NAMES");
...@@ -281,7 +283,7 @@ void addConfigOptions(Config *cfg) ...@@ -281,7 +283,7 @@ void addConfigOptions(Config *cfg)
"TAB_SIZE", "TAB_SIZE",
"The TAB_SIZE tag can be used to set the number of spaces in a tab.\n" "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.", "Doxygen uses this value to replace tabs by spaces in code fragments.",
1,16,8 1,16,4
); );
//---- //----
cl = cfg->addList( cl = cfg->addList(
...@@ -339,14 +341,15 @@ void addConfigOptions(Config *cfg) ...@@ -339,14 +341,15 @@ void addConfigOptions(Config *cfg)
cl = cfg->addList( cl = cfg->addList(
"EXTENSION_MAPPING", "EXTENSION_MAPPING",
"Doxygen selects the parser to use depending on the extension of the files it\n" "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" "parses. With this tag you can assign which parser to use for a given\n"
"Doxygen has a built-in mapping, but you can override or extend it using this\n" "extension. Doxygen has a built-in mapping, but you can override or extend it\n"
"tag. The format is ext=language, where ext is a file extension, and language\n" "using this tag. The format is ext=language, where ext is a file extension,\n"
"is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,\n" "and language is one of the parsers supported by doxygen: IDL, Java,\n"
"C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make\n" "Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,\n"
"doxygen treat .inc files as Fortran files (default is PHP), and .f files as C\n" "C++. For instance to make doxygen treat .inc files as Fortran files (default\n"
"(default is Fortran), use: inc=Fortran f=C. Note that for custom extensions\n" "is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note\n"
"you also need to set FILE_PATTERNS otherwise the files are not read by doxygen." "that for custom extensions you also need to set FILE_PATTERNS otherwise the\n"
"files are not read by doxygen."
); );
//---- //----
cb = cfg->addBool( cb = cfg->addBool(
...@@ -360,6 +363,15 @@ void addConfigOptions(Config *cfg) ...@@ -360,6 +363,15 @@ void addConfigOptions(Config *cfg)
TRUE 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( cb = cfg->addBool(
"BUILTIN_STL_SUPPORT", "BUILTIN_STL_SUPPORT",
"If you use STL classes (i.e. std::string, std::vector, etc.) but do not want\n" "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) ...@@ -388,12 +400,7 @@ void addConfigOptions(Config *cfg)
//---- //----
cb = cfg->addBool( cb = cfg->addBool(
"IDL_PROPERTY_SUPPORT", "IDL_PROPERTY_SUPPORT",
"For Microsoft's IDL there are propget and propput attributes to indicate getter\n" "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.",
"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.",
TRUE TRUE
); );
//---- //----
...@@ -501,7 +508,8 @@ void addConfigOptions(Config *cfg) ...@@ -501,7 +508,8 @@ void addConfigOptions(Config *cfg)
//---- //----
cb = cfg->addBool( cb = cfg->addBool(
"EXTRACT_PACKAGE", "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 FALSE
); );
//---- //----
...@@ -1212,10 +1220,23 @@ void addConfigOptions(Config *cfg) ...@@ -1212,10 +1220,23 @@ void addConfigOptions(Config *cfg)
"HTML_STYLESHEET", "HTML_STYLESHEET",
"The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n" "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" "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" "fine-tune the look of the HTML output. If left blank doxygen will\n"
"will generate a default style sheet. Note that doxygen will try to copy\n" "generate a default style sheet. Note that it is recommended to use\n"
"the style sheet file to the HTML output directory, so don't put your own\n" "HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this\n"
"style sheet in the HTML output directory as well, or it will be erased!" "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->setWidgetType(ConfigString::File);
cs->addDependency("GENERATE_HTML"); cs->addDependency("GENERATE_HTML");
...@@ -1334,9 +1355,9 @@ void addConfigOptions(Config *cfg) ...@@ -1334,9 +1355,9 @@ void addConfigOptions(Config *cfg)
//---- //----
cs = cfg->addString( cs = cfg->addString(
"DOCSET_PUBLISHER_ID", "DOCSET_PUBLISHER_ID",
"When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify\n" "When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely\n"
"the documentation publisher. This should be a reverse domain-name style\n" "identify the documentation publisher. This should be a reverse domain-name\n"
"string, e.g. com.mycompany.MyDocSet.documentation." "style string, e.g. com.mycompany.MyDocSet.documentation."
); );
cs->setDefaultValue("org.doxygen.Publisher"); cs->setDefaultValue("org.doxygen.Publisher");
cs->addDependency("GENERATE_DOCSET"); cs->addDependency("GENERATE_DOCSET");
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"\n" "\n"
"/* @group Heading Levels */\n" "/* @group Heading Levels */\n"
"\n" "\n"
"h1 {\n" "h1.groupheader {\n"
" font-size: 150%;\n" " font-size: 150%;\n"
"}\n" "}\n"
"\n" "\n"
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
" margin: 10px 2px;\n" " margin: 10px 2px;\n"
"}\n" "}\n"
"\n" "\n"
"h2 {\n" "h2.groupheader {\n"
" border-bottom: 1px solid ##99;\n" " border-bottom: 1px solid ##99;\n"
" color: ##44;\n" " color: ##44;\n"
" font-size: 150%;\n" " font-size: 150%;\n"
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
" width: 100%;\n" " width: 100%;\n"
"}\n" "}\n"
"\n" "\n"
"h3 {\n" "h3.groupheader {\n"
" font-size: 100%;\n" " font-size: 100%;\n"
"}\n" "}\n"
"\n" "\n"
...@@ -857,7 +857,10 @@ ...@@ -857,7 +857,10 @@
" display:block;\n" " display:block;\n"
" text-decoration: none;\n" " text-decoration: none;\n"
" outline: none;\n" " outline: none;\n"
" color: ##30;\n"
" font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;\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"
"\n" "\n"
".navpath li.navelem a:hover\n" ".navpath li.navelem a:hover\n"
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"$search\n" "$search\n"
"$mathjax\n" "$mathjax\n"
"<link href=\"$relpath$$stylesheet\" rel=\"stylesheet\" type=\"text/css\" />\n" "<link href=\"$relpath$$stylesheet\" rel=\"stylesheet\" type=\"text/css\" />\n"
"$extrastylesheet\n"
"</head>\n" "</head>\n"
"<body>\n" "<body>\n"
"<div id=\"top\"><!-- do not remove this div, it is closed by doxygen! -->\n" "<div id=\"top\"><!-- do not remove this div, it is closed by doxygen! -->\n"
......
...@@ -1082,7 +1082,7 @@ static QCString substituteHtmlKeywords(const QCString &s, ...@@ -1082,7 +1082,7 @@ static QCString substituteHtmlKeywords(const QCString &s,
extraCssFile = Config_getString("HTML_EXTRA_STYLESHEET"); extraCssFile = Config_getString("HTML_EXTRA_STYLESHEET");
if (!extraCssFile.isEmpty()) 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) { if (timeStamp) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment