summaryrefslogtreecommitdiffstats
path: root/Doc/using
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-09-12 16:36:44 (GMT)
committerLarry Hastings <larry@hastings.org>2015-09-12 16:36:44 (GMT)
commit2e789a1f1d84b343a996e8654590703b5fbdd441 (patch)
treec41b39248da4042fe58cfb627e7a64a906f543ed /Doc/using
parentf92f6c8e56ae305967f0709e0f3c23bae53143fb (diff)
downloadcpython-3.5.0.zip
cpython-3.5.0.tar.gz
cpython-3.5.0.tar.bz2
Final touch-ups for the What's New In Python 3.5 document.v3.5.0
Diffstat (limited to 'Doc/using')
0 files changed, 0 insertions, 0 deletions
generated by cgit v0.12 at 2026-03-20 17:48:50 (GMT)
e summary='file diffstat' width='16%'> -rw-r--r--src/docparser.h2
-rw-r--r--src/util.cpp2
-rw-r--r--src/util.h2
-rw-r--r--src/xmldocvisitor.cpp16
-rw-r--r--templates/xml/compound.xsd2
-rw-r--r--testing/014/indexpage.xml11
-rw-r--r--testing/014_code.dox4
-rw-r--r--testing/021/indexpage.xml2
-rw-r--r--testing/025/example_test_8cpp-example.xml2
-rw-r--r--testing/032/indexpage.xml2
-rw-r--r--testing/049/indexpage.xml2
12 files changed, 35 insertions, 15 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 5bb28ea..eac6e97 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -104,6 +104,7 @@ static QCString g_exampleName;
static SectionDict * g_sectionDict;
static QCString g_searchUrl;
+static QCString g_includeFileName;
static QCString g_includeFileText;
static uint g_includeFileOffset;
static uint g_includeFileLength;
@@ -1917,6 +1918,7 @@ void DocInclude::parse()
// fall through
case DontInclude:
readTextFileByName(m_file,m_text);
+ g_includeFileName = m_file;
g_includeFileText = m_text;
g_includeFileOffset = 0;
g_includeFileLength = m_text.length();
@@ -1954,6 +1956,7 @@ void DocInclude::parse()
void DocIncOperator::parse()
{
+ m_includeFileName = g_includeFileName;
const char *p = g_includeFileText;
uint l = g_includeFileLength;
uint o = g_includeFileOffset;
diff --git a/src/docparser.h b/src/docparser.h
index f5167dc..02c727d 100644
--- a/src/docparser.h
+++ b/src/docparser.h
@@ -541,6 +541,7 @@ class DocIncOperator : public DocNode
void markLast(bool v=TRUE) { m_isLast = v; }
bool isExample() const { return m_isExample; }
QCString exampleFile() const { return m_exampleFile; }
+ QCString includeFileName() const { return m_includeFileName; }
void parse();
private:
@@ -552,6 +553,7 @@ class DocIncOperator : public DocNode
bool m_isLast;
bool m_isExample;
QCString m_exampleFile;
+ QCString m_includeFileName;
};
/** Node representing an item of a cross-referenced list */
diff --git a/src/util.cpp b/src/util.cpp
index d3d7dfe..8e4c5a7 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -7177,7 +7177,7 @@ void addCodeOnlyMappings()
updateLanguageMapping(".sql", "sql");
}
-SrcLangExt getLanguageFromFileName(const QCString fileName)
+SrcLangExt getLanguageFromFileName(const QCString& fileName)
{
int i = fileName.findRev('.');
if (i!=-1) // name has an extension
diff --git a/src/util.h b/src/util.h
index dd2f3aa..2f362fd 100644
--- a/src/util.h
+++ b/src/util.h
@@ -384,7 +384,7 @@ QCString stripLeadingAndTrailingEmptyLines(const QCString &s,int &docLine);
// const QCString &anchor="");
bool updateLanguageMapping(const QCString &extension,const QCString &parser);
-SrcLangExt getLanguageFromFileName(const QCString fileName);
+SrcLangExt getLanguageFromFileName(const QCString& fileName);
void initDefaultExtensionMapping();
void addCodeOnlyMappings();
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp
index 5789283..55c2b38 100644
--- a/src/xmldocvisitor.cpp
+++ b/src/xmldocvisitor.cpp
@@ -211,7 +211,11 @@ void XmlDocVisitor::visit(DocVerbatim *s)
switch(s->type())
{
case DocVerbatim::Code: // fall though
- m_t << "<programlisting language=\"" << langToString(langExt) << "\">";
+ m_t << "<programlisting";
+ if (!s->language().isEmpty())
+ m_t << " filename=\"" << lang << "\">";
+ else
+ m_t << ">";
Doxygen::parserManager->getParser(lang)
->parseCode(m_ci,s->context(),s->text(),langExt,
s->isExample(),s->exampleFile());
@@ -264,7 +268,7 @@ void XmlDocVisitor::visit(DocInclude *inc)
{
case DocInclude::IncWithLines:
{
- m_t << "<programlisting>";
+ m_t << "<programlisting filename=\"" << inc->file() << "\">";
QFileInfo cfi( inc->file() );
FileDef fd( cfi.dirPath().utf8(), cfi.fileName().utf8() );
Doxygen::parserManager->getParser(inc->extension())
@@ -284,7 +288,7 @@ void XmlDocVisitor::visit(DocInclude *inc)
}
break;
case DocInclude::Include:
- m_t << "<programlisting>";
+ m_t << "<programlisting filename=\"" << inc->file() << "\">";
Doxygen::parserManager->getParser(inc->extension())
->parseCode(m_ci,inc->context(),
inc->text(),
@@ -318,7 +322,7 @@ void XmlDocVisitor::visit(DocInclude *inc)
m_t << "</verbatim>";
break;
case DocInclude::Snippet:
- m_t << "<programlisting>";
+ m_t << "<programlisting filename=\"" << inc->file() << "\">";
Doxygen::parserManager->getParser(inc->extension())
->parseCode(m_ci,
inc->context(),
@@ -331,7 +335,7 @@ void XmlDocVisitor::visit(DocInclude *inc)
break;
case DocInclude::SnipWithLines:
{
- m_t << "<programlisting>";
+ m_t << "<programlisting filename=\"" << inc->file() << "\">";
QFileInfo cfi( inc->file() );
FileDef fd( cfi.dirPath().utf8(), cfi.fileName().utf8() );
Doxygen::parserManager->getParser(inc->extension())
@@ -367,7 +371,7 @@ void XmlDocVisitor::visit(DocIncOperator *op)
{
if (!m_hide)
{
- m_t << "<programlisting>";
+ m_t << "<programlisting filename=\"" << op->includeFileName() << "\">";
}
pushEnabled();
m_hide = TRUE;
diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
index 43cc897..8affc20 100644
--- a/templates/xml/compound.xsd
+++ b/templates/xml/compound.xsd
@@ -264,7 +264,7 @@
<xsd:sequence>
<xsd:element name="codeline" type="codelineType" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
- <xsd:attribute name="language" type="DoxLanguage" use="optional"/>
+ <xsd:attribute name="filename" type="xsd:string" use="optional"/>
</xsd:complexType>
<xsd:complexType name="codelineType">
diff --git a/testing/014/indexpage.xml b/testing/014/indexpage.xmlption>
Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-01-30 22:08:05 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-01-30 22:08:05 (GMT)
commitcbb5fdd0687017600487fb6a2bb5938dac01b31c (patch)
treeb28e47dc09b8fa622c90cb64435f85b7d73abc4b
parentdcd11ad5da4dec127b5331f936c8a00d16b4d4db (diff)
downloadtcl-cbb5fdd0687017600487fb6a2bb5938dac01b31c.zip
tcl-cbb5fdd0687017600487fb6a2bb5938dac01b31c.tar.gz
tcl-cbb5fdd0687017600487fb6a2bb5938dac01b31c.tar.bz2
missing testevent delete