Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
doxverilog
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
doxverilog
Commits
e24e777d
Commit
e24e777d
authored
Jun 20, 2014
by
Dimitri van Heesch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'docbook'
Conflicts: src/docbookvisitor.cpp
parents
d7ec9e85
12f5ee8a
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
380 additions
and
217 deletions
+380
-217
config.xml
src/config.xml
+10
-0
context.cpp
src/context.cpp
+6
-6
docbookgen.cpp
src/docbookgen.cpp
+107
-48
docbookvisitor.cpp
src/docbookvisitor.cpp
+64
-66
docparser.cpp
src/docparser.cpp
+10
-5
docparser.h
src/docparser.h
+1
-1
dot.cpp
src/dot.cpp
+148
-61
dot.h
src/dot.h
+9
-7
htmldocvisitor.cpp
src/htmldocvisitor.cpp
+1
-1
htmlgen.cpp
src/htmlgen.cpp
+5
-5
latexdocvisitor.cpp
src/latexdocvisitor.cpp
+1
-1
latexgen.cpp
src/latexgen.cpp
+5
-5
printdocvisitor.h
src/printdocvisitor.h
+4
-3
rtfdocvisitor.cpp
src/rtfdocvisitor.cpp
+1
-1
rtfgen.cpp
src/rtfgen.cpp
+4
-4
xmldocvisitor.cpp
src/xmldocvisitor.cpp
+4
-3
No files found.
src/config.xml
View file @
e24e777d
...
@@ -2760,6 +2760,16 @@ that can be used to generate PDF.
...
@@ -2760,6 +2760,16 @@ that can be used to generate PDF.
The \c DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
The \c DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
If a relative path is entered the value of \ref cfg_output_directory "OUTPUT_DIRECTORY" will be put in
If a relative path is entered the value of \ref cfg_output_directory "OUTPUT_DIRECTORY" will be put in
front of it.
front of it.
]]>
</docs>
</option>
<option
type=
'bool'
id=
'DOCBOOK_PROGRAMLISTING'
defval=
'0'
depends=
'GENERATE_DOCBOOK'
>
<docs>
<![CDATA[
If the \c DOCBOOK_PROGRAMLISTING tag is set to \c YES doxygen will
include the program listings (including syntax highlighting
and cross-referencing information) to the DOCBOOK output. Note that
enabling this will significantly increase the size of the DOCBOOK output.
]]>
]]>
</docs>
</docs>
</option>
</option>
...
...
src/context.cpp
View file @
e24e777d
...
@@ -1471,7 +1471,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
...
@@ -1471,7 +1471,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
{
{
DotClassGraph
*
cg
=
getClassGraph
();
DotClassGraph
*
cg
=
getClassGraph
();
FTextStream
t
(
&
result
);
FTextStream
t
(
&
result
);
cg
->
writeGraph
(
t
,
BITMAP
,
cg
->
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
g_globals
.
outputDir
,
g_globals
.
outputDir
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_classDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_classDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
relPathAsString
(),
TRUE
,
TRUE
,
g_globals
.
dynSectionId
relPathAsString
(),
TRUE
,
TRUE
,
g_globals
.
dynSectionId
...
@@ -1516,7 +1516,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
...
@@ -1516,7 +1516,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
{
{
DotClassGraph
*
cg
=
getCollaborationGraph
();
DotClassGraph
*
cg
=
getCollaborationGraph
();
FTextStream
t
(
&
result
);
FTextStream
t
(
&
result
);
cg
->
writeGraph
(
t
,
BITMAP
,
cg
->
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
g_globals
.
outputDir
,
g_globals
.
outputDir
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_classDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_classDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
relPathAsString
(),
TRUE
,
TRUE
,
g_globals
.
dynSectionId
relPathAsString
(),
TRUE
,
TRUE
,
g_globals
.
dynSectionId
...
@@ -2197,7 +2197,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
...
@@ -2197,7 +2197,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
{
{
DotInclDepGraph
*
cg
=
getIncludeGraph
();
DotInclDepGraph
*
cg
=
getIncludeGraph
();
FTextStream
t
(
&
result
);
FTextStream
t
(
&
result
);
cg
->
writeGraph
(
t
,
BITMAP
,
cg
->
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
g_globals
.
outputDir
,
g_globals
.
outputDir
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_fileDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_fileDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
relPathAsString
(),
TRUE
,
g_globals
.
dynSectionId
relPathAsString
(),
TRUE
,
g_globals
.
dynSectionId
...
@@ -2228,7 +2228,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
...
@@ -2228,7 +2228,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
{
{
DotInclDepGraph
*
cg
=
getIncludedByGraph
();
DotInclDepGraph
*
cg
=
getIncludedByGraph
();
FTextStream
t
(
&
result
);
FTextStream
t
(
&
result
);
cg
->
writeGraph
(
t
,
BITMAP
,
cg
->
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
g_globals
.
outputDir
,
g_globals
.
outputDir
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_fileDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_fileDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
relPathAsString
(),
TRUE
,
g_globals
.
dynSectionId
relPathAsString
(),
TRUE
,
g_globals
.
dynSectionId
...
@@ -3634,7 +3634,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
...
@@ -3634,7 +3634,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
DotCallGraph
*
cg
=
getCallGraph
();
DotCallGraph
*
cg
=
getCallGraph
();
QGString
result
;
QGString
result
;
FTextStream
t
(
&
result
);
FTextStream
t
(
&
result
);
cg
->
writeGraph
(
t
,
BITMAP
,
cg
->
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
g_globals
.
outputDir
,
g_globals
.
outputDir
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_memberDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_memberDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
relPathAsString
(),
TRUE
,
g_globals
.
dynSectionId
relPathAsString
(),
TRUE
,
g_globals
.
dynSectionId
...
@@ -3674,7 +3674,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
...
@@ -3674,7 +3674,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
DotCallGraph
*
cg
=
getCallerGraph
();
DotCallGraph
*
cg
=
getCallerGraph
();
QGString
result
;
QGString
result
;
FTextStream
t
(
&
result
);
FTextStream
t
(
&
result
);
cg
->
writeGraph
(
t
,
BITMAP
,
cg
->
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
g_globals
.
outputDir
,
g_globals
.
outputDir
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_memberDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
g_globals
.
outputDir
+
portable_pathSeparator
()
+
m_memberDef
->
getOutputFileBase
()
+
Doxygen
::
htmlFileExtension
,
relPathAsString
(),
TRUE
,
g_globals
.
dynSectionId
relPathAsString
(),
TRUE
,
g_globals
.
dynSectionId
...
...
src/docbookgen.cpp
View file @
e24e777d
This diff is collapsed.
Click to expand it.
src/docbookvisitor.cpp
View file @
e24e777d
This diff is collapsed.
Click to expand it.
src/docparser.cpp
View file @
e24e777d
...
@@ -257,14 +257,18 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
...
@@ -257,14 +257,18 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
QCString
outputDir
;
QCString
outputDir
;
switch
(
type
)
switch
(
type
)
{
{
case
DocImage
:
:
Html
:
case
DocImage
:
:
Html
:
if
(
!
Config_getBool
(
"GENERATE_HTML"
))
return
result
;
if
(
!
Config_getBool
(
"GENERATE_HTML"
))
return
result
;
outputDir
=
Config_getString
(
"HTML_OUTPUT"
);
outputDir
=
Config_getString
(
"HTML_OUTPUT"
);
break
;
break
;
case
DocImage
:
:
Latex
:
case
DocImage
:
:
Latex
:
if
(
!
Config_getBool
(
"GENERATE_LATEX"
))
return
result
;
if
(
!
Config_getBool
(
"GENERATE_LATEX"
))
return
result
;
outputDir
=
Config_getString
(
"LATEX_OUTPUT"
);
outputDir
=
Config_getString
(
"LATEX_OUTPUT"
);
break
;
break
;
case
DocImage
:
:
DocBook
:
if
(
!
Config_getBool
(
"GENERATE_DOCBOOK"
))
return
result
;
outputDir
=
Config_getString
(
"DOCBOOK_OUTPUT"
);
break
;
case
DocImage
:
:
Rtf
:
case
DocImage
:
:
Rtf
:
if
(
!
Config_getBool
(
"GENERATE_RTF"
))
return
result
;
if
(
!
Config_getBool
(
"GENERATE_RTF"
))
return
result
;
outputDir
=
Config_getString
(
"RTF_OUTPUT"
);
outputDir
=
Config_getString
(
"RTF_OUTPUT"
);
...
@@ -5025,9 +5029,10 @@ void DocPara::handleImage(const QCString &cmdName)
...
@@ -5025,9 +5029,10 @@ void DocPara::handleImage(const QCString &cmdName)
}
}
DocImage
::
Type
t
;
DocImage
::
Type
t
;
QCString
imgType
=
g_token
->
name
.
lower
();
QCString
imgType
=
g_token
->
name
.
lower
();
if
(
imgType
==
"html"
)
t
=
DocImage
::
Html
;
if
(
imgType
==
"html"
)
t
=
DocImage
::
Html
;
else
if
(
imgType
==
"latex"
)
t
=
DocImage
::
Latex
;
else
if
(
imgType
==
"latex"
)
t
=
DocImage
::
Latex
;
else
if
(
imgType
==
"rtf"
)
t
=
DocImage
::
Rtf
;
else
if
(
imgType
==
"docbook"
)
t
=
DocImage
::
DocBook
;
else
if
(
imgType
==
"rtf"
)
t
=
DocImage
::
Rtf
;
else
else
{
{
warn_doc_error
(
g_fileName
,
doctokenizerYYlineno
,
"image type %s specified as the first argument of "
warn_doc_error
(
g_fileName
,
doctokenizerYYlineno
,
"image type %s specified as the first argument of "
...
...
src/docparser.h
View file @
e24e777d
...
@@ -668,7 +668,7 @@ class DocXRefItem : public CompAccept<DocXRefItem>, public DocNode
...
@@ -668,7 +668,7 @@ class DocXRefItem : public CompAccept<DocXRefItem>, public DocNode
class
DocImage
:
public
CompAccept
<
DocImage
>
,
public
DocNode
class
DocImage
:
public
CompAccept
<
DocImage
>
,
public
DocNode
{
{
public
:
public
:
enum
Type
{
Html
,
Latex
,
Rtf
};
enum
Type
{
Html
,
Latex
,
Rtf
,
DocBook
};
DocImage
(
DocNode
*
parent
,
const
HtmlAttribList
&
attribs
,
DocImage
(
DocNode
*
parent
,
const
HtmlAttribList
&
attribs
,
const
QCString
&
name
,
Type
t
,
const
QCString
&
url
=
QCString
());
const
QCString
&
name
,
Type
t
,
const
QCString
&
url
=
QCString
());
Kind
kind
()
const
{
return
Kind_Image
;
}
Kind
kind
()
const
{
return
Kind_Image
;
}
...
...
src/dot.cpp
View file @
e24e777d
This diff is collapsed.
Click to expand it.
src/dot.h
View file @
e24e777d
...
@@ -39,7 +39,8 @@ class GroupDef;
...
@@ -39,7 +39,8 @@ class GroupDef;
class
DotGroupCollaboration
;
class
DotGroupCollaboration
;
class
DotRunnerQueue
;
class
DotRunnerQueue
;
enum
GraphOutputFormat
{
BITMAP
,
EPS
};
enum
GraphOutputFormat
{
GOF_BITMAP
,
GOF_EPS
};
enum
EmbeddedOutputFormat
{
EOF_Html
,
EOF_LaTeX
,
EOF_Rtf
,
EOF_DocBook
};
/** Attributes of an edge of a dot graph */
/** Attributes of an edge of a dot graph */
struct
EdgeInfo
struct
EdgeInfo
...
@@ -165,8 +166,8 @@ class DotClassGraph
...
@@ -165,8 +166,8 @@ class DotClassGraph
~
DotClassGraph
();
~
DotClassGraph
();
bool
isTrivial
()
const
;
bool
isTrivial
()
const
;
bool
isTooBig
()
const
;
bool
isTooBig
()
const
;
QCString
writeGraph
(
FTextStream
&
t
,
GraphOutputFormat
f
,
const
char
*
path
,
QCString
writeGraph
(
FTextStream
&
t
,
GraphOutputFormat
gf
,
EmbeddedOutputFormat
ef
,
const
char
*
fileName
,
const
char
*
relPath
,
const
char
*
path
,
const
char
*
fileName
,
const
char
*
relPath
,
bool
TBRank
=
TRUE
,
bool
imageMap
=
TRUE
,
int
graphId
=-
1
)
const
;
bool
TBRank
=
TRUE
,
bool
imageMap
=
TRUE
,
int
graphId
=-
1
)
const
;
void
writeXML
(
FTextStream
&
t
);
void
writeXML
(
FTextStream
&
t
);
...
@@ -196,7 +197,7 @@ class DotInclDepGraph
...
@@ -196,7 +197,7 @@ class DotInclDepGraph
public
:
public
:
DotInclDepGraph
(
FileDef
*
fd
,
bool
inverse
);
DotInclDepGraph
(
FileDef
*
fd
,
bool
inverse
);
~
DotInclDepGraph
();
~
DotInclDepGraph
();
QCString
writeGraph
(
FTextStream
&
t
,
GraphOutputFormat
f
,
QCString
writeGraph
(
FTextStream
&
t
,
GraphOutputFormat
gf
,
EmbeddedOutputFormat
e
f
,
const
char
*
path
,
const
char
*
fileName
,
const
char
*
relPath
,
const
char
*
path
,
const
char
*
fileName
,
const
char
*
relPath
,
bool
writeImageMap
=
TRUE
,
int
graphId
=-
1
)
const
;
bool
writeImageMap
=
TRUE
,
int
graphId
=-
1
)
const
;
bool
isTrivial
()
const
;
bool
isTrivial
()
const
;
...
@@ -222,7 +223,7 @@ class DotCallGraph
...
@@ -222,7 +223,7 @@ class DotCallGraph
public
:
public
:
DotCallGraph
(
MemberDef
*
md
,
bool
inverse
);
DotCallGraph
(
MemberDef
*
md
,
bool
inverse
);
~
DotCallGraph
();
~
DotCallGraph
();
QCString
writeGraph
(
FTextStream
&
t
,
GraphOutputFormat
f
,
QCString
writeGraph
(
FTextStream
&
t
,
GraphOutputFormat
gf
,
EmbeddedOutputFormat
e
f
,
const
char
*
path
,
const
char
*
fileName
,
const
char
*
path
,
const
char
*
fileName
,
const
char
*
relPath
,
bool
writeImageMap
=
TRUE
,
const
char
*
relPath
,
bool
writeImageMap
=
TRUE
,
int
graphId
=-
1
)
const
;
int
graphId
=-
1
)
const
;
...
@@ -249,7 +250,8 @@ class DotDirDeps
...
@@ -249,7 +250,8 @@ class DotDirDeps
~
DotDirDeps
();
~
DotDirDeps
();
bool
isTrivial
()
const
;
bool
isTrivial
()
const
;
QCString
writeGraph
(
FTextStream
&
out
,
QCString
writeGraph
(
FTextStream
&
out
,
GraphOutputFormat
format
,
GraphOutputFormat
gf
,
EmbeddedOutputFormat
ef
,
const
char
*
path
,
const
char
*
path
,
const
char
*
fileName
,
const
char
*
fileName
,
const
char
*
relPath
,
const
char
*
relPath
,
...
@@ -298,7 +300,7 @@ class DotGroupCollaboration
...
@@ -298,7 +300,7 @@ class DotGroupCollaboration
DotGroupCollaboration
(
GroupDef
*
gd
);
DotGroupCollaboration
(
GroupDef
*
gd
);
~
DotGroupCollaboration
();
~
DotGroupCollaboration
();
QCString
writeGraph
(
FTextStream
&
t
,
GraphOutputFormat
format
,
QCString
writeGraph
(
FTextStream
&
t
,
GraphOutputFormat
gf
,
EmbeddedOutputFormat
ef
,
const
char
*
path
,
const
char
*
fileName
,
const
char
*
relPath
,
const
char
*
path
,
const
char
*
fileName
,
const
char
*
relPath
,
bool
writeImageMap
=
TRUE
,
int
graphId
=-
1
)
const
;
bool
writeImageMap
=
TRUE
,
int
graphId
=-
1
)
const
;
void
buildGraph
(
GroupDef
*
gd
);
void
buildGraph
(
GroupDef
*
gd
);
...
...
src/htmldocvisitor.cpp
View file @
e24e777d
...
@@ -1906,7 +1906,7 @@ void HtmlDocVisitor::writeDotFile(const QCString &fn,const QCString &relPath,
...
@@ -1906,7 +1906,7 @@ void HtmlDocVisitor::writeDotFile(const QCString &fn,const QCString &relPath,
}
}
baseName
.
prepend
(
"dot_"
);
baseName
.
prepend
(
"dot_"
);
QCString
outDir
=
Config_getString
(
"HTML_OUTPUT"
);
QCString
outDir
=
Config_getString
(
"HTML_OUTPUT"
);
writeDotGraphFromFile
(
fn
,
outDir
,
baseName
,
BITMAP
);
writeDotGraphFromFile
(
fn
,
outDir
,
baseName
,
GOF_
BITMAP
);
writeDotImageMapFromFile
(
m_t
,
fn
,
outDir
,
relPath
,
baseName
,
context
);
writeDotImageMapFromFile
(
m_t
,
fn
,
outDir
,
relPath
,
baseName
,
context
);
}
}
...
...
src/htmlgen.cpp
View file @
e24e777d
...
@@ -2516,7 +2516,7 @@ void HtmlGenerator::endDotGraph(const DotClassGraph &g)
...
@@ -2516,7 +2516,7 @@ void HtmlGenerator::endDotGraph(const DotClassGraph &g)
endSectionSummary
(
t
);
endSectionSummary
(
t
);
startSectionContent
(
t
,
m_sectionCount
);
startSectionContent
(
t
,
m_sectionCount
);
g
.
writeGraph
(
t
,
BITMAP
,
dir
,
fileName
,
relPath
,
TRUE
,
TRUE
,
m_sectionCount
);
g
.
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
dir
,
fileName
,
relPath
,
TRUE
,
TRUE
,
m_sectionCount
);
if
(
generateLegend
&&
!
umlLook
)
if
(
generateLegend
&&
!
umlLook
)
{
{
t
<<
"<center><span class=
\"
legend
\"
>["
;
t
<<
"<center><span class=
\"
legend
\"
>["
;
...
@@ -2542,7 +2542,7 @@ void HtmlGenerator::endInclDepGraph(const DotInclDepGraph &g)
...
@@ -2542,7 +2542,7 @@ void HtmlGenerator::endInclDepGraph(const DotInclDepGraph &g)
endSectionSummary
(
t
);
endSectionSummary
(
t
);
startSectionContent
(
t
,
m_sectionCount
);
startSectionContent
(
t
,
m_sectionCount
);
g
.
writeGraph
(
t
,
BITMAP
,
dir
,
fileName
,
relPath
,
TRUE
,
m_sectionCount
);
g
.
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
dir
,
fileName
,
relPath
,
TRUE
,
m_sectionCount
);
endSectionContent
(
t
);
endSectionContent
(
t
);
m_sectionCount
++
;
m_sectionCount
++
;
...
@@ -2560,7 +2560,7 @@ void HtmlGenerator::endGroupCollaboration(const DotGroupCollaboration &g)
...
@@ -2560,7 +2560,7 @@ void HtmlGenerator::endGroupCollaboration(const DotGroupCollaboration &g)
endSectionSummary
(
t
);
endSectionSummary
(
t
);
startSectionContent
(
t
,
m_sectionCount
);
startSectionContent
(
t
,
m_sectionCount
);
g
.
writeGraph
(
t
,
BITMAP
,
dir
,
fileName
,
relPath
,
TRUE
,
m_sectionCount
);
g
.
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
dir
,
fileName
,
relPath
,
TRUE
,
m_sectionCount
);
endSectionContent
(
t
);
endSectionContent
(
t
);
m_sectionCount
++
;
m_sectionCount
++
;
...
@@ -2578,7 +2578,7 @@ void HtmlGenerator::endCallGraph(const DotCallGraph &g)
...
@@ -2578,7 +2578,7 @@ void HtmlGenerator::endCallGraph(const DotCallGraph &g)
endSectionSummary
(
t
);
endSectionSummary
(
t
);
startSectionContent
(
t
,
m_sectionCount
);
startSectionContent
(
t
,
m_sectionCount
);
g
.
writeGraph
(
t
,
BITMAP
,
dir
,
fileName
,
relPath
,
TRUE
,
m_sectionCount
);
g
.
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
dir
,
fileName
,
relPath
,
TRUE
,
m_sectionCount
);
endSectionContent
(
t
);
endSectionContent
(
t
);
m_sectionCount
++
;
m_sectionCount
++
;
...
@@ -2596,7 +2596,7 @@ void HtmlGenerator::endDirDepGraph(const DotDirDeps &g)
...
@@ -2596,7 +2596,7 @@ void HtmlGenerator::endDirDepGraph(const DotDirDeps &g)
endSectionSummary
(
t
);
endSectionSummary
(
t
);
startSectionContent
(
t
,
m_sectionCount
);
startSectionContent
(
t
,
m_sectionCount
);
g
.
writeGraph
(
t
,
BITMAP
,
dir
,
fileName
,
relPath
,
TRUE
,
m_sectionCount
);
g
.
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Html
,
dir
,
fileName
,
relPath
,
TRUE
,
m_sectionCount
);
endSectionContent
(
t
);
endSectionContent
(
t
);
m_sectionCount
++
;
m_sectionCount
++
;
...
...
src/latexdocvisitor.cpp
View file @
e24e777d
...
@@ -1587,7 +1587,7 @@ void LatexDocVisitor::startDotFile(const QCString &fileName,
...
@@ -1587,7 +1587,7 @@ void LatexDocVisitor::startDotFile(const QCString &fileName,
baseName
.
prepend
(
"dot_"
);
baseName
.
prepend
(
"dot_"
);
QCString
outDir
=
Config_getString
(
"LATEX_OUTPUT"
);
QCString
outDir
=
Config_getString
(
"LATEX_OUTPUT"
);
QCString
name
=
fileName
;
QCString
name
=
fileName
;
writeDotGraphFromFile
(
name
,
outDir
,
baseName
,
EPS
);
writeDotGraphFromFile
(
name
,
outDir
,
baseName
,
GOF_
EPS
);
if
(
hasCaption
)
if
(
hasCaption
)
{
{
m_t
<<
"
\n\\
begin{DoxyImage}
\n
"
;
m_t
<<
"
\n\\
begin{DoxyImage}
\n
"
;
...
...
src/latexgen.cpp
View file @
e24e777d
...
@@ -1814,7 +1814,7 @@ void LatexGenerator::startDotGraph()
...
@@ -1814,7 +1814,7 @@ void LatexGenerator::startDotGraph()
void
LatexGenerator
::
endDotGraph
(
const
DotClassGraph
&
g
)
void
LatexGenerator
::
endDotGraph
(
const
DotClassGraph
&
g
)
{
{
g
.
writeGraph
(
t
,
EPS
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
g
.
writeGraph
(
t
,
GOF_EPS
,
EOF_LaTeX
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
}
}
void
LatexGenerator
::
startInclDepGraph
()
void
LatexGenerator
::
startInclDepGraph
()
...
@@ -1823,7 +1823,7 @@ void LatexGenerator::startInclDepGraph()
...
@@ -1823,7 +1823,7 @@ void LatexGenerator::startInclDepGraph()
void
LatexGenerator
::
endInclDepGraph
(
const
DotInclDepGraph
&
g
)
void
LatexGenerator
::
endInclDepGraph
(
const
DotInclDepGraph
&
g
)
{
{
g
.
writeGraph
(
t
,
EPS
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
g
.
writeGraph
(
t
,
GOF_EPS
,
EOF_LaTeX
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
}
}
void
LatexGenerator
::
startGroupCollaboration
()
void
LatexGenerator
::
startGroupCollaboration
()
...
@@ -1832,7 +1832,7 @@ void LatexGenerator::startGroupCollaboration()
...
@@ -1832,7 +1832,7 @@ void LatexGenerator::startGroupCollaboration()
void
LatexGenerator
::
endGroupCollaboration
(
const
DotGroupCollaboration
&
g
)
void
LatexGenerator
::
endGroupCollaboration
(
const
DotGroupCollaboration
&
g
)
{
{
g
.
writeGraph
(
t
,
EPS
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
g
.
writeGraph
(
t
,
GOF_EPS
,
EOF_LaTeX
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
}
}
void
LatexGenerator
::
startCallGraph
()
void
LatexGenerator
::
startCallGraph
()
...
@@ -1841,7 +1841,7 @@ void LatexGenerator::startCallGraph()
...
@@ -1841,7 +1841,7 @@ void LatexGenerator::startCallGraph()
void
LatexGenerator
::
endCallGraph
(
const
DotCallGraph
&
g
)
void
LatexGenerator
::
endCallGraph
(
const
DotCallGraph
&
g
)
{
{
g
.
writeGraph
(
t
,
EPS
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
g
.
writeGraph
(
t
,
GOF_EPS
,
EOF_LaTeX
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
}
}
void
LatexGenerator
::
startDirDepGraph
()
void
LatexGenerator
::
startDirDepGraph
()
...
@@ -1850,7 +1850,7 @@ void LatexGenerator::startDirDepGraph()
...
@@ -1850,7 +1850,7 @@ void LatexGenerator::startDirDepGraph()
void
LatexGenerator
::
endDirDepGraph
(
const
DotDirDeps
&
g
)
void
LatexGenerator
::
endDirDepGraph
(
const
DotDirDeps
&
g
)
{
{
g
.
writeGraph
(
t
,
EPS
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
g
.
writeGraph
(
t
,
GOF_EPS
,
EOF_LaTeX
,
Config_getString
(
"LATEX_OUTPUT"
),
fileName
,
relPath
);
}
}
void
LatexGenerator
::
startDescription
()
void
LatexGenerator
::
startDescription
()
...
...
src/printdocvisitor.h
View file @
e24e777d
...
@@ -476,9 +476,10 @@ class PrintDocVisitor : public DocVisitor
...
@@ -476,9 +476,10 @@ class PrintDocVisitor : public DocVisitor
printf
(
"<image src=
\"
%s
\"
type=
\"
"
,
img
->
name
().
data
());
printf
(
"<image src=
\"
%s
\"
type=
\"
"
,
img
->
name
().
data
());
switch
(
img
->
type
())
switch
(
img
->
type
())
{
{
case
DocImage
:
:
Html
:
printf
(
"html"
);
break
;
case
DocImage
:
:
Html
:
printf
(
"html"
);
break
;
case
DocImage
:
:
Latex
:
printf
(
"latex"
);
break
;
case
DocImage
:
:
Latex
:
printf
(
"latex"
);
break
;
case
DocImage
:
:
Rtf
:
printf
(
"rtf"
);
break
;
case
DocImage
:
:
Rtf
:
printf
(
"rtf"
);
break
;
case
DocImage
:
:
DocBook
:
printf
(
"docbook"
);
break
;
}
}
printf
(
"
\"
width=%s height=%s>
\n
"
,
img
->
width
().
data
(),
img
->
height
().
data
());
printf
(
"
\"
width=%s height=%s>
\n
"
,
img
->
width
().
data
(),
img
->
height
().
data
());
}
}
...
...
src/rtfdocvisitor.cpp
View file @
e24e777d
...
@@ -1653,7 +1653,7 @@ void RTFDocVisitor::writeDotFile(const QCString &fileName)
...
@@ -1653,7 +1653,7 @@ void RTFDocVisitor::writeDotFile(const QCString &fileName)
baseName
=
baseName
.
right
(
baseName
.
length
()
-
i
-
1
);
baseName
=
baseName
.
right
(
baseName
.
length
()
-
i
-
1
);
}
}
QCString
outDir
=
Config_getString
(
"RTF_OUTPUT"
);
QCString
outDir
=
Config_getString
(
"RTF_OUTPUT"
);
writeDotGraphFromFile
(
fileName
,
outDir
,
baseName
,
BITMAP
);
writeDotGraphFromFile
(
fileName
,
outDir
,
baseName
,
GOF_
BITMAP
);
if
(
!
m_lastIsPara
)
m_t
<<
"
\\
par"
<<
endl
;
if
(
!
m_lastIsPara
)
m_t
<<
"
\\
par"
<<
endl
;
m_t
<<
"{"
<<
endl
;
m_t
<<
"{"
<<
endl
;
m_t
<<
rtf_Style_Reset
;
m_t
<<
rtf_Style_Reset
;
...
...
src/rtfgen.cpp
View file @
e24e777d
...
@@ -2409,7 +2409,7 @@ void RTFGenerator::endDotGraph(const DotClassGraph &g)
...
@@ -2409,7 +2409,7 @@ void RTFGenerator::endDotGraph(const DotClassGraph &g)
newParagraph
();
newParagraph
();
QCString
fn
=
QCString
fn
=
g
.
writeGraph
(
t
,
BITMAP
,
Config_getString
(
"RTF_OUTPUT"
),
fileName
,
relPath
,
TRUE
,
FALSE
);
g
.
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Rtf
,
Config_getString
(
"RTF_OUTPUT"
),
fileName
,
relPath
,
TRUE
,
FALSE
);
// display the file
// display the file
t
<<
"{"
<<
endl
;
t
<<
"{"
<<
endl
;
...
@@ -2431,7 +2431,7 @@ void RTFGenerator::endInclDepGraph(const DotInclDepGraph &g)
...
@@ -2431,7 +2431,7 @@ void RTFGenerator::endInclDepGraph(const DotInclDepGraph &g)
{
{
newParagraph
();
newParagraph
();
QCString
fn
=
g
.
writeGraph
(
t
,
BITMAP
,
Config_getString
(
"RTF_OUTPUT"
),
QCString
fn
=
g
.
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Rtf
,
Config_getString
(
"RTF_OUTPUT"
),
fileName
,
relPath
,
FALSE
);
fileName
,
relPath
,
FALSE
);
// display the file
// display the file
...
@@ -2461,7 +2461,7 @@ void RTFGenerator::endCallGraph(const DotCallGraph &g)
...
@@ -2461,7 +2461,7 @@ void RTFGenerator::endCallGraph(const DotCallGraph &g)
{
{
newParagraph
();
newParagraph
();
QCString
fn
=
g
.
writeGraph
(
t
,
BITMAP
,
Config_getString
(
"RTF_OUTPUT"
),
QCString
fn
=
g
.
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Rtf
,
Config_getString
(
"RTF_OUTPUT"
),
fileName
,
relPath
,
FALSE
);
fileName
,
relPath
,
FALSE
);
// display the file
// display the file
...
@@ -2483,7 +2483,7 @@ void RTFGenerator::endDirDepGraph(const DotDirDeps &g)
...
@@ -2483,7 +2483,7 @@ void RTFGenerator::endDirDepGraph(const DotDirDeps &g)
{
{
newParagraph
();
newParagraph
();
QCString
fn
=
g
.
writeGraph
(
t
,
BITMAP
,
Config_getString
(
"RTF_OUTPUT"
),
QCString
fn
=
g
.
writeGraph
(
t
,
GOF_BITMAP
,
EOF_Rtf
,
Config_getString
(
"RTF_OUTPUT"
),
fileName
,
relPath
,
FALSE
);
fileName
,
relPath
,
FALSE
);
// display the file
// display the file
...
...
src/xmldocvisitor.cpp
View file @
e24e777d
...
@@ -678,9 +678,10 @@ void XmlDocVisitor::visitPre(DocImage *img)
...
@@ -678,9 +678,10 @@ void XmlDocVisitor::visitPre(DocImage *img)
m_t
<<
"<image type=
\"
"
;
m_t
<<
"<image type=
\"
"
;
switch
(
img
->
type
())
switch
(
img
->
type
())
{
{
case
DocImage
:
:
Html
:
m_t
<<
"html"
;
break
;
case
DocImage
:
:
Html
:
m_t
<<
"html"
;
break
;
case
DocImage
:
:
Latex
:
m_t
<<
"latex"
;
break
;
case
DocImage
:
:
Latex
:
m_t
<<
"latex"
;
break
;
case
DocImage
:
:
Rtf
:
m_t
<<
"rtf"
;
break
;
case
DocImage
:
:
Rtf
:
m_t
<<
"rtf"
;
break
;
case
DocImage
:
:
DocBook
:
m_t
<<
"docbook"
;
break
;
}
}
m_t
<<
"
\"
"
;
m_t
<<
"
\"
"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment