1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdoc: Don't lower case <shortdesc> in DITA.

Browse Source 
The first letter of a short description no longer has a
lower case letter.

Change-Id: I98f04d2feba070a0a77161316773306386cc6b67
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
This commit is contained in:
Martin Smith 2012-04-02 14:51:22 +02:00 committed by Qt by Nokia
parent 1e8f2ae34b
commit e700144157
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/qdoc/ditaxmlgenerator.cpp
View File

@ -718,10 +718,8 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
case Atom::BaseName: case Atom::BaseName:
break; break;
case Atom::BriefLeft: case Atom::BriefLeft:
//if (relative->type() == Node::Fake) { {
//skipAhead = skipAtoms(atom, Atom::BriefRight); Node::Type t = relative->type();
//break;
//}
if (inSection()) { if (inSection()) {
writeStartTag(DT_p); writeStartTag(DT_p);
xmlWriter().writeAttribute("outputclass","brief"); xmlWriter().writeAttribute("outputclass","brief");
@ -730,8 +728,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
noLinks = true; noLinks = true;
writeStartTag(DT_shortdesc); writeStartTag(DT_shortdesc);
} }
if (relative->type() == Node::Property || if (t == Node::Property || t == Node::Variable) {
relative->type() == Node::Variable) {
xmlWriter().writeCharacters("This "); xmlWriter().writeCharacters("This ");
if (relative->type() == Node::Property) if (relative->type() == Node::Property)
xmlWriter().writeCharacters("property"); xmlWriter().writeCharacters("property");
@ -748,11 +745,13 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
skipAhead++; skipAhead++;
atom = atom->next(); atom = atom->next();
} }
if (t == Node::Property || t == Node::Variable)
str[0] = str[0].toLower(); str[0] = str[0].toLower();
if (str.endsWith(QLatin1Char('.'))) if (str.endsWith(QLatin1Char('.')))
str.truncate(str.length() - 1); str.truncate(str.length() - 1);
writeCharacters(str + QLatin1Char('.')); writeCharacters(str + QLatin1Char('.'));
} }
}
break; break;
case Atom::BriefRight: case Atom::BriefRight:
// if (relative->type() != Node::Fake) // if (relative->type() != Node::Fake)