summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-11-10 09:39:46 (GMT)
committerGitHub <noreply@github.com>2019-11-10 09:39:46 (GMT)
commitceaf4db4bd5a544e611c3c60722d2a65acc81783 (patch)
tree1750a21bc953924cee71a776b6a925f43ff02ea6
parent12793dea5c66309505d0dab9dd82db35e5124e9e (diff)
parent7cd998a90790d4678d7a59f6774c60dc6aff4b98 (diff)
downloadDoxygen-ceaf4db4bd5a544e611c3c60722d2a65acc81783.zip
Doxygen-ceaf4db4bd5a544e611c3c60722d2a65acc81783.tar.gz
Doxygen-ceaf4db4bd5a544e611c3c60722d2a65acc81783.tar.bz2
Merge pull request #7344 from albert-github/feature/bug_tcl
Small improvements of TCL output
-rw-r--r--src/docbookgen.cpp2
-rw-r--r--src/htmlgen.cpp1
-rw-r--r--src/latexgen.cpp1
-rw-r--r--src/mangen.h2
-rw-r--r--src/rtfgen.cpp1
-rw-r--r--src/tclscanner.l20
6 files changed, 25 insertions, 2 deletions
diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
index 7fe849a..083aac3 100644
--- a/src/docbookgen.cpp
+++ b/src/docbookgen.cpp
@@ -233,7 +233,7 @@ void DocbookCodeGenerator::writeLineNumber(const char *ref,const char *fileName,
{
m_t << l << " ";
}
-
+ m_col=0;
}
void DocbookCodeGenerator::setCurrentDoc(const Definition *,const char *,bool)
{
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 402b4e4..df39d32 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -548,6 +548,7 @@ void HtmlCodeGenerator::writeLineNumber(const char *ref,const char *filename,
}
m_t << "</span>";
m_t << "&#160;";
+ m_col=0;
}
void HtmlCodeGenerator::writeCodeLink(const char *ref,const char *f,
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 0d529ab..094232f 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -223,6 +223,7 @@ void LatexCodeGenerator::writeLineNumber(const char *ref,const char *fileName,co
{
m_t << l << " ";
}
+ m_col=0;
}
diff --git a/src/mangen.h b/src/mangen.h
index d912923..192be6d 100644
--- a/src/mangen.h
+++ b/src/mangen.h
@@ -132,7 +132,7 @@ class ManGenerator : public OutputGenerator
void writeAnchor(const char *,const char *) {}
void startCodeFragment();
void endCodeFragment();
- void writeLineNumber(const char *,const char *,const char *,int l) { t << l << " "; }
+ void writeLineNumber(const char *,const char *,const char *,int l) { t << l << " "; col=0; }
void startCodeLine(bool) {}
void endCodeLine() { codify("\n"); col=0; }
void startEmphasis() { t << "\\fI"; firstCol=FALSE; }
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 6ec5231..92740f4 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -3052,6 +3052,7 @@ void RTFGenerator::writeLineNumber(const char *,const char *,const char *,int l)
QCString lineNumber;
lineNumber.sprintf("%05d",l);
t << lineNumber << " ";
+ col=0;
}
void RTFGenerator::startCodeLine(bool)
{
diff --git a/src/tclscanner.l b/src/tclscanner.l
index 4f2d837..37eef0d 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -486,6 +486,8 @@ Entry* tcl_entry_new()
// myEntry->mtype = Method;
// myEntry->virt = Normal;
// myEntry->stat = FALSE;
+ myEntry->docFile = tcl.file_name;
+ myEntry->inbodyFile = tcl.file_name;
myEntry->fileName = tcl.file_name;
myEntry->lang = SrcLangExt_Tcl;
Doxygen::docGroup.initGroupInfo(myEntry);
@@ -2153,6 +2155,8 @@ D
tcl.entry_current->mtype = Method;
tcl.entry_current->name = myName;
tcl.entry_current->startLine = tcl.line_command;
+ tcl.entry_current->docLine = tcl.line_comment;
+ tcl.entry_current->inbodyLine = tcl.line_comment;
tcl.entry_current->bodyLine = tcl.line_body0;
tcl.entry_current->endBodyLine = tcl.line_body1;
tcl_protection(tcl.entry_current);
@@ -2195,6 +2199,8 @@ D
tcl.entry_current->mtype = Method;
tcl.entry_current->name = myName;
tcl.entry_current->startLine = tcl.line_command;
+ tcl.entry_current->docLine = tcl.line_comment;
+ tcl.entry_current->inbodyLine = tcl.line_comment;
tcl.entry_current->bodyLine = tcl.line_body0;
tcl.entry_current->endBodyLine = tcl.line_body1;
tcl_protection(tcl.entry_current);
@@ -2232,6 +2238,8 @@ D
tcl.entry_current->mtype = Method;
tcl.entry_current->name = myName;
tcl.entry_current->startLine = tcl.line_command;
+ tcl.entry_current->docLine = tcl.line_comment;
+ tcl.entry_current->inbodyLine = tcl.line_comment;
tcl.entry_current->bodyLine = tcl.line_body0;
tcl.entry_current->endBodyLine = tcl.line_body1;
tcl_protection(tcl.entry_current);
@@ -2267,6 +2275,8 @@ D
tcl.entry_current->mtype = Method;
tcl.entry_current->name = myName;
tcl.entry_current->startLine = tcl.line_command;
+ tcl.entry_current->docLine = tcl.line_comment;
+ tcl.entry_current->inbodyLine = tcl.line_comment;
tcl.entry_current->bodyLine = tcl.line_body0;
tcl.entry_current->endBodyLine = tcl.line_body1;
tcl_protection(tcl.entry_current);
@@ -2300,6 +2310,8 @@ D
tcl.entry_current->section = Entry::NAMESPACE_SEC;
tcl.entry_current->name = myName;
tcl.entry_current->startLine = tcl.line_command;
+ tcl.entry_current->docLine = tcl.line_comment;
+ tcl.entry_current->inbodyLine = tcl.line_comment;
tcl.entry_current->bodyLine = tcl.line_body0;
tcl.entry_current->endBodyLine = tcl.line_body1;
tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_current);
@@ -2338,6 +2350,8 @@ D
tcl.entry_current->section = Entry::CLASS_SEC;
tcl.entry_current->name = myName;
tcl.entry_current->startLine = tcl.line_command;
+ tcl.entry_current->docLine = tcl.line_comment;
+ tcl.entry_current->inbodyLine = tcl.line_comment;
tcl.entry_current->bodyLine = tcl.line_body0;
tcl.entry_current->endBodyLine = tcl.line_body1;
tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_current);
@@ -2370,6 +2384,8 @@ D
tcl.entry_current->section = Entry::CLASS_SEC;
tcl.entry_current->name = myName;
tcl.entry_current->startLine = tcl.line_command;
+ tcl.entry_current->docLine = tcl.line_comment;
+ tcl.entry_current->inbodyLine = tcl.line_comment;
tcl.entry_current->bodyLine = tcl.line_body0;
tcl.entry_current->endBodyLine = tcl.line_body1;
tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_current);
@@ -2422,6 +2438,8 @@ D
tcl.entry_current->mtype = Method;
tcl.entry_current->name = myMethod;
tcl.entry_current->startLine = tcl.line_command;
+ tcl.entry_current->docLine = tcl.line_comment;
+ tcl.entry_current->inbodyLine = tcl.line_comment;
tcl.entry_current->bodyLine = tcl.line_body0;
tcl.entry_current->endBodyLine = tcl.line_body1;
tcl_protection(tcl.entry_current);
@@ -2492,6 +2510,8 @@ D
tcl.entry_current->section = Entry::VARIABLE_SEC;
tcl.entry_current->name = myName;
tcl.entry_current->startLine = tcl.line_command;
+ tcl.entry_current->docLine = tcl.line_comment;
+ tcl.entry_current->inbodyLine = tcl.line_comment;
tcl.entry_current->bodyLine = tcl.line_body0;
tcl.entry_current->endBodyLine = tcl.line_body1;
tcl_protection(tcl.entry_current);