diff options
| -rw-r--r-- | doc/Makefile.in | 2 | ||||
| -rw-r--r-- | doc/docblocks.doc | 4 | ||||
| -rw-r--r-- | src/cite.cpp | 4 | ||||
| -rw-r--r-- | src/docbookvisitor.cpp | 56 | ||||
| -rw-r--r-- | winbuild/Config.rules | 4 | ||||
| -rw-r--r-- | winbuild/Doxygen.vcproj | 8 | ||||
| -rw-r--r-- | winbuild/Gen_head.rules | 2 | ||||
| -rwxr-xr-x | winbuild/Languages.rules | 4 | ||||
| -rw-r--r-- | winbuild/Lex.rules | 2 | ||||
| -rw-r--r-- | winbuild/Settings.rules | 2 | ||||
| -rwxr-xr-x | winbuild/Unistd.rules | 2 | ||||
| -rw-r--r-- | winbuild/Version.rules | 2 | ||||
| -rw-r--r-- | winbuild/moc.rules | 2 |
13 files changed, 33 insertions, 61 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in index 1f472e6..f0c3a03 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -17,7 +17,7 @@ all: language config.doc FORCE export DOXYGEN_DOCDIR; \ VERSION=$(VERSION) ; \ export VERSION; \ - $(DOXYGEN)/bin/doxygen + "$(DOXYGEN)/bin/doxygen" @rm -f ../latex/refman.tex @cp doxygen_logo*.gif ../html @cp Makefile.latex ../latex/Makefile diff --git a/doc/docblocks.doc b/doc/docblocks.doc index 6ef6bf0..c74211c 100644 --- a/doc/docblocks.doc +++ b/doc/docblocks.doc @@ -464,8 +464,8 @@ The parser tries to guess if the source code is fixed format Fortran or free format Fortran code. This may not always be correct. If not one should use \ref cfg_extension_mapping "EXTENSION_MAPPING" to correct this. By setting `EXTENSION_MAPPING = f=FortranFixed f90=FortranFree` files with -extension \c f90 are interpreted as fixed format Fortran code and files with -extension \c f are interpreted as free format Fortran code. +extension \c f are interpreted as fixed format Fortran code and files with +extension \c f90 are interpreted as free format Fortran code. For Fortran "!>" or "!<" starts a comment and "!!" or "!>" can be used to continue an one line comment into a multi-line comment. diff --git a/src/cite.cpp b/src/cite.cpp index a3056ba..f0580ed 100644 --- a/src/cite.cpp +++ b/src/cite.cpp @@ -58,6 +58,10 @@ static QCString getListOfBibFiles(const QCString &sep,bool namesOnly) { bibFile = bibFile.left(bibFile.length()-4); } + else + { + if (!namesOnly && bibFile.right(4)!=".bib") bibFile += ".bib"; + } if ((i=bibFile.findRev('/'))!=-1) // strip path { bibFile = bibFile.mid(i+1); diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp index cf235da..5d7aafd 100644 --- a/src/docbookvisitor.cpp +++ b/src/docbookvisitor.cpp @@ -988,55 +988,23 @@ void DocbookDocVisitor::visitPost(DocSecRefList *) void DocbookDocVisitor::visitPre(DocParamSect *s) { if (m_hide) return; + m_t << endl; + m_t << " <formalpara>" << endl; + m_t << " <title/>" << endl; + m_t << " <table frame=\"all\">" << endl; + m_t << " <title>"; switch(s->type()) { - case DocParamSect::Param: - { - m_t << endl; - m_t << " <formalpara>" << endl; - m_t << " <title/>" << endl; - m_t << " <table frame=\"all\">" << endl; - m_t << " <title>param</title>" << endl; - m_t << " <tgroup cols=\"2\" align=\"left\" colsep=\"1\" rowsep=\"1\">" << endl; - m_t << " <tbody>" << endl; - break; - } - case DocParamSect::RetVal: - { - m_t << endl; - m_t << " <formalpara>" << endl; - m_t << " <title/>" << endl; - m_t << " <table frame=\"all\">" << endl; - m_t << " <title>retval</title>" << endl; - m_t << " <tgroup cols=\"2\" align=\"left\" colsep=\"1\" rowsep=\"1\">" << endl; - m_t << " <tbody>" << endl; - break; - } - case DocParamSect::Exception: - { - m_t << endl; - m_t << " <formalpara>" << endl; - m_t << " <title/>" << endl; - m_t << " <table frame=\"all\">" << endl; - m_t << " <title>exception</title>" << endl; - m_t << " <tgroup cols=\"2\" align=\"left\" colsep=\"1\" rowsep=\"1\">" << endl; - m_t << " <tbody>" << endl; - break; - } - case DocParamSect::TemplateParam: - { - m_t << endl; - m_t << " <formalpara>" << endl; - m_t << " <title/>" << endl; - m_t << " <table frame=\"all\">" << endl; - m_t << " <title>templateparam</title>" << endl; - m_t << " <tgroup cols=\"2\" align=\"left\" colsep=\"1\" rowsep=\"1\">" << endl; - m_t << " <tbody>" << endl; - break; - } + case DocParamSect::Param: m_t << theTranslator->trParameters(); break; + case DocParamSect::RetVal: m_t << theTranslator->trReturnValues(); break; + case DocParamSect::Exception: m_t << theTranslator->trExceptions(); break; + case DocParamSect::TemplateParam: m_t << theTranslator->trTemplateParameters(); break; default: ASSERT(0); } + m_t << " </title>" << endl; + m_t << " <tgroup cols=\"2\" align=\"left\" colsep=\"1\" rowsep=\"1\">" << endl; + m_t << " <tbody>" << endl; } void DocbookDocVisitor::visitPost(DocParamSect *) diff --git a/winbuild/Config.rules b/winbuild/Config.rules index 040fc65..788497d 100644 --- a/winbuild/Config.rules +++ b/winbuild/Config.rules @@ -7,7 +7,7 @@ <CustomBuildRule Name="Config" DisplayName="Config" - CommandLine="python $(ProjectDir)..\src\configgen.py -cpp [AllOptions] [AdditionalOptions] [inputs] > $(IntDir)/$(InputName)options.cpp" + CommandLine="python "$(ProjectDir)..\src\configgen.py" -cpp [AllOptions] [AdditionalOptions] [inputs] > $(IntDir)/$(InputName)options.cpp" Outputs="$(IntDir)/$(InputName)options.cpp" FileExtensions="*.xml" AdditionalDependencies="$(ProjectDir)..\src\configgen.py" @@ -18,7 +18,7 @@ <CustomBuildRule Name="Config_dw" DisplayName="Config" - CommandLine="python $(ProjectDir)..\src\configgen.py -wiz [AllOptions] [AdditionalOptions] [inputs] > $(IntDir)/$(InputName)doc.cpp" + CommandLine="python "$(ProjectDir)..\src\configgen.py" -wiz [AllOptions] [AdditionalOptions] [inputs] > $(IntDir)/$(InputName)doc.cpp" Outputs="$(IntDir)/$(InputName)doc.cpp" FileExtensions="*.xml" AdditionalDependencies="$(ProjectDir)..\src\configgen.py" diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj index 920fa6d..366dfb4 100644 --- a/winbuild/Doxygen.vcproj +++ b/winbuild/Doxygen.vcproj @@ -948,7 +948,7 @@ <Tool
Name="VCCustomBuildTool"
Description="Running bison on constexp.y"
- CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c
bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp
del $(IntDir)\ce_parse.c
"
+ CommandLine="bison -l -d -p ce_parseexpYY "$(InputPath)" -o $(IntDir)\ce_parse.c
bison -l -p constexpYY "$(InputPath)" -o $(IntDir)\ce_parse.cpp
del $(IntDir)\ce_parse.c
"
Outputs="$(IntDir)\ce_parse.cpp"
/>
</FileConfiguration>
@@ -958,7 +958,7 @@ <Tool
Name="VCCustomBuildTool"
Description="Running bison on constexp.y"
- CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c
bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp
del $(IntDir)\ce_parse.c
"
+ CommandLine="bison -l -d -p ce_parseexpYY "$(InputPath)" -o $(IntDir)\ce_parse.c
bison -l -p constexpYY "$(InputPath)" -o $(IntDir)\ce_parse.cpp
del $(IntDir)\ce_parse.c
"
Outputs="$(IntDir)\ce_parse.cpp"
/>
</FileConfiguration>
@@ -968,7 +968,7 @@ <Tool
Name="VCCustomBuildTool"
Description="Running bison on constexp.y"
- CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c
bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp
del $(IntDir)\ce_parse.c
"
+ CommandLine="bison -l -d -p ce_parseexpYY "$(InputPath)" -o $(IntDir)\ce_parse.c
bison -l -p constexpYY "$(InputPath)" -o $(IntDir)\ce_parse.cpp
del $(IntDir)\ce_parse.c
"
Outputs="$(IntDir)\ce_parse.cpp"
/>
</FileConfiguration>
@@ -978,7 +978,7 @@ <Tool
Name="VCCustomBuildTool"
Description="Running bison on constexp.y"
- CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c
bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp
del $(IntDir)\ce_parse.c
"
+ CommandLine="bison -l -d -p ce_parseexpYY "$(InputPath)" -o $(IntDir)\ce_parse.c
bison -l -p constexpYY "$(InputPath)" -o $(IntDir)\ce_parse.cpp
del $(IntDir)\ce_parse.c
"
Outputs="$(IntDir)\ce_parse.cpp"
/>
</FileConfiguration>
diff --git a/winbuild/Gen_head.rules b/winbuild/Gen_head.rules index 9f1e13d..c2e7550 100644 --- a/winbuild/Gen_head.rules +++ b/winbuild/Gen_head.rules @@ -7,7 +7,7 @@ <CustomBuildRule Name="Gen_head" DisplayName="Gen_head" - CommandLine="python $(ProjectDir)..\src\to_c_cmd.py [AllOptions] [AdditionalOptions] [inputs] < $(InputPath) > $(IntDir)/$(InputName)$(InputExt).h" + CommandLine="python "$(ProjectDir)..\src\to_c_cmd.py" [AllOptions] [AdditionalOptions] [inputs] < "$(InputPath)" > $(IntDir)/$(InputName)$(InputExt).h" Outputs="$(IntDir)/$(InputName)$(InputExt).h" FileExtensions=".*" AdditionalDependencies="$(ProjectDir)..\src\to_c_cmd.py" diff --git a/winbuild/Languages.rules b/winbuild/Languages.rules index 0d57a05..8ff018a 100755 --- a/winbuild/Languages.rules +++ b/winbuild/Languages.rules @@ -6,8 +6,8 @@ <Rules> <CustomBuildRule Name="Languages" - DisplayName="Settings" - CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] > $(IntDir)/$(InputName).h" + DisplayName="Languages" + CommandLine="python "$(InputPath)" [AllOptions] [AdditionalOptions] > $(IntDir)/$(InputName).h" Outputs="$(IntDir)/$(InputName).h" FileExtensions="*.py" AdditionalDependencies="" diff --git a/winbuild/Lex.rules b/winbuild/Lex.rules index 85b5e18..52df322 100644 --- a/winbuild/Lex.rules +++ b/winbuild/Lex.rules @@ -7,7 +7,7 @@ <CustomBuildRule Name="Lex" DisplayName="Lex" - CommandLine="flex [AllOptions] -t -P$(InputName)YY [AdditionalOptions] [inputs] | python $(ProjectDir)..\src\increasebuffer.py > $(IntDir)/$(InputName).cpp" + CommandLine="flex [AllOptions] -t -P$(InputName)YY [AdditionalOptions] [inputs] | python "$(ProjectDir)..\src\increasebuffer.py" > $(IntDir)/$(InputName).cpp" Outputs="$(IntDir)/$(InputName).cpp" FileExtensions="*.l" AdditionalDependencies="$(ProjectDir)..\src\increasebuffer.py" diff --git a/winbuild/Settings.rules b/winbuild/Settings.rules index 283cd49..29e7266 100644 --- a/winbuild/Settings.rules +++ b/winbuild/Settings.rules @@ -7,7 +7,7 @@ <CustomBuildRule Name="Settings" DisplayName="Settings" - CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] $(IntDir)" + CommandLine="python "$(InputPath)" [AllOptions] [AdditionalOptions] $(IntDir)" Outputs="$(IntDir)/$(InputName).h" FileExtensions="*.py" AdditionalDependencies="$(ProjectDir)..\configure" diff --git a/winbuild/Unistd.rules b/winbuild/Unistd.rules index 0f4ce02..bd25661 100755 --- a/winbuild/Unistd.rules +++ b/winbuild/Unistd.rules @@ -7,7 +7,7 @@ <CustomBuildRule Name="Unistd" DisplayName="Unistd" - CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] $(IntDir)" + CommandLine="python "$(InputPath)" [AllOptions] [AdditionalOptions] $(IntDir)" Outputs="$(IntDir)/$(InputName).h" FileExtensions="*.py" ExecutionDescription="Executing Unistd ..." diff --git a/winbuild/Version.rules b/winbuild/Version.rules index 43faeb1..3dfdf04 100644 --- a/winbuild/Version.rules +++ b/winbuild/Version.rules @@ -7,7 +7,7 @@ <CustomBuildRule Name="Version" DisplayName="Version" - CommandLine="python $(InputPath) $(IntDir)" + CommandLine="python "$(InputPath)" $(IntDir)" Outputs="$(IntDir)\$(InputName).cpp" FileExtensions="*.py" AdditionalDependencies="$(ProjectDir)..\configure" diff --git a/winbuild/moc.rules b/winbuild/moc.rules index a8242f5..efe0f7f 100644 --- a/winbuild/moc.rules +++ b/winbuild/moc.rules @@ -7,7 +7,7 @@ <CustomBuildRule Name="moc" DisplayName="Moc" - CommandLine="$(QTDIR)/bin/moc.exe $(InputPath) -o moc_$(InputName).cpp" + CommandLine="$(QTDIR)/bin/moc.exe "$(InputPath)" -o moc_$(InputName).cpp" Outputs="moc_$(InputName).cpp" AdditionalDependencies="$(QTDIR)/bin/moc.exe" FileExtensions="*.h" |