diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-20 16:26:10 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-20 16:26:10 (GMT) |
| commit | 0418b2b540fcb0e3d76299e3df69ad600292adf9 (patch) | |
| tree | 9b1ce67d5cfcfacfd2556146277698afe231dba0 /tools/qdoc3/jscodemarker.cpp | |
| parent | 41f93881ad51d21aece16d8c1c272c0ff3246db8 (diff) | |
| download | Qt-0418b2b540fcb0e3d76299e3df69ad600292adf9.zip Qt-0418b2b540fcb0e3d76299e3df69ad600292adf9.tar.gz Qt-0418b2b540fcb0e3d76299e3df69ad600292adf9.tar.bz2 | |
Ongoing improvements and fixes to syntax highlighting.
Added an atom for JavaScript code.
Fixed example file quoting to use the appropriate atom for each file.
Changed C++ code marking to mark up classes as types.
Fixed C++ quoting bug that caused the last character to be lost.
Fixed indentation of code to not insert spaces inside elements.
Documented the change in the meaning of the \c command.
Simplified the use of CSS classes in the HTML output.
Diffstat (limited to 'tools/qdoc3/jscodemarker.cpp')
| -rw-r--r-- | tools/qdoc3/jscodemarker.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/qdoc3/jscodemarker.cpp b/tools/qdoc3/jscodemarker.cpp index 80df0aa..5a513f7 100644 --- a/tools/qdoc3/jscodemarker.cpp +++ b/tools/qdoc3/jscodemarker.cpp @@ -101,6 +101,14 @@ bool JsCodeMarker::recognizeLanguage(const QString &language) return language == "JavaScript" || language == "ECMAScript"; } +/*! + Returns the type of atom used to represent JavaScript code in the documentation. +*/ +Atom::Type JsCodeMarker::atomType() const +{ + return Atom::JavaScript; +} + QString JsCodeMarker::markedUpCode(const QString &code, const Node *relative, const Location &location) |