head 1.6; access; symbols OPENPKG_E1_MP_HEAD:1.6 OPENPKG_E1_MP:1.6 OPENPKG_1_STABLE_MP:1.5; locks; strict; comment @# @; 1.6 date 2003.09.29.10.35.25; author ms; state dead; branches; next 1.5; 1.5 date 2003.04.29.19.35.43; author ms; state Exp; branches; next 1.4; 1.4 date 2003.04.29.11.33.55; author ms; state Exp; branches; next 1.3; 1.3 date 2003.04.29.09.03.28; author ms; state Exp; branches; next 1.2; 1.2 date 2003.04.29.08.29.45; author ms; state Exp; branches; next 1.1; 1.1 date 2003.02.26.12.29.24; author mlelstv; state Exp; branches; next ; desc @@ 1.6 log @Reduce and move patch into three subst, and update from 1.3.2 to 1.3.3 @ text @diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C lyx-1.3.1/src/frontends/qt2/lengthcombo.C --- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C 2002-12-17 21:37:11.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/lengthcombo.C 2003-04-29 20:03:52.378340752 +0200 @@@@ -35,9 +35,9 @@@@ } -LyXLength::UNIT LengthCombo::currentLengthItem() const +LyXLength::LENUNIT LengthCombo::currentLengthItem() const { - return static_cast(currentItem()); + return static_cast(currentItem()); } @@@@ -47,7 +47,7 @@@@ } -void LengthCombo::setCurrentItem(LyXLength::UNIT unit) +void LengthCombo::setCurrentItem(LyXLength::LENUNIT unit) { QComboBox::setCurrentItem(int(unit)); } diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h lyx-1.3.1/src/frontends/qt2/lengthcombo.h --- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h 2002-11-17 12:24:08.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/lengthcombo.h 2003-04-29 20:03:52.378861522 +0200 @@@@ -21,7 +21,7 @@@@ #include "vspace.h" /** - * A combo box for selecting LyXLength::UNIT types. + * A combo box for selecting LyXLength::LENUNIT types. */ class LengthCombo : public QComboBox { Q_OBJECT @@@@ -29,9 +29,9 @@@@ LengthCombo(QWidget * parent, char * name); /// set the current item - virtual void setCurrentItem(LyXLength::UNIT unit); + virtual void setCurrentItem(LyXLength::LENUNIT unit); /// get the current item - LyXLength::UNIT currentLengthItem() const; + LyXLength::LENUNIT currentLengthItem() const; /// enable the widget virtual void setEnabled(bool b); @@@@ -39,7 +39,7 @@@@ virtual void has_activated(int index); signals: /// the current selection has changed - void selectionChanged(LyXLength::UNIT unit); + void selectionChanged(LyXLength::LENUNIT unit); }; diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QDocument.C lyx-1.3.1/src/frontends/qt2/QDocument.C --- lyx-1.3.1.orig/src/frontends/qt2/QDocument.C 2003-02-12 16:32:01.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/QDocument.C 2003-04-29 20:03:52.361659250 +0200 @@@@ -275,7 +275,7 @@@@ break; case 3: { - LyXLength::UNIT unit = + LyXLength::LENUNIT unit = dialog_->layoutModule->skipLengthCO-> currentLengthItem(); double length = @@@@ -382,7 +382,7 @@@@ // set the default unit // FIXME: move to controller - LyXLength::UNIT defaultUnit = LyXLength::CM; + LyXLength::LENUNIT defaultUnit = LyXLength::CM; switch (lyxrc.default_papersize) { case BufferParams::PAPER_DEFAULT: break; diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QGraphics.C lyx-1.3.1/src/frontends/qt2/QGraphics.C --- lyx-1.3.1.orig/src/frontends/qt2/QGraphics.C 2002-12-17 21:37:10.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/QGraphics.C 2003-04-29 20:03:52.362682905 +0200 @@@@ -141,7 +141,7 @@@@ InsetGraphicsParams & igp = controller().params(); // set the right default unit - LyXLength::UNIT unitDefault = LyXLength::CM; + LyXLength::LENUNIT unitDefault = LyXLength::CM; switch (lyxrc.default_papersize) { case BufferParams::PAPER_DEFAULT: break; @@@@ -260,7 +260,7 @@@@ } // 2. the height (a lengthgcombo type) dialog_->height->setText(toqstr(tostr(igp.height.value()))); - LyXLength::UNIT unit_ = (igp.height.value() > 0.0) ? + LyXLength::LENUNIT unit_ = (igp.height.value() > 0.0) ? igp.height.unit() : unitDefault; dialog_->heightUnit->setCurrentItem(unit_); diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QMinipage.C lyx-1.3.1/src/frontends/qt2/QMinipage.C --- lyx-1.3.1.orig/src/frontends/qt2/QMinipage.C 2002-12-17 21:37:10.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/QMinipage.C 2003-04-29 20:03:52.363209925 +0200 @@@@ -56,7 +56,7 @@@@ void QMinipage::apply() { double const value = strToDbl(fromqstr(dialog_->widthED->text())); - LyXLength::UNIT unit = dialog_->unitsLC->currentLengthItem(); + LyXLength::LENUNIT unit = dialog_->unitsLC->currentLengthItem(); if (dialog_->widthED->text().isEmpty()) unit = LyXLength::UNIT_NONE; diff -Naur lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.C lyx-1.3.1/src/frontends/qt2/qt_helpers.C --- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.C 2002-12-17 21:37:11.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/qt_helpers.C 2003-04-29 20:03:52.363693126 +0200 @@@@ -67,14 +67,14 @@@@ if (isValidGlueLength(fromqstr(length))) return fromqstr(length); - LyXLength::UNIT unit = combo->currentLengthItem(); + LyXLength::LENUNIT unit = combo->currentLengthItem(); return LyXLength(length.toDouble(), unit).asString(); } void lengthToWidgets(QLineEdit * input, LengthCombo * combo, - string const & len, LyXLength::UNIT defaultUnit) + string const & len, LyXLength::LENUNIT defaultUnit) { if (len.empty()) { // no length (UNIT_NONE) diff -Naur lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.h lyx-1.3.1/src/frontends/qt2/qt_helpers.h --- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.h 2002-12-17 21:37:11.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/qt_helpers.h 2003-04-29 20:03:52.364154800 +0200 @@@@ -35,7 +35,7 @@@@ /// method to set widgets from a LyXLength void lengthToWidgets(QLineEdit * input, LengthCombo * combo, - string const & len, LyXLength::UNIT default_unit); + string const & len, LyXLength::LENUNIT default_unit); /** * toqstr - convert char * into unicode diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QTabular.C lyx-1.3.1/src/frontends/qt2/QTabular.C --- lyx-1.3.1.orig/src/frontends/qt2/QTabular.C 2003-02-07 15:31:40.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/QTabular.C 2003-04-29 20:03:52.364906771 +0200 @@@@ -165,7 +165,7 @@@@ bool const isReadonly = bc().bp().isReadOnly(); dialog_->specialAlignmentED->setEnabled(!isReadonly); - LyXLength::UNIT default_unit = controller().metric() ? LyXLength::CM : LyXLength::IN; + LyXLength::LENUNIT default_unit = controller().metric() ? LyXLength::CM : LyXLength::IN; if (!pwidth.zero()) { dialog_->widthED->setText(toqstr(tostr(pwidth.value()))); dialog_->widthUnit->setCurrentItem(pwidth.unit()); diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QWrap.C lyx-1.3.1/src/frontends/qt2/QWrap.C --- lyx-1.3.1.orig/src/frontends/qt2/QWrap.C 2002-12-17 21:37:10.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/QWrap.C 2003-04-29 20:03:52.365432794 +0200 @@@@ -56,7 +56,7 @@@@ void QWrap::apply() { double const value = strToDbl(fromqstr(dialog_->widthED->text())); - LyXLength::UNIT unit = dialog_->unitsLC->currentLengthItem(); + LyXLength::LENUNIT unit = dialog_->unitsLC->currentLengthItem(); if (dialog_->widthED->text().isEmpty()) unit = LyXLength::UNIT_NONE; diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/ClassModuleBase.ui lyx-1.3.1/src/frontends/qt2/ui/ClassModuleBase.ui --- lyx-1.3.1.orig/src/frontends/qt2/ui/ClassModuleBase.ui 2003-02-18 15:02:18.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/ui/ClassModuleBase.ui 2003-04-29 20:03:52.366169585 +0200 @@@@ -322,7 +322,7 @@@@ 5 image0 - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/MarginsModuleBase.ui lyx-1.3.1/src/frontends/qt2/ui/MarginsModuleBase.ui --- lyx-1.3.1.orig/src/frontends/qt2/ui/MarginsModuleBase.ui 2003-02-18 15:02:18.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/ui/MarginsModuleBase.ui 2003-04-29 20:03:52.366987455 +0200 @@@@ -401,7 +401,7 @@@@ 5 image0 - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/PaperModuleBase.ui lyx-1.3.1/src/frontends/qt2/ui/PaperModuleBase.ui --- lyx-1.3.1.orig/src/frontends/qt2/ui/PaperModuleBase.ui 2003-01-23 17:23:39.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/ui/PaperModuleBase.ui 2003-04-29 20:03:52.367739413 +0200 @@@@ -286,7 +286,7 @@@@ 5 image0 - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QGraphicsDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QGraphicsDialogBase.ui --- lyx-1.3.1.orig/src/frontends/qt2/ui/QGraphicsDialogBase.ui 2003-01-23 17:23:40.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/ui/QGraphicsDialogBase.ui 2003-04-29 20:03:52.370563925 +0200 @@@@ -1212,7 +1212,7 @@@@ 5 image0 - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QMinipageDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QMinipageDialogBase.ui --- lyx-1.3.1.orig/src/frontends/qt2/ui/QMinipageDialogBase.ui 2003-02-25 15:10:05.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/ui/QMinipageDialogBase.ui 2003-04-29 20:03:52.371717175 +0200 @@@@ -346,7 +346,7 @@@@ 5 image0 - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) @@@@ -364,7 +364,7 @@@@ unitsLC - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) QMinipageDialogBase change_adaptor() diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QTabularDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QTabularDialogBase.ui --- lyx-1.3.1.orig/src/frontends/qt2/ui/QTabularDialogBase.ui 2003-01-23 17:23:40.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/ui/QTabularDialogBase.ui 2003-04-29 20:03:52.374644549 +0200 @@@@ -1356,7 +1356,7 @@@@ 5 image0 - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) QSetBorder @@@@ -1577,7 +1577,7 @@@@ widthUnit - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) QTabularDialogBase width_changed() diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QWrapDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QWrapDialogBase.ui --- lyx-1.3.1.orig/src/frontends/qt2/ui/QWrapDialogBase.ui 2003-01-13 11:33:23.000000000 +0100 +++ lyx-1.3.1/src/frontends/qt2/ui/QWrapDialogBase.ui 2003-04-29 20:03:52.375768392 +0200 @@@@ -340,7 +340,7 @@@@ 5 image0 - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) @@@@ -358,7 +358,7 @@@@ unitsLC - selectionChanged(LyXLength::UNIT) + selectionChanged(LyXLength::LENUNIT) QWrapDialogBase change_adaptor() diff -Naur lyx-1.3.1.orig/src/lengthcommon.C lyx-1.3.1/src/lengthcommon.C --- lyx-1.3.1.orig/src/lengthcommon.C 2002-11-25 02:15:10.000000000 +0100 +++ lyx-1.3.1/src/lengthcommon.C 2003-04-29 20:03:52.376260266 +0200 @@@@ -45,10 +45,10 @@@@ // N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"), // N_("theight%"), N_("pheight%") }; -LyXLength::UNIT unitFromString(string const & data) +LyXLength::LENUNIT unitFromString(string const & data) { int i = 0; while (i < num_units && data != unit_name[i]) ++i; - return static_cast(i); + return static_cast(i); } diff -Naur lyx-1.3.1.orig/src/lengthcommon.h lyx-1.3.1/src/lengthcommon.h --- lyx-1.3.1.orig/src/lengthcommon.h 2002-11-17 12:24:08.000000000 +0100 +++ lyx-1.3.1/src/lengthcommon.h 2003-04-29 20:03:52.376643680 +0200 @@@@ -19,7 +19,7 @@@@ extern char const * unit_name_ltx[]; /// return the unit given a string representation such as "cm" -LyXLength::UNIT unitFromString(string const & data); +LyXLength::LENUNIT unitFromString(string const & data); #endif // LENGTH_COMMON_H diff -Naur lyx-1.3.1.orig/src/lyxlength.C lyx-1.3.1/src/lyxlength.C --- lyx-1.3.1.orig/src/lyxlength.C 2002-12-04 03:57:14.000000000 +0100 +++ lyx-1.3.1/src/lyxlength.C 2003-04-29 20:09:34.116688131 +0200 @@@@ -31,7 +31,7 @@@@ {} -LyXLength::LyXLength(double v, LyXLength::UNIT u) +LyXLength::LyXLength(double v, LyXLength::LENUNIT u) : val_(v), unit_(u) {} @@@@ -99,7 +99,7 @@@@ } -LyXLength::UNIT LyXLength::unit() const +LyXLength::LENUNIT LyXLength::unit() const { return unit_; } @@@@ -111,7 +111,7 @@@@ } -void LyXLength::unit(LyXLength::UNIT u) +void LyXLength::unit(LyXLength::LENUNIT u) { unit_ = u; } @@@@ -156,7 +156,7 @@@@ double result = 0.0; switch (unit_) { - case LyXLength::SP: + case LyXLength::LYX_SP: // Scaled point: sp = 1/65536 pt result = zoom * dpi * val_ / (72.27 * 65536); // 4736286.7 @@@@ -181,7 +181,7 @@@@ result = zoom * dpi * val_ / 25.4; // 25.4 break; - case LyXLength::PC: + case LyXLength::LYX_PC: // Pica: 1 pc = 12 pt result = zoom * dpi * val_ / (72.27 / 12); // 6.0225 diff -Naur lyx-1.3.1.orig/src/lyxlength.h lyx-1.3.1/src/lyxlength.h --- lyx-1.3.1.orig/src/lyxlength.h 2002-12-04 03:57:14.000000000 +0100 +++ lyx-1.3.1/src/lyxlength.h 2003-04-29 20:05:52.608542869 +0200 @@@@ -23,13 +23,13 @@@@ class LyXLength { public: /// length units - enum UNIT { - SP, ///< Scaled point (65536sp = 1pt) TeX's smallest unit. + enum LENUNIT { + LYX_SP, ///< Scaled point (65536sp = 1pt) TeX's smallest unit. PT, ///< Point = 1/72.27in = 0.351mm BP, ///< Big point (72bp = 1in), also PostScript point DD, ///< Didot point = 1/72 of a French inch, = 0.376mm MM, ///< Millimeter = 2.845pt - PC, ///< Pica = 12pt = 4.218mm + LYX_PC, ///< Pica = 12pt = 4.218mm CC, ///< Cicero = 12dd = 4.531mm CM, ///< Centimeter = 10mm = 2.371pc IN, ///< Inch = 25.4mm = 72.27pt = 6.022pc @@@@ -48,7 +48,7 @@@@ /// LyXLength(); /// - LyXLength(double v, LyXLength::UNIT u); + LyXLength(double v, LyXLength::LENUNIT u); /// "data" must be a decimal number, followed by a unit explicit LyXLength(string const & data); @@@@ -56,11 +56,11 @@@@ /// double value() const; /// - LyXLength::UNIT unit() const; + LyXLength::LENUNIT unit() const; /// void value(double); /// - void unit(LyXLength::UNIT unit); + void unit(LyXLength::LENUNIT unit); /// bool zero() const; /// @@@@ -82,7 +82,7 @@@@ /// double val_; /// - LyXLength::UNIT unit_; + LyXLength::LENUNIT unit_; }; /// diff -Naur lyx-1.3.1.orig/src/vspace.C lyx-1.3.1/src/vspace.C --- lyx-1.3.1.orig/src/vspace.C 2002-12-01 23:59:17.000000000 +0100 +++ lyx-1.3.1/src/vspace.C 2003-04-29 20:03:52.379626127 +0200 @@@@ -32,7 +32,7 @@@@ /// used to return numeric values in parsing vspace double number[4] = { 0, 0, 0, 0 }; /// used to return unit types in parsing vspace -LyXLength::UNIT unit[4] = { LyXLength::UNIT_NONE, +LyXLength::LENUNIT unit[4] = { LyXLength::UNIT_NONE, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE }; @ 1.5 log @Fix remaining SVR4 problems. @ text @@ 1.4 log @Add more missing patches @ text @d1 57 d59 2 a60 2 --- lyx-1.3.1.orig/src/frontends/qt2/QDocument.C 2003-04-29 10:14:36.487493720 +0200 +++ lyx-1.3.1/src/frontends/qt2/QDocument.C 2003-04-29 10:17:23.770730673 +0200 d80 2 a81 2 --- lyx-1.3.1.orig/src/frontends/qt2/QGraphics.C 2003-04-29 10:14:36.489484058 +0200 +++ lyx-1.3.1/src/frontends/qt2/QGraphics.C 2003-04-29 10:17:39.566260764 +0200 d101 2 a102 2 --- lyx-1.3.1.orig/src/frontends/qt2/QMinipage.C 2003-04-29 10:14:36.492430471 +0200 +++ lyx-1.3.1/src/frontends/qt2/QMinipage.C 2003-04-29 10:17:57.366972496 +0200 d113 2 a114 2 --- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.C 2003-04-29 10:14:36.508465835 +0200 +++ lyx-1.3.1/src/frontends/qt2/qt_helpers.C 2003-04-29 10:18:14.033381605 +0200 d133 2 a134 2 --- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.h 2003-04-29 10:14:36.508316627 +0200 +++ lyx-1.3.1/src/frontends/qt2/qt_helpers.h 2003-04-29 10:18:25.972214609 +0200 d145 2 a146 2 --- lyx-1.3.1.orig/src/frontends/qt2/QTabular.C 2003-04-29 10:14:36.502484876 +0200 +++ lyx-1.3.1/src/frontends/qt2/QTabular.C 2003-04-29 10:18:36.772529236 +0200 d157 2 a158 2 --- lyx-1.3.1.orig/src/frontends/qt2/QWrap.C 2003-04-29 10:14:36.505016784 +0200 +++ lyx-1.3.1/src/frontends/qt2/QWrap.C 2003-04-29 10:18:48.057925307 +0200 d169 2 a170 2 --- lyx-1.3.1.orig/src/frontends/qt2/ui/ClassModuleBase.ui 2003-04-29 10:14:36.530736311 +0200 +++ lyx-1.3.1/src/frontends/qt2/ui/ClassModuleBase.ui 2003-04-29 10:19:00.507553445 +0200 d181 2 a182 2 --- lyx-1.3.1.orig/src/frontends/qt2/ui/MarginsModuleBase.ui 2003-04-29 10:14:36.531483639 +0200 +++ lyx-1.3.1/src/frontends/qt2/ui/MarginsModuleBase.ui 2003-04-29 10:19:10.504091112 +0200 d193 2 a194 2 --- lyx-1.3.1.orig/src/frontends/qt2/ui/PaperModuleBase.ui 2003-04-29 10:14:36.532370372 +0200 +++ lyx-1.3.1/src/frontends/qt2/ui/PaperModuleBase.ui 2003-04-29 10:19:18.879282050 +0200 d205 2 a206 2 --- lyx-1.3.1.orig/src/frontends/qt2/ui/QGraphicsDialogBase.ui 2003-04-29 10:14:36.540505812 +0200 +++ lyx-1.3.1/src/frontends/qt2/ui/QGraphicsDialogBase.ui 2003-04-29 10:19:26.681562509 +0200 d217 2 a218 2 --- lyx-1.3.1.orig/src/frontends/qt2/ui/QMinipageDialogBase.ui 2003-04-29 10:14:36.545443862 +0200 +++ lyx-1.3.1/src/frontends/qt2/ui/QMinipageDialogBase.ui 2003-04-29 10:19:54.955951154 +0200 d238 2 a239 2 --- lyx-1.3.1.orig/src/frontends/qt2/ui/QTabularDialogBase.ui 2003-04-29 10:14:36.558619619 +0200 +++ lyx-1.3.1/src/frontends/qt2/ui/QTabularDialogBase.ui 2003-04-29 10:20:24.883229624 +0200 d259 2 a260 2 --- lyx-1.3.1.orig/src/frontends/qt2/ui/QWrapDialogBase.ui 2003-04-29 10:14:36.561297002 +0200 +++ lyx-1.3.1/src/frontends/qt2/ui/QWrapDialogBase.ui 2003-04-29 10:20:39.279541103 +0200 d280 2 a281 2 --- lyx-1.3.1.orig/src/lengthcommon.C 2003-04-29 10:14:36.267553251 +0200 +++ lyx-1.3.1/src/lengthcommon.C 2003-04-29 10:20:58.940480513 +0200 d296 2 a297 2 --- lyx-1.3.1.orig/src/lengthcommon.h 2003-04-29 10:14:36.267695290 +0200 +++ lyx-1.3.1/src/lengthcommon.h 2003-04-29 10:21:09.266821769 +0200 d308 2 a309 2 --- lyx-1.3.1.orig/src/lyxlength.C 2003-04-29 10:14:36.274763602 +0200 +++ lyx-1.3.1/src/lyxlength.C 2003-04-29 10:21:26.441919128 +0200 d337 22 a358 4 diff -Naur lyx-1.3.1.orig/src/lyxlength.h lyx-1.3.1.mod/src/lyxlength.h --- lyx-1.3.1.orig/src/lyxlength.h 2003-04-29 10:14:36.274901323 +0200 +++ lyx-1.3.1.mod/src/lyxlength.h 2003-04-29 11:00:35.626055720 +0200 @@@@ -23,7 +23,7 @@@@ d363 1 d365 1 a365 1 SP, ///< Scaled point (65536sp = 1pt) TeX's smallest unit. d368 7 a406 57 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C lyx-1.3.1/src/frontends/qt2/lengthcombo.C --- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C Tue Dec 17 21:37:11 2002 +++ lyx-1.3.1/src/frontends/qt2/lengthcombo.C Tue Apr 29 13:21:19 2003 @@@@ -35,9 +35,9 @@@@ } -LyXLength::UNIT LengthCombo::currentLengthItem() const +LyXLength::LENUNIT LengthCombo::currentLengthItem() const { - return static_cast(currentItem()); + return static_cast(currentItem()); } @@@@ -47,7 +47,7 @@@@ } -void LengthCombo::setCurrentItem(LyXLength::UNIT unit) +void LengthCombo::setCurrentItem(LyXLength::LENUNIT unit) { QComboBox::setCurrentItem(int(unit)); } diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h lyx-1.3.1/src/frontends/qt2/lengthcombo.h --- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h Sun Nov 17 12:24:08 2002 +++ lyx-1.3.1/src/frontends/qt2/lengthcombo.h Tue Apr 29 12:43:22 2003 @@@@ -21,7 +21,7 @@@@ #include "vspace.h" /** - * A combo box for selecting LyXLength::UNIT types. + * A combo box for selecting LyXLength::LENUNIT types. */ class LengthCombo : public QComboBox { Q_OBJECT @@@@ -29,9 +29,9 @@@@ LengthCombo(QWidget * parent, char * name); /// set the current item - virtual void setCurrentItem(LyXLength::UNIT unit); + virtual void setCurrentItem(LyXLength::LENUNIT unit); /// get the current item - LyXLength::UNIT currentLengthItem() const; + LyXLength::LENUNIT currentLengthItem() const; /// enable the widget virtual void setEnabled(bool b); @@@@ -39,7 +39,7 @@@@ virtual void has_activated(int index); signals: /// the current selection has changed - void selectionChanged(LyXLength::UNIT unit); + void selectionChanged(LyXLength::LENUNIT unit); }; d408 2 a409 2 --- lyx-1.3.1.orig/src/vspace.C Sun Dec 1 23:59:17 2002 +++ lyx-1.3.1/src/vspace.C Tue Apr 29 12:32:10 2003 @ 1.3 log @Added missing patch code, fixing class LyXLength on linux and solaris @ text @d324 69 @ 1.2 log @Fix building on linux and solaris, rewrite patch, and move xforms changes to an individual xforms patch. @ text @d280 44 @ 1.1 log @add patch to CVS @ text @d1 261 a261 96 --- Imakefile.dist Thu Feb 20 15:00:08 2003 +++ Imakefile Thu Feb 20 16:42:03 2003 @@@@ -2,13 +2,13 @@@@ /* Fairly important stuff */ -#define OptimizationLevel -O4 +#define OptimizationLevel -O2 #define DoWall NO -#define BuildShared YES +#define BuildShared NO #define StaticLink YES -#define BuildGL YES +#define BuildGL NO /* Less Important or System Specific */ @@@@ -32,23 +32,23 @@@@ /* Out in the Tall Weeds */ -#define InstallNonstandard NO -#define XFormsNonstandardInstallDir /usr/local +#define InstallNonstandard YES +#define XFormsNonstandardInstallDir @@l_prefix@@ -#define NonstandardXpm NO +#define NonstandardXpm YES -#define XpmIncLoc /usr/local/include -#define XpmLibLoc /usr/local/lib +#define XpmIncLoc @@l_prefix@@/include/X11 +#define XpmLibLoc @@l_prefix@@/lib -#define NonstandardTiff NO +#define NonstandardTiff YES -#define TiffIncLoc /usr/local/include -#define TiffLibLoc /usr/local/lib +#define TiffIncLoc @@l_prefix@@/include +#define TiffLibLoc @@l_prefix@@/lib -#define NonstandardJpeg NO +#define NonstandardJpeg YES -#define JpegIncLoc /usr/local/include -#define JpegLibLoc /usr/local/lib +#define JpegIncLoc @@l_prefix@@/include +#define JpegLibLoc @@l_prefix@@/lib ###################################################################### # # --- demos/Imakefile.dist Thu Feb 20 15:26:40 2003 +++ demos/Imakefile Thu Feb 20 16:42:09 2003 @@@@ -154,7 +154,7 @@@@ -I. DEPEND_DEFINES = \ - -I/usr/local/include + -I@@l_prefix@@/include EXTRA_LIBRARIES = \ $(STATIC) \ @@@@ -176,7 +176,7 @@@@ #if Optimize IMAKE_OPTIMIZE = -DDoOptimize=1 -OPTIMIZER = -O4 +OPTIMIZER = -O2 #else OPTIMIZER = #endif --- fd2ps/Imakefile.dist Thu Feb 20 15:26:40 2003 +++ fd2ps/Imakefile Thu Feb 20 16:41:52 2003 @@@@ -64,7 +64,7 @@@@ -I. DEPEND_DEFINES = \ - -I/usr/local/include + -I@@l_prefix@@/include EXTRA_LIBRARIES = \ $(STATIC) \ @@@@ -83,7 +83,7 @@@@ CDEBUGFLAGS = -g $(OPTIMIZER) #if Optimize IMAKE_OPTIMIZE = -DDoOptimize=1 -OPTIMIZER = -O4 +OPTIMIZER = -O2 #else OPTIMIZER = #endif --- fdesign/Imakefile.dist Thu Feb 20 15:26:40 2003 +++ fdesign/Imakefile Thu Feb 20 15:27:27 2003 d263 1 a263 21 -I. DEPEND_DEFINES = \ - -I/usr/local/include + -I@@l_prefix@@/include EXTRA_LIBRARIES = \ --- gl/Imakefile.dist Thu Feb 20 15:26:40 2003 +++ gl/Imakefile Thu Feb 20 15:28:52 2003 @@@@ -44,7 +44,7 @@@@ REQUIREDLIBS = \ $(LDPRELIB) \ $(XLIB) \ - -L/usr/local/lib \ + -L@@l_prefix@@/lib \ -L../lib -lforms \ -lGL \ $(LGCC) @@@@ -56,7 +56,7 @@@@ -I. a264 35 DEPEND_DEFINES = \ - -I/usr/local/include + -I@@l_prefix@@/include EXTRA_DEFINES = \ -DMAKING_FORMS \ --- image/Imakefile.dist Thu Feb 20 15:41:45 2003 +++ image/Imakefile Thu Feb 20 15:28:08 2003 @@@@ -88,7 +88,7 @@@@ -I. DEPEND_DEFINES = \ - -I/usr/local/include + -I@@l_prefix@@/include EXTRA_DEFINES = \ $(HAVE_STRERROR ) @@@@ -121,7 +121,8 @@@@ REQUIREDLIBS = \ $(LDPRELIB) \ $(XLIB) \ - -L/usr/local/lib \ + $(LDFLAGS) \ + -L@@l_prefix@@/lib \ -L../lib -lforms \ $(JPEGLIBDIR) -ljpeg \ $(TIFFLIBDIR) -ltiff \ --- lib/Imakefile.dist Thu Feb 20 15:02:58 2003 +++ lib/Imakefile Thu Feb 20 15:03:08 2003 @@@@ -128,7 +128,7 @@@@ -Ifd DEPEND_DEFINES = \ - -I/usr/local/include + -I@@l_prefix@@/include d266 14 a279 2 #if !BuildGL NO_GL = -DNO_GL @