diff -r 000000000000 -r 1918ee327afb src/svg/qsvgfont.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/svg/qsvgfont.cpp	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtSvg module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qsvgfont_p.h"
+
+#ifndef QT_NO_SVG
+
+#include "qpainter.h"
+#include "qpen.h"
+#include "qdebug.h"
+#include "qpicture.h"
+
+QT_BEGIN_NAMESPACE
+
+QSvgGlyph::QSvgGlyph(QChar unicode, const QPainterPath &path, qreal horizAdvX)
+    : m_unicode(unicode), m_path(path), m_horizAdvX(horizAdvX)
+{
+
+}
+
+
+QSvgFont::QSvgFont(qreal horizAdvX)
+    : m_horizAdvX(horizAdvX)
+{
+}
+
+
+QString QSvgFont::familyName() const
+{
+    return m_familyName;
+}
+
+
+void QSvgFont::addGlyph(QChar unicode, const QPainterPath &path, qreal horizAdvX )
+{
+    m_glyphs.insert(unicode, QSvgGlyph(unicode, path,
+                                       (horizAdvX==-1)?m_horizAdvX:horizAdvX));
+}
+
+
+void QSvgFont::draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const
+{
+    p->save();
+    p->translate(point);
+    p->scale(pixelSize / m_unitsPerEm, -pixelSize / m_unitsPerEm);
+
+    // Calculate the text width to be used for alignment
+    int textWidth = 0;
+    QString::const_iterator itr = str.constBegin();
+    for ( ; itr != str.constEnd(); ++itr) {
+        QChar unicode = *itr;
+        if (!m_glyphs.contains(*itr)) {
+            unicode = 0;
+            if (!m_glyphs.contains(unicode))
+                continue;
+        }
+        textWidth += static_cast<int>(m_glyphs[unicode].m_horizAdvX);
+    }
+
+    QPoint alignmentOffset(0, 0);
+    if (alignment == Qt::AlignHCenter) {
+        alignmentOffset.setX(-textWidth / 2);
+    } else if (alignment == Qt::AlignRight) {
+        alignmentOffset.setX(-textWidth);
+    }
+
+    p->translate(alignmentOffset);
+
+    // since in SVG the embedded font ain't really a path
+    // the outline has got to stay untransformed...
+    qreal penWidth = p->pen().widthF();
+    penWidth /= (pixelSize/m_unitsPerEm);
+    QPen pen = p->pen();
+    pen.setWidthF(penWidth);
+    p->setPen(pen);
+
+    itr = str.constBegin();
+    for ( ; itr != str.constEnd(); ++itr) {
+        QChar unicode = *itr;
+        if (!m_glyphs.contains(*itr)) {
+            unicode = 0;
+            if (!m_glyphs.contains(unicode))
+                continue;
+        }
+        p->drawPath(m_glyphs[unicode].m_path);
+        p->translate(m_glyphs[unicode].m_horizAdvX, 0);
+    }
+
+    p->restore();
+}
+
+void QSvgFont::setFamilyName(const QString &name)
+{
+    m_familyName = name;
+}
+
+void QSvgFont::setUnitsPerEm(qreal upem)
+{
+    m_unitsPerEm = upem;
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_SVG