diff options
24 files changed, 82 insertions, 82 deletions
diff --git a/sources/pyside2/PySide2/QtConcurrent/curr_errors.txt b/sources/pyside2/PySide2/QtConcurrent/curr_errors.txt index 827ebea5c..d8405c755 100644 --- a/sources/pyside2/PySide2/QtConcurrent/curr_errors.txt +++ b/sources/pyside2/PySide2/QtConcurrent/curr_errors.txt @@ -3,7 +3,7 @@ Generating enum model... [OK] Generating namespace model... [WARNING] enum 'QtConcurrent::ThreadFunctionResult' does not have a type entry or is not an enum enum 'QtConcurrent::ReduceQueueThrottleLimit' does not have a type entry or is not an enum - + Resolving typedefs... [OK] Fixing class inheritance... [OK] @@ -14,7 +14,7 @@ Done, 2 warnings (506 known issues) Scanning dependencies of target QtConcurrent [ 21%] Building CXX object PySide/QtConcurrent/CMakeFiles/QtConcurrent.dir/PySide/QtConcurrent/qtconcurrent_module_wrapper.cpp.o In file included from /Users/tismer/src/pyside-setup2/pyside_build/py3.4-qt5.4.2-64bit-debug/pyside/PySide/QtConcurrent/PySide/QtConcurrent/qtconcurrent_module_wrapper.cpp:30: -/Users/tismer/src/pyside-setup2/pyside_build/py3.4-qt5.4.2-64bit-debug/pyside/PySide/QtConcurrent/PySide/QtConcurrent/pyside_qtconcurrent_python.h:44:10: fatal error: +/Users/tismer/src/pyside-setup2/pyside_build/py3.4-qt5.4.2-64bit-debug/pyside/PySide/QtConcurrent/PySide/QtConcurrent/pyside_qtconcurrent_python.h:44:10: fatal error: 'qtconcurrentexception.h' file not found #include <qtconcurrentexception.h> ^ diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 67270ea67..efb68a310 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -903,7 +903,7 @@ <!-- get* methods. Inject code --> <modify-function signature="getCmyk(int*,int*,int*,int*,int*)"> <modify-argument index="0"> - <replace-type modified-type="PyObject *"/> + <replace-type modified-type="PyObject*"/> </modify-argument> <modify-argument index="1"> <remove-argument/> @@ -930,7 +930,7 @@ </modify-function> <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)"> <modify-argument index="0"> - <replace-type modified-type="PyObject *"/> + <replace-type modified-type="PyObject*"/> </modify-argument> <modify-argument index="1"> <remove-argument/> @@ -957,7 +957,7 @@ </modify-function> <modify-function signature="getHsl(int*,int*,int*,int*)const" since="4.6"> <modify-argument index="0"> - <replace-type modified-type="PyObject *"/> + <replace-type modified-type="PyObject*"/> </modify-argument> <modify-argument index="1"> <remove-argument/> @@ -980,7 +980,7 @@ </modify-function> <modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const" since="4.6"> <modify-argument index="0"> - <replace-type modified-type="PyObject *"/> + <replace-type modified-type="PyObject*"/> </modify-argument> <modify-argument index="1"> <remove-argument/> @@ -1003,7 +1003,7 @@ </modify-function> <modify-function signature="getHsv(int*,int*,int*,int*)const"> <modify-argument index="0"> - <replace-type modified-type="PyObject *"/> + <replace-type modified-type="PyObject*"/> </modify-argument> <modify-argument index="1"> <remove-argument/> @@ -1026,7 +1026,7 @@ </modify-function> <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const"> <modify-argument index="0"> - <replace-type modified-type="PyObject *"/> + <replace-type modified-type="PyObject*"/> </modify-argument> <modify-argument index="1"> <remove-argument/> @@ -1049,7 +1049,7 @@ </modify-function> <modify-function signature="getRgb(int*,int*,int*,int*)const"> <modify-argument index="0"> - <replace-type modified-type="PyObject *"/> + <replace-type modified-type="PyObject*"/> </modify-argument> <modify-argument index="1"> <remove-argument/> @@ -1072,7 +1072,7 @@ </modify-function> <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const"> <modify-argument index="0"> - <replace-type modified-type="PyObject *"/> + <replace-type modified-type="PyObject*"/> </modify-argument> <modify-argument index="1"> <remove-argument/> diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml index 2e69f98e0..f7ac67857 100644 --- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml +++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml @@ -177,13 +177,13 @@ <enum-type name="Status"/> <modify-function signature="setViewfinder(QVideoWidget*)"> <modify-argument index="1"> - <replace-type modified-type="QObject *"/> + <replace-type modified-type="QObject*"/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/> </modify-function> <modify-function signature="setViewfinder(QGraphicsVideoItem*)"> <modify-argument index="1"> - <replace-type modified-type="QObject *"/> + <replace-type modified-type="QObject*"/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/> </modify-function> @@ -272,13 +272,13 @@ <enum-type name="Error"/> <modify-function signature="setVideoOutput(QVideoWidget*)"> <modify-argument index="1"> - <replace-type modified-type="QObject *"/> + <replace-type modified-type="QObject*"/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/> </modify-function> <modify-function signature="setVideoOutput(QGraphicsVideoItem*)"> <modify-argument index="1"> - <replace-type modified-type="QObject *"/> + <replace-type modified-type="QObject*"/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/> </modify-function> diff --git a/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp b/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp index 7278edff3..a042ac2cc 100644 --- a/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp +++ b/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp @@ -153,7 +153,7 @@ void registerTypeIfInheritsFromClass( ::Construct, sizeof(QQmlListProperty<WrapperClass>), static_cast< ::QFlags<QMetaType::TypeFlag> >( - QtPrivate::QMetaTypeTypeFlags<QQmlListProperty<WrapperClass> >::Flags), + QtPrivate::QMetaTypeTypeFlags<QQmlListProperty<WrapperClass> >::Flags), nullptr); if (lstType == -1) { PyErr_Format(PyExc_TypeError, "Meta type registration of \"%s\" for QML usage failed.", diff --git a/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml b/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml index b77e06573..b272eec19 100644 --- a/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml +++ b/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml @@ -46,7 +46,7 @@ <load-typesystem name="QtQml/typesystem_qml.xml" generate="no"/> <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> - + <object-type name="QQuickWidget"> <enum-type name="ResizeMode"/> <enum-type name="Status"/> diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 207c3e831..23fb4857e 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -2676,7 +2676,7 @@ <modify-function signature="del()" rename="del_"/> <modify-function signature="getTextMargins(int*,int*,int*,int*)const"> <modify-argument index="0"> - <replace-type modified-type="PyObject *"/> + <replace-type modified-type="PyObject*"/> </modify-argument> <modify-argument index="1"> <remove-argument/> diff --git a/sources/pyside2/libpyside/dynamicqmetaobject_p.h b/sources/pyside2/libpyside/dynamicqmetaobject_p.h index 738b950ba..534be5825 100644 --- a/sources/pyside2/libpyside/dynamicqmetaobject_p.h +++ b/sources/pyside2/libpyside/dynamicqmetaobject_p.h @@ -58,19 +58,19 @@ namespace PySide * \param signature method signature * \param type method return type */ - MethodData(QMetaMethod::MethodType mtype, - const QByteArray& signature, - const QByteArray& rtype = QByteArray("void")); + MethodData(QMetaMethod::MethodType mtype, + const QByteArray &signature, + const QByteArray &rtype = QByteArray("void")); void clear(); bool isValid() const; - const QByteArray& signature() const { return m_signature; } - const QByteArray& returnType() const { return m_rtype; } + const QByteArray &signature() const { return m_signature; } + const QByteArray &returnType() const { return m_rtype; } QMetaMethod::MethodType methodType() const { return m_mtype; } //Qt5 moc: now we have to store method parameter names, count, type QList<QByteArray> parameterTypes() const; int parameterCount() const; QByteArray name() const; - bool operator==(const MethodData& other) const; + bool operator==(const MethodData &other) const; private: QByteArray m_signature; @@ -84,22 +84,22 @@ namespace PySide public: PropertyData(); PropertyData(const char *name, int cachedNotifyId = 0, PySideProperty *data = 0); - const QByteArray& name() const { return m_name; } + const QByteArray &name() const { return m_name; } PySideProperty *data() const { return m_data; } QByteArray type() const; uint flags() const; bool isValid() const; int cachedNotifyId() const; - bool operator==(const PropertyData& other) const; - bool operator==(const char* name) const; + bool operator==(const PropertyData &other) const; + bool operator==(const char *name) const; private: QByteArray m_name; int m_cachedNotifyId; - PySideProperty* m_data; + PySideProperty *m_data; }; -inline bool MethodData::operator==(const MethodData& other) const +inline bool MethodData::operator==(const MethodData &other) const { return m_mtype == other.methodType() && m_signature == other.signature(); } diff --git a/sources/pyside2/tests/QtCore/qmetaobject_test.py b/sources/pyside2/tests/QtCore/qmetaobject_test.py index 73ab81c7c..81a3e7015 100644 --- a/sources/pyside2/tests/QtCore/qmetaobject_test.py +++ b/sources/pyside2/tests/QtCore/qmetaobject_test.py @@ -60,7 +60,7 @@ class qmetaobject_test(unittest.TestCase): f = QFile() fm = f.metaObject() self.assertEqual(m.methodCount(), fm.methodCount()) - """ + """ def test_DynamicSlotSignal(self): o = DynObject() diff --git a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py index 68f79161d..fdd71957b 100644 --- a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py +++ b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py @@ -59,7 +59,7 @@ class TestQObjectConnectNotify(UsesQCoreApplication): '''Test case for QObject::connectNotify''' def setUp(self): UsesQCoreApplication.setUp(self) - self.called = False + self.called = False def tearDown(self): UsesQCoreApplication.tearDown(self) diff --git a/sources/pyside2/tests/QtCore/qslot_object_test.py b/sources/pyside2/tests/QtCore/qslot_object_test.py index cfb9e7883..b8d5513ff 100644 --- a/sources/pyside2/tests/QtCore/qslot_object_test.py +++ b/sources/pyside2/tests/QtCore/qslot_object_test.py @@ -42,7 +42,7 @@ class objTest(QtCore.QObject): def slot(self): global qApp - + self.ok = True qApp.quit() @@ -51,8 +51,8 @@ class objTest(QtCore.QObject): class slotTest(unittest.TestCase): def quit_app(self): global qApp - - qApp.quit() + + qApp.quit() def testBasic(self): global qApp diff --git a/sources/pyside2/tests/QtGui/qregion_test.py b/sources/pyside2/tests/QtGui/qregion_test.py index 3d5c17c36..72cec4bd5 100644 --- a/sources/pyside2/tests/QtGui/qregion_test.py +++ b/sources/pyside2/tests/QtGui/qregion_test.py @@ -38,7 +38,7 @@ class QRegionTest(UsesQApplication): def testFunctionUnit(self): r = QRegion(0, 0, 10, 10) r2 = QRegion(5, 5, 10, 10) - + ru = r.united(r2) self.assertTrue(ru.contains(QPoint(0,0))) self.assertTrue(ru.contains(QPoint(5,5))) diff --git a/sources/pyside2/tests/QtGui/timed_app_test.py b/sources/pyside2/tests/QtGui/timed_app_test.py index d35e595eb..dc0e7c4b0 100644 --- a/sources/pyside2/tests/QtGui/timed_app_test.py +++ b/sources/pyside2/tests/QtGui/timed_app_test.py @@ -28,7 +28,7 @@ import unittest -from helper import TimedQApplication +from helper import TimedQApplication class TestTimedApp(TimedQApplication): '''Simple test case for TimedQApplication''' diff --git a/sources/pyside2/tests/QtQml/bug_726.py b/sources/pyside2/tests/QtQml/bug_726.py index 310153421..20fa4d196 100755 --- a/sources/pyside2/tests/QtQml/bug_726.py +++ b/sources/pyside2/tests/QtQml/bug_726.py @@ -50,7 +50,7 @@ class ProxyObject(QtCore.QObject): @QtCore.Slot(str) def receivedObject(self, name): self._receivedName = name - + class TestConnectionWithInvalidSignature(TimedQApplication): diff --git a/sources/pyside2/tests/QtQml/bug_997.qml b/sources/pyside2/tests/QtQml/bug_997.qml index 7d2b7fcc0..f36a7e8f8 100755 --- a/sources/pyside2/tests/QtQml/bug_997.qml +++ b/sources/pyside2/tests/QtQml/bug_997.qml @@ -29,6 +29,6 @@ import QtQuick 2.0 Text { - text: owner.name + " " + owner.phone + text: owner.name + " " + owner.phone Component.onCompleted: { owner.newName = owner.name } } diff --git a/sources/pyside2/tests/QtScript/bug_1022.py b/sources/pyside2/tests/QtScript/bug_1022.py index d076b23aa..63866ec3c 100644 --- a/sources/pyside2/tests/QtScript/bug_1022.py +++ b/sources/pyside2/tests/QtScript/bug_1022.py @@ -32,7 +32,7 @@ from PySide2.QtCore import * from PySide2.QtScript import * class QScriptValueTest(unittest.TestCase): - def testQScriptValue(self): + def testQScriptValue(self): app = QCoreApplication([]) engine = QScriptEngine() repr(engine.evaluate('1 + 1')) diff --git a/sources/pyside2/tests/QtSvg/tiger.svg b/sources/pyside2/tests/QtSvg/tiger.svg index 983e57026..681fbd209 100644 --- a/sources/pyside2/tests/QtSvg/tiger.svg +++ b/sources/pyside2/tests/QtSvg/tiger.svg @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" diff --git a/sources/pyside2/tests/QtWidgets/bug_307.py b/sources/pyside2/tests/QtWidgets/bug_307.py index 4e5ecab45..0a0e9faa5 100644 --- a/sources/pyside2/tests/QtWidgets/bug_307.py +++ b/sources/pyside2/tests/QtWidgets/bug_307.py @@ -37,9 +37,9 @@ class Test (QApplication) : def __init__(self, argv) : super(Test, self).__init__(argv) self._called = False - + def called(self): - self._called = True + self._called = True class QApplicationSignalsTest(unittest.TestCase): @@ -49,6 +49,6 @@ class QApplicationSignalsTest(unittest.TestCase): app.connect(button, SIGNAL("clicked()"), app.called) button.click() self.assertTrue(app._called) - + if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/bug_338.py b/sources/pyside2/tests/QtWidgets/bug_338.py index 27957a032..e51cb1523 100644 --- a/sources/pyside2/tests/QtWidgets/bug_338.py +++ b/sources/pyside2/tests/QtWidgets/bug_338.py @@ -47,9 +47,9 @@ class BugTest(unittest.TestCase): scene = QtWidgets.QGraphicsScene() item = DiagramItem() item2 = DiagramItem() - #this cause segfault + #this cause segfault scene.addItem(item) scene.addItem(item2) - + if __name__ == "__main__": - unittest.main()
\ No newline at end of file + unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/bug_688.py b/sources/pyside2/tests/QtWidgets/bug_688.py index 716d88df3..2bab2050a 100644 --- a/sources/pyside2/tests/QtWidgets/bug_688.py +++ b/sources/pyside2/tests/QtWidgets/bug_688.py @@ -38,20 +38,20 @@ class BugTest(UsesQApplication): editor = QTextEdit() cursor = QTextCursor(editor.textCursor()) cursor.movePosition(QTextCursor.Start) - + mainFrame = cursor.currentFrame() - + plainCharFormat = QTextCharFormat() boldCharFormat = QTextCharFormat() boldCharFormat.setFontWeight(QFont.Bold); cursor.insertText(""" - Text documents are represented by the - QTextDocument class, rather than by QString objects. - Each QTextDocument object contains information about - the document's internal representation, its structure, - and keeps track of modifications to provide undo/redo - facilities. This approach allows features such as the - layout management to be delegated to specialized + Text documents are represented by the + QTextDocument class, rather than by QString objects. + Each QTextDocument object contains information about + the document's internal representation, its structure, + and keeps track of modifications to provide undo/redo + facilities. This approach allows features such as the + layout management to be delegated to specialized classes, but also provides a focus for the framework.""", plainCharFormat) @@ -62,28 +62,28 @@ class BugTest(UsesQApplication): cursor.insertFrame(frameFormat) cursor.insertText(""" - Documents are either converted from external sources - or created from scratch using Qt. The creation process - can done by an editor widget, such as QTextEdit, or by + Documents are either converted from external sources + or created from scratch using Qt. The creation process + can done by an editor widget, such as QTextEdit, or by explicit calls to the Scribe API.""", boldCharFormat) cursor = mainFrame.lastCursorPosition() cursor.insertText(""" - There are two complementary ways to visualize the - contents of a document: as a linear buffer that is - used by editors to modify the contents, and as an - object hierarchy containing structural information - that is useful to layout engines. In the hierarchical - model, the objects generally correspond to visual - elements such as frames, tables, and lists. At a lower - level, these elements describe properties such as the - style of text used and its alignment. The linear - representation of the document is used for editing and + There are two complementary ways to visualize the + contents of a document: as a linear buffer that is + used by editors to modify the contents, and as an + object hierarchy containing structural information + that is useful to layout engines. In the hierarchical + model, the objects generally correspond to visual + elements such as frames, tables, and lists. At a lower + level, these elements describe properties such as the + style of text used and its alignment. The linear + representation of the document is used for editing and manipulation of the document's contents.""", plainCharFormat) - + frame = cursor.currentFrame() items = [] @@ -110,7 +110,7 @@ class BugTest(UsesQApplication): b.__isub__(1) i -= 1 - + if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/qfontdialog_test.py b/sources/pyside2/tests/QtWidgets/qfontdialog_test.py index dd9980c90..09e9b7173 100644 --- a/sources/pyside2/tests/QtWidgets/qfontdialog_test.py +++ b/sources/pyside2/tests/QtWidgets/qfontdialog_test.py @@ -42,7 +42,7 @@ class TestFontDialog(TimedQApplication): def testGetFontQDialog(self): QtWidgets.QFontDialog.getFont(QtGui.QFont("FreeSans",10)) - + def testGetFontQDialogQString(self): QtWidgets.QFontDialog.getFont(QtGui.QFont("FreeSans",10), None, "Select font") diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py index 7565fd99a..345ea7c45 100644 --- a/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py +++ b/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py @@ -36,13 +36,13 @@ from PySide2 import QtWidgets from helper import UsesQApplication class Item(QtWidgets.QGraphicsItem): - + def __init__(self): QtWidgets.QGraphicsItem.__init__(self) def boundingRect(self): return QtCore.QRectF(0, 0, 100, 100) - + def paint(self, painter, option, widget): painter.setBrush(QtGui.QColor(255, 255, 255)) painter.drawRect(0, 0, 100, 100) diff --git a/sources/pyside2/tests/QtWidgets/reference_count_test.py b/sources/pyside2/tests/QtWidgets/reference_count_test.py index 836020ad9..c2a0ec979 100644 --- a/sources/pyside2/tests/QtWidgets/reference_count_test.py +++ b/sources/pyside2/tests/QtWidgets/reference_count_test.py @@ -75,7 +75,7 @@ class ReferenceCount(UsesQApplication): global destroyedPol self.beforeTest() - + rect = self.scene.addRect(10.0, 10.0, 10.0, 10.0) self.assertTrue(isinstance(rect, QGraphicsRectItem)) diff --git a/sources/pyside2/tests/pysidetest/curr_errors.txt b/sources/pyside2/tests/pysidetest/curr_errors.txt index 83b6e6212..a02da203d 100644 --- a/sources/pyside2/tests/pysidetest/curr_errors.txt +++ b/sources/pyside2/tests/pysidetest/curr_errors.txt @@ -6,7 +6,7 @@ Fixing class inheritance... [OK] Detecting inconsistencies in class model... [OK] [OK] type 'QPyTextObject' is specified in typesystem, but not defined. This could potentially lead to compilation errors. - + Done, 1 warnings (1051 known issues) diff --git a/sources/shiboken2/ApiExtractor/merge.xsl b/sources/shiboken2/ApiExtractor/merge.xsl index d0b7eafa5..c6cab5a42 100644 --- a/sources/shiboken2/ApiExtractor/merge.xsl +++ b/sources/shiboken2/ApiExtractor/merge.xsl @@ -2,11 +2,11 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:output method="xml" indent="yes"/> - <xsl:param name="lang" /> - <xsl:param name="source" /> + <xsl:param name="lang" /> + <xsl:param name="source" /> <xsl:template match="processing-instruction()" /> - + <xsl:template match="/typesystem"> <xsl:copy> <xsl:for-each select="@*"> @@ -20,8 +20,8 @@ <xsl:value-of select="." /> </xsl:copy> </xsl:for-each> - - <xsl:variable name="other" select="document($source)/typesystem/*[not(self::object-type | self::value-type | self::interface-type | self::namespace-type)]" /> + + <xsl:variable name="other" select="document($source)/typesystem/*[not(self::object-type | self::value-type | self::interface-type | self::namespace-type)]" /> <xsl:if test="$other"> <xsl:choose> <xsl:when test="$lang != ''"> @@ -37,7 +37,7 @@ </xsl:if> <xsl:apply-templates select="node()" /> - + </xsl:copy> </xsl:template> @@ -53,14 +53,14 @@ </xsl:for-each> <xsl:apply-templates select="node()" /> - + <xsl:variable name="other" select="document($source)/typesystem/*[name() = $name][@name = current()/@name]" /> <xsl:if test="$other"> <xsl:choose> <xsl:when test="$lang != ''"> <xsl:element name="language"> <xsl:attribute name="name" ><xsl:value-of select="$lang" /></xsl:attribute> - <xsl:copy-of select="$other/node()" /> + <xsl:copy-of select="$other/node()" /> </xsl:element> </xsl:when> <xsl:otherwise> |