Hello community, here is the log from the commit of package texmaker for openSUSE:Factory checked in at Mon May 2 16:50:25 CEST 2011.
-------- --- texmaker/texmaker.changes 2011-04-18 10:12:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/texmaker/texmaker.changes 2011-04-29 00:04:47.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Apr 27 22:20:00 UTC 2011 - [email protected] + +- Update to version 3.0.2 + + Bug fixes: + - Critical bug: Encoding detection while loading + non-unicode/latin1 files + - Wrong detection of some filenames in the log file + - Bad layout of the "inputgraphics dialog" + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- texmaker-3.0.1.tar.bz2 New: ---- texmaker-3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texmaker.spec ++++++ --- /var/tmp/diff_new_pack.UyU1U0/_old 2011-05-02 16:49:58.000000000 +0200 +++ /var/tmp/diff_new_pack.UyU1U0/_new 2011-05-02 16:49:58.000000000 +0200 @@ -18,7 +18,7 @@ Name: texmaker -Version: 3.0.1 +Version: 3.0.2 Release: 1 License: GPLv2 Summary: Free cross-platform LaTeX editor ++++++ texmaker-3.0.1.tar.bz2 -> texmaker-3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/graphicfilechooser.cpp new/texmaker-3.0.2/graphicfilechooser.cpp --- old/texmaker-3.0.1/graphicfilechooser.cpp 2011-01-21 23:41:37.000000000 +0100 +++ new/texmaker-3.0.2/graphicfilechooser.cpp 2011-04-25 11:21:03.000000000 +0200 @@ -22,8 +22,9 @@ connect(ui.pushButton, SIGNAL( clicked() ), this, SLOT( chooseFile() ) ); ui.moreButton->setCheckable(true); ui.moreButton->setAutoDefault(false); -connect(ui.moreButton, SIGNAL(toggled(bool)), ui.extension, SLOT(setVisible(bool))); +connect(ui.moreButton, SIGNAL(toggled(bool)), this, SLOT(expand(bool))); ui.extension->hide(); +updateGeometry(); setWindowTitle(name); } @@ -52,3 +53,9 @@ } } +void GraphicFileChooser::expand(bool e) +{ + ui.extension->setVisible(e); + updateGeometry(); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/graphicfilechooser.h new/texmaker-3.0.2/graphicfilechooser.h --- old/texmaker-3.0.1/graphicfilechooser.h 2011-01-21 22:45:40.000000000 +0100 +++ new/texmaker-3.0.2/graphicfilechooser.h 2011-04-25 11:19:23.000000000 +0200 @@ -33,6 +33,7 @@ private slots: void chooseFile(); + void expand(bool e); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/graphicfilechooser.ui new/texmaker-3.0.2/graphicfilechooser.ui --- old/texmaker-3.0.1/graphicfilechooser.ui 2011-04-01 18:10:19.000000000 +0200 +++ new/texmaker-3.0.2/graphicfilechooser.ui 2011-04-25 11:51:47.000000000 +0200 @@ -6,70 +6,106 @@ <rect> <x>0</x> <y>0</y> - <width>443</width> - <height>194</height> + <width>469</width> + <height>192</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <property name="sizeConstraint"> + <enum>QLayout::SetFixedSize</enum> + </property> <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>File</string> - </property> - <property name="buddy"> - <cstring>lineEdit</cstring> - </property> - </widget> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>File</string> + </property> + <property name="buddy"> + <cstring>lineEdit</cstring> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>250</width> + <height>0</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="texmaker.qrc"> + <normaloff>:/images/fileopen.png</normaloff>:/images/fileopen.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"/> + </item> + </layout> </item> <item row="0" column="1"> - <widget class="QLineEdit" name="lineEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>250</width> - <height>0</height> - </size> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QPushButton" name="pushButton"> + <widget class="QDialogButtonBox" name="buttonBox"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text"> - <string/> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - <property name="icon"> - <iconset resource="texmaker.qrc"> - <normaloff>:/images/fileopen.png</normaloff>:/images/fileopen.png</iconset> - </property> - <property name="iconSize"> - <size> - <width>22</width> - <height>22</height> - </size> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> - <item row="1" column="0"> + <item row="1" column="1"> <widget class="QPushButton" name="moreButton"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -79,83 +115,112 @@ </property> </widget> </item> - <item row="1" column="1" colspan="2"> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <item row="2" column="0" colspan="2"> + <widget class="QFrame" name="extension"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> </property> - </widget> - </item> - <item row="2" column="0" colspan="3"> - <widget class="QWidget" name="extension" native="true"> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0" colspan="3"> - <widget class="QLabel" name="labelFigure"> - <property name="text"> - <string>Use "figure" environment</string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="labelCaption"> - <property name="text"> - <string>Caption</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="lineEditCaption"/> - </item> - <item row="1" column="2"> - <widget class="QComboBox" name="comboBoxCaption"> - <item> - <property name="text"> - <string>Above</string> - </property> + <item row="0" column="0"> + <layout class="QGridLayout" name="gridLayout"> + <item row="1" column="0"> + <widget class="QLabel" name="labelCaption"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Caption</string> + </property> + </widget> </item> - <item> - <property name="text"> - <string>Below</string> - </property> + <item row="1" column="1"> + <widget class="QLineEdit" name="lineEditCaption"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> </item> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="labelPlacement"> - <property name="text"> - <string>Placement</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="lineEditPlacement"> - <property name="text"> - <string>hbtp</string> - </property> - </widget> + <item row="1" column="2"> + <widget class="QComboBox" name="comboBoxCaption"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <item> + <property name="text"> + <string>Above</string> + </property> + </item> + <item> + <property name="text"> + <string>Below</string> + </property> + </item> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="labelPlacement"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Placement</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QLineEdit" name="lineEditPlacement"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>hbtp</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLabel" name="labelFigure"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Use "figure" environment</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> </item> - <item row="3" column="0" colspan="3"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> </layout> </widget> <tabstops> <tabstop>lineEdit</tabstop> <tabstop>pushButton</tabstop> - <tabstop>moreButton</tabstop> - <tabstop>lineEditCaption</tabstop> - <tabstop>comboBoxCaption</tabstop> - <tabstop>lineEditPlacement</tabstop> </tabstops> <resources> <include location="texmaker.qrc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/hunspell/htypes.hxx new/texmaker-3.0.2/hunspell/htypes.hxx --- old/texmaker-3.0.1/hunspell/htypes.hxx 2010-07-15 13:41:33.000000000 +0200 +++ new/texmaker-3.0.2/hunspell/htypes.hxx 2011-04-25 09:35:59.000000000 +0200 @@ -11,6 +11,7 @@ #define H_OPT_ALIASM (1 << 1) #define H_OPT_PHON (1 << 2) +#include <cstddef> // see also csutil.hxx //#define HENTRY_WORD(h) &(h->word) #define HENTRY_WORD(h) ((char *) h + offsetof(struct hentry, word)) Files old/texmaker-3.0.1/locale/texmaker_cs.qm and new/texmaker-3.0.2/locale/texmaker_cs.qm differ Files old/texmaker-3.0.1/locale/texmaker_fr.qm and new/texmaker-3.0.2/locale/texmaker_fr.qm differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/pdfviewer.cpp new/texmaker-3.0.2/pdfviewer.cpp --- old/texmaker-3.0.1/pdfviewer.cpp 2011-04-16 15:04:07.000000000 +0200 +++ new/texmaker-3.0.2/pdfviewer.cpp 2011-04-25 12:11:42.000000000 +0200 @@ -1086,7 +1086,7 @@ { QStringList args; args << "lp"; - args << QString("-d %1").arg(printer.printerName().replace(" ","_")); + if (!printer.printerName().contains(" ")) args << QString("-d %1").arg(printer.printerName());//.replace(" ","_")); args << QString("-n %1").arg(printer.numCopies()); // args << QString("-t \"%1\"").arg(printer.docName()); args << QString("-P %1-%2").arg(firstPage).arg(lastPage); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/pdfviewerwidget.cpp new/texmaker-3.0.2/pdfviewerwidget.cpp --- old/texmaker-3.0.1/pdfviewerwidget.cpp 2011-04-16 15:04:16.000000000 +0200 +++ new/texmaker-3.0.2/pdfviewerwidget.cpp 2011-04-25 22:38:40.000000000 +0200 @@ -1064,7 +1064,7 @@ { QStringList args; args << "lp"; - args << QString("-d %1").arg(printer.printerName().replace(" ","_")); + if (!printer.printerName().contains(" ")) args << QString("-d %1").arg(printer.printerName());//.replace(" ","_")); args << QString("-n %1").arg(printer.numCopies()); // args << QString("-t \"%1\"").arg(printer.docName()); args << QString("-P %1-%2").arg(firstPage).arg(lastPage); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/texmaker.cpp new/texmaker-3.0.2/texmaker.cpp --- old/texmaker-3.0.1/texmaker.cpp 2011-04-16 14:09:18.000000000 +0200 +++ new/texmaker-3.0.2/texmaker.cpp 2011-04-25 15:12:44.000000000 +0200 @@ -2032,7 +2032,6 @@ #endif QString new_encoding; QEncodingProber prober (QEncodingProber::Universal); - if (hasDecodingError) { prober.feed (buf.constData()); @@ -2040,7 +2039,10 @@ if (prober.confidence() > 0.5) //Kencodingprober works very bad with tex documents { detected_codec = QTextCodec::codecForName(prober.encoding()); - new_encoding=detected_codec->name(); + if (detected_codec) new_encoding=detected_codec->name(); + else if (input_encoding=="UTF-8") new_encoding="ISO-8859-1"; + else if (input_encoding=="ISO-8859-1") new_encoding="UTF-8"; + else new_encoding=QString(QTextCodec::codecForLocale()->name()); } else if (input_encoding=="UTF-8") new_encoding="ISO-8859-1"; else if (input_encoding=="ISO-8859-1") new_encoding="UTF-8"; @@ -2066,7 +2068,6 @@ if (completion) edit->editor->setCompleter(completer); else edit->editor->setCompleter(0); edit->editor->setPlainText(text); - filenames.remove( edit); filenames.insert( edit, f ); edit->editor->document()->setModified(false); @@ -4281,7 +4282,11 @@ code.replace(QRegExp("([^\\\\])\\\\n"), "\\1\n"); dx=tagList.at(1).toInt(); dy=tagList.at(2).toInt(); - if ((dx==0) && (dy==0)) dx=code.length(); + if ((dx==0) && (dy==0)) + { + if (!currentEditorView()->editor->textCursor().hasSelection()) dx=code.length(); + else dx=code.length()-currentEditorView()->editor->textCursor().selectedText().length(); + } InsertTag(code,dx,dy); } } @@ -6488,7 +6493,8 @@ pile.removeLast(); if (rxFile.indexIn(suivant) != -1) name=rxFile.cap(1); else name=""; - filestack.append(name.remove("./")); + if (name.startsWith("./")) name.remove("./"); + filestack.append(name); } else if (mot==")" && filestack.count()>0) filestack.removeLast(); } @@ -7395,6 +7401,7 @@ { words.append("\\cite{"+bibitem.at(i)+"}"); words.append("\\footcite{"+bibitem.at(i)+"}"); + words.append("\\citep{"+bibitem.at(i)+"}"); } for (int i=0; i<labelitem.count();++i) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/texmaker.pro new/texmaker-3.0.2/texmaker.pro --- old/texmaker-3.0.1/texmaker.pro 2011-04-15 17:27:04.000000000 +0200 +++ new/texmaker-3.0.2/texmaker.pro 2011-04-25 10:39:07.000000000 +0200 @@ -5,7 +5,7 @@ xml \ webkit CONFIG += qt warn_off release -TEXMAKERVERSION=3.0.1 +TEXMAKERVERSION=3.0.2 DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\" DEFINES += HAVE_SPLASH ############################### Files old/texmaker-3.0.1/texmaker_cs.qm and new/texmaker-3.0.2/texmaker_cs.qm differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/texmaker_cs.ts new/texmaker-3.0.2/texmaker_cs.ts --- old/texmaker-3.0.1/texmaker_cs.ts 2011-04-16 14:45:15.000000000 +0200 +++ new/texmaker-3.0.2/texmaker_cs.ts 2011-04-17 18:48:55.000000000 +0200 @@ -231,7 +231,7 @@ <message> <location filename="configdialog.ui" line="499"/> <source>Embed</source> - <translation type="unfinished"></translation> + <translation>Vložit</translation> </message> <message> <location filename="configdialog.ui" line="525"/> @@ -901,7 +901,7 @@ <message> <location filename="pdfviewerwidget.cpp" line="180"/> <source>External Viewer</source> - <translation type="unfinished">Vnější prohlížeč</translation> + <translation>Vnější prohlížeč</translation> </message> <message> <location filename="pdfviewerwidget.cpp" line="331"/> Files old/texmaker-3.0.1/texmaker_fr.qm and new/texmaker-3.0.2/texmaker_fr.qm differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/texmaker_fr.ts new/texmaker-3.0.2/texmaker_fr.ts --- old/texmaker-3.0.1/texmaker_fr.ts 2011-04-16 14:47:38.000000000 +0200 +++ new/texmaker-3.0.2/texmaker_fr.ts 2011-04-25 11:58:25.000000000 +0200 @@ -419,7 +419,7 @@ <message> <location filename="encodingdialog.ui" line="31"/> <source>Use this encoding :</source> - <translation>Utilser cet encodage :</translation> + <translation>Utiliser cet encodage :</translation> </message> </context> <context> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/utilities/CHANGELOG.txt new/texmaker-3.0.2/utilities/CHANGELOG.txt --- old/texmaker-3.0.1/utilities/CHANGELOG.txt 2011-04-16 14:50:19.000000000 +0200 +++ new/texmaker-3.0.2/utilities/CHANGELOG.txt 2011-04-25 10:43:13.000000000 +0200 @@ -1,3 +1,9 @@ +version 3.0.1 -> 3.0.2 : +---------------------- +- a potential crash has been fixed while loading non unicode/latin1 files (issue 216) +- the bug about the wrong detection of some filenames in the log file has been fixed (issue 191) +- if the printer name contains space on macosx, the default printer is used (issue 210) + version 3.0 -> 3.0.1 : ---------------------- - The internal pdf viewer can now be embedded in the main window whatever the screen width (issues 177, 183) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmaker-3.0.1/utilities/texmaker.spec new/texmaker-3.0.2/utilities/texmaker.spec --- old/texmaker-3.0.1/utilities/texmaker.spec 2011-04-15 17:25:59.000000000 +0200 +++ new/texmaker-3.0.2/utilities/texmaker.spec 2011-04-25 10:39:58.000000000 +0200 @@ -1,6 +1,6 @@ Name: texmaker Summary: LaTeX editor -Version: 3.0.1 +Version: 3.0.2 Release: xm1 License: GPL Group: Applications/Publishing ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
