diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2017-09-28 18:23:10 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2017-09-28 18:23:10 (GMT) |
commit | 96e38d0e4909abd8da912c85d1c60b12abb49fa9 (patch) | |
tree | 12e014d06d0523547572df7c32fb9314855ca869 | |
parent | 75a5e8d3e5ef258377bad3c311be0f83f150ae5a (diff) | |
parent | ed9acb6e1bb81a2eec334180f7b8c1bf0598b444 (diff) | |
download | Doxygen-96e38d0e4909abd8da912c85d1c60b12abb49fa9.zip Doxygen-96e38d0e4909abd8da912c85d1c60b12abb49fa9.tar.gz Doxygen-96e38d0e4909abd8da912c85d1c60b12abb49fa9.tar.bz2 |
Merge branch 'shi-yan-master'
-rw-r--r-- | src/xmldocvisitor.cpp | 2 | ||||
-rw-r--r-- | templates/xml/compound.xsd | 1 | ||||
-rw-r--r-- | testing/014/indexpage.xml | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp index 815759e..5789283 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=\"" << langToString(langExt) << "\">"; 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..43cc897 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="DoxLanguage" use="optional"/> </xsd:complexType> <xsd:complexType name="codelineType"> diff --git a/testing/014/indexpage.xml b/testing/014/indexpage.xml index 6f62ef2..ad35261 100644 --- a/testing/014/indexpage.xml +++ b/testing/014/indexpage.xml @@ -5,7 +5,7 @@ <title>My Project</title> <detaileddescription> <para> - <programlisting> + <programlisting language="Python"> <codeline> <highlight class="comment">#<sp/>comment<sp/>in<sp/>Python</highlight> <highlight class="normal"/> @@ -25,7 +25,7 @@ </programlisting> </para> <para> - <programlisting> + <programlisting language="C++"> <codeline> <highlight class="comment">//<sp/>comment<sp/>in<sp/>a<sp/>code<sp/>block</highlight> <highlight class="normal"/> |