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
e864a6ca
Commit
e864a6ca
authored
Aug 18, 2014
by
Dimitri van Heesch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'albert-github-feature/bug_no_warning_on_cite'
parents
ca80d3cd
c31a81a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
cite.cpp
src/cite.cpp
+1
-1
docparser.cpp
src/docparser.cpp
+5
-6
No files found.
src/cite.cpp
View file @
e864a6ca
...
@@ -211,7 +211,7 @@ void CiteDict::generatePage() const
...
@@ -211,7 +211,7 @@ void CiteDict::generatePage() const
f
.
setName
(
citeListFile
);
f
.
setName
(
citeListFile
);
if
(
!
f
.
open
(
IO_ReadOnly
))
if
(
!
f
.
open
(
IO_ReadOnly
))
{
{
err
(
"could not open file %s
/citelist.doc for reading
\n
"
,
outputDir
.
data
());
err
(
"could not open file %s
for reading
\n
"
,
citeListFile
.
data
());
}
}
bool
insideBib
=
FALSE
;
bool
insideBib
=
FALSE
;
...
...
src/docparser.cpp
View file @
e864a6ca
...
@@ -2459,16 +2459,15 @@ void DocRef::parse()
...
@@ -2459,16 +2459,15 @@ void DocRef::parse()
DocCite
::
DocCite
(
DocNode
*
parent
,
const
QCString
&
target
,
const
QCString
&
)
//context)
DocCite
::
DocCite
(
DocNode
*
parent
,
const
QCString
&
target
,
const
QCString
&
)
//context)
{
{
static
uint
numBibFiles
=
Config_getList
(
"CITE_BIB_FILES"
).
count
();
static
uint
numBibFiles
=
Config_getList
(
"CITE_BIB_FILES"
).
count
();
m_parent
=
parent
;
m_parent
=
parent
;
QCString
anchor
;
QCString
anchor
;
//printf("DocCite::DocCite(target=%s)\n",target.data());
//printf("DocCite::DocCite(target=%s)\n",target.data());
ASSERT
(
!
target
.
isEmpty
());
ASSERT
(
!
target
.
isEmpty
());
m_relPath
=
g_relPath
;
m_relPath
=
g_relPath
;
CiteInfo
*
cite
=
Doxygen
::
citeDict
->
find
(
target
);
CiteInfo
*
cite
=
Doxygen
::
citeDict
->
find
(
target
);
if
(
numBibFiles
>
0
&&
cite
)
// ref to citation
if
(
numBibFiles
>
0
&&
cite
&&
!
cite
->
text
.
isEmpty
()
)
// ref to citation
{
{
m_text
=
cite
->
text
;
m_text
=
cite
->
text
;
if
(
m_text
.
isEmpty
())
m_text
=
cite
->
label
;
m_ref
=
cite
->
ref
;
m_ref
=
cite
->
ref
;
m_anchor
=
CiteConsts
::
anchorPrefix
+
cite
->
label
;
m_anchor
=
CiteConsts
::
anchorPrefix
+
cite
->
label
;
m_file
=
convertNameToFile
(
CiteConsts
::
fileName
,
FALSE
,
TRUE
);
m_file
=
convertNameToFile
(
CiteConsts
::
fileName
,
FALSE
,
TRUE
);
...
@@ -2476,9 +2475,9 @@ DocCite::DocCite(DocNode *parent,const QCString &target,const QCString &) //cont
...
@@ -2476,9 +2475,9 @@ DocCite::DocCite(DocNode *parent,const QCString &target,const QCString &) //cont
// m_text.data(),m_ref.data(),m_file.data(),m_anchor.data());
// m_text.data(),m_ref.data(),m_file.data(),m_anchor.data());
return
;
return
;
}
}
m_text
=
linkToText
(
SrcLangExt_Unknown
,
target
,
FALSE
)
;
m_text
=
target
;
warn_doc_error
(
g_fileName
,
doctokenizerYYlineno
,
"unable to resolve reference to `%s' for
\\
cite command"
,
warn_doc_error
(
g_fileName
,
doctokenizerYYlineno
,
"unable to resolve reference to `%s' for
\\
cite command"
,
qPrint
(
target
));
qPrint
(
target
));
}
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
...
...
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