summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2017-09-28 18:18:17 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2017-09-28 18:18:17 (GMT)
commit103005f5251dd0ff50c9c255e5abc9f262abd050 (patch)
treeea677a0ee95266e528ed1cf9af3edf3033ef901c
parent75a5e8d3e5ef258377bad3c311be0f83f150ae5a (diff)
parenta9963fd94acd5839e818890b6a356d6b335c1f74 (diff)
downloadDoxygen-103005f5251dd0ff50c9c255e5abc9f262abd050.zip
Doxygen-103005f5251dd0ff50c9c255e5abc9f262abd050.tar.gz
Doxygen-103005f5251dd0ff50c9c255e5abc9f262abd050.tar.bz2
Merge branch 'master' of https://github.com/shi-yan/doxygen into shi-yan-master
-rw-r--r--src/xmldocvisitor.cpp2
-rw-r--r--templates/xml/compound.xsd1
-rw-r--r--testing/014/indexpage.xml4
3 files changed, 4 insertions, 3 deletions
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp
index 815759e..f82f585 100644
--- a/src/xmldocvisitor.cpp
+++ b/src/xmldocvisitor.cpp
@@ -211,7 +211,7 @@ void XmlDocVisitor::visit(DocVerbatim *s)
switch(s->type())
{
case DocVerbatim::Code: // fall though
- m_t << "<programlisting>";
+ m_t << "<programlisting language=\"" << lang << "\">";
Doxygen::parserManager->getParser(lang)
->parseCode(m_ci,s->context(),s->text(),langExt,
s->isExample(),s->exampleFile());
diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
index 29eb1db..50426c0 100644
--- a/templates/xml/compound.xsd
+++ b/templates/xml/compound.xsd
@@ -264,6 +264,7 @@
<xsd:sequence>
<xsd:element name="codeline" type="codelineType" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
+ <xsd:attribute name="language" type="xsd:string" use="optional"/>
</xsd:complexType>
<xsd:complexType name="codelineType">
diff --git a/testing/014/indexpage.xml b/testing/014/indexpage.xml
index 6f62ef2..82676a3 100644
--- a/testing/014/indexpage.xml
+++ b/testing/014/indexpage.xml
@@ -5,7 +5,7 @@
<title>My Project</title>
<detaileddescription>
<para>
- <programlisting>
+ <programlisting language=".py">
<codeline>
<highlight class="comment">#<sp/>comment<sp/>in<sp/>Python</highlight>
<highlight class="normal"/>
@@ -25,7 +25,7 @@
</programlisting>
</para>
<para>
- <programlisting>
+ <programlisting language=".cpp">
<codeline>
<highlight class="comment">//<sp/>comment<sp/>in<sp/>a<sp/>code<sp/>block</highlight>
<highlight class="normal"/>