diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-10-25 11:18:14 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-10-25 11:18:14 (GMT) |
| commit | cd3d9ea937a77c5caad276ac279e550ae74b60d6 (patch) | |
| tree | 01f8bf29d4dbade7dc6ad1370421a4543bf2d448 | |
| parent | 766b23e722743c0b99c03cf4a035b5b20cb8a88f (diff) | |
| download | Qt-cd3d9ea937a77c5caad276ac279e550ae74b60d6.zip Qt-cd3d9ea937a77c5caad276ac279e550ae74b60d6.tar.gz Qt-cd3d9ea937a77c5caad276ac279e550ae74b60d6.tar.bz2 | |
doc: Fixed some DITA XML validation errors.
| -rw-r--r-- | doc/src/internationalization/linguist-manual.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/platforms/emb-qvfb.qdoc | 1 | ||||
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 14 |
3 files changed, 11 insertions, 6 deletions
diff --git a/doc/src/internationalization/linguist-manual.qdoc b/doc/src/internationalization/linguist-manual.qdoc index 57b98b8..baf37b0 100644 --- a/doc/src/internationalization/linguist-manual.qdoc +++ b/doc/src/internationalization/linguist-manual.qdoc @@ -95,7 +95,7 @@ \o A single phrase may need to be translated into several different forms depending on context, e.g. \e open in English - might become \e{\ouml\c{}ffnen}, "open file", or \e aufbauen, + might become \e{\ouml}\e{ffnen}, "open file", or \e aufbauen, "open internet connection", in German. \o Keyboard accelerators may need to be changed but without diff --git a/doc/src/platforms/emb-qvfb.qdoc b/doc/src/platforms/emb-qvfb.qdoc index 4be2f64..78bdd73 100644 --- a/doc/src/platforms/emb-qvfb.qdoc +++ b/doc/src/platforms/emb-qvfb.qdoc @@ -197,7 +197,6 @@ for the button are redrawn from the activated skin. \row - \row \o \image qt-embedded-clamshellphone-closed.png The ClamshellPhone Skin (closed) \o diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index e1aa519..bb2e817 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -1282,10 +1282,16 @@ int DitaXmlGenerator::generateAtom(const Atom *atom, xmlWriter().writeEndElement(); // </lq> break; case Atom::RawString: - xmlWriter().writeStartElement("pre"); - xmlWriter().writeAttribute("outputclass","raw-html"); - xmlWriter().writeCharacters(atom->string()); - xmlWriter().writeEndElement(); // </pre> + if (atom->string() == " ") + break; + if (atom->string().startsWith("&")) + xmlWriter().writeCharacters(atom->string()); + else { + xmlWriter().writeStartElement("pre"); + xmlWriter().writeAttribute("outputclass","raw-html"); + xmlWriter().writeCharacters(atom->string()); + xmlWriter().writeEndElement(); // </pre> + } break; case Atom::SectionLeft: if (inSection || inApiDesc) { |