On Thu, Sep 19, 2002 at 06:16:17PM +0300, Martin Vermeer wrote: > > On Thu, Sep 19, 2002 at 04:33:06PM +0200, Andre Poenitz wrote: > > > On Thu, Sep 19, 2002 at 05:44:27PM +0300, Martin Vermeer wrote: > > > My doing... I found them in math spaces so assumed that that's what they > > > were. Were would you put them, if anywhere? > > > > Nowhere. It's likely to go if I found some clean solution... > > > > Andre' > > Okay, nuke them from form_maths_space.fd then. I see my math space patch > hasn't gone in yet :-) > > Martin
Corrected math space patch attached.
19/09/2002 Martin Vermeer <[EMAIL PROTECTED]>
* form_spaceinset.[Ch]:
* FormMathsSpace.C:
* form_maths_space.fd: expanded the math space sub-panel to include
several more items. Validates those requiring amsmath.
Martin
--
Martin Vermeer [EMAIL PROTECTED]
Helsinki University of Technology
Department of Surveying
P.O. Box 1200, FIN-02015 HUT, Finland
:wq
Index: mathed/math_spaceinset.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/mathed/math_spaceinset.C,v
retrieving revision 1.39
diff -u -p -r1.39 math_spaceinset.C
--- mathed/math_spaceinset.C 2002/08/22 13:02:14 1.39
+++ mathed/math_spaceinset.C 2002/09/19 17:44:44
@@ -7,6 +7,7 @@
#include "LColor.h"
#include "frontends/Painter.h"
#include "math_mathmlstream.h"
+#include "LaTeXFeatures.h"
#include "debug.h"
@@ -83,6 +84,15 @@ void MathSpaceInset::draw(MathPainterInf
void MathSpaceInset::incSpace()
{
space_ = (space_ + 1) % (nSpace - 2);
+}
+
+void MathSpaceInset::validate(LaTeXFeatures & features) const
+{
+ if (space_ >= 0 && space_< nSpace) {
+ if ((latex_mathspace[space_] == "negmedspace")
+ || (latex_mathspace[space_] == "negthickspace"))
+ features.require("amsmath");
+ }
}
Index: mathed/math_spaceinset.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/mathed/math_spaceinset.h,v
retrieving revision 1.24
diff -u -p -r1.24 math_spaceinset.h
--- mathed/math_spaceinset.h 2002/08/15 07:13:21 1.24
+++ mathed/math_spaceinset.h 2002/09/19 17:44:44
@@ -31,6 +31,8 @@ public:
///
void normalize(NormalStream &) const;
///
+ void validate(LaTeXFeatures & features) const;
+ ///
void maplize(MapleStream &) const;
///
void mathematicize(MathematicaStream &) const;
Index: frontends/xforms/FormMathsSpace.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormMathsSpace.C,v
retrieving revision 1.15
diff -u -p -r1.15 FormMathsSpace.C
--- frontends/xforms/FormMathsSpace.C 2002/09/05 15:14:22 1.15
+++ frontends/xforms/FormMathsSpace.C 2002/09/19 17:44:45
@@ -46,10 +46,12 @@ void FormMathsSpace::build()
bc().setCancel(dialog_->button_close);
+ bc().addReadOnly(dialog_->button_negative);
+ bc().addReadOnly(dialog_->button_negmedspace);
+ bc().addReadOnly(dialog_->button_negthickspace);
bc().addReadOnly(dialog_->button_thin);
bc().addReadOnly(dialog_->button_medium);
bc().addReadOnly(dialog_->button_thick);
- bc().addReadOnly(dialog_->button_negative);
bc().addReadOnly(dialog_->button_quadratin);
bc().addReadOnly(dialog_->button_twoquadratin);
}
@@ -65,7 +67,7 @@ bool FormMathsSpace::input(FL_OBJECT *,
{
space_ = -1;
- if (data >= 0 && data < 6) {
+ if (data >= 0 && data < 8) {
space_ = short(data);
apply();
}
Index: frontends/xforms/forms/form_maths_space.fd
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/forms/form_maths_space.fd,v
retrieving revision 1.4
diff -u -p -r1.4 form_maths_space.fd
--- frontends/xforms/forms/form_maths_space.fd 2002/03/12 14:11:15 1.4
+++ frontends/xforms/forms/form_maths_space.fd 2002/09/19 17:44:45
@@ -9,14 +9,14 @@ SnapGrid: 2
=============== FORM ===============
Name: form_maths_space
-Width: 259
-Height: 149
-Number of Objects: 10
+Width: 277
+Height: 179
+Number of Objects: 12
--------------------
class: FL_BOX
type: UP_BOX
-box: 0 0 259 149
+box: 0 0 277 179
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -45,7 +45,7 @@ label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
-name:
+name:
callback:
argument:
@@ -59,13 +59,13 @@ alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Thin|#T
+label: Negative|#N
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
-name: button_thin
+name: button_negative
callback: C_FormBaseDeprecatedInputCB
-argument: 1
+argument: 0
--------------------
class: FL_BUTTON
@@ -77,13 +77,13 @@ alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Medium|#M
+label: Neg Medium|#E
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
-name: button_medium
+name: button_negmedspace
callback: C_FormBaseDeprecatedInputCB
-argument: 2
+argument: 1
--------------------
class: FL_BUTTON
@@ -94,55 +94,37 @@ colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Thick|#H
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_thick
-callback: C_FormBaseDeprecatedInputCB
-argument: 3
-
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 130 10 120 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Negative|#N
+label: Neg Thick|#T
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
-name: button_negative
+name: button_negthickspace
callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 2
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 130 40 120 30
+box: 130 40 130 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Quadratin|#Q
+label: Thick|#H
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
-name: button_quadratin
+name: button_thick
callback: C_FormBaseDeprecatedInputCB
-argument: 4
+argument: 5
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 130 70 120 30
+box: 130 100 130 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -155,7 +137,7 @@ resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_twoquadratin
callback: C_FormBaseDeprecatedInputCB
-argument: 5
+argument: 7
--------------------
class: FL_END_GROUP
@@ -178,7 +160,7 @@ argument:
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
-box: 92 110 80 30
+box: 92 140 80 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -192,6 +174,60 @@ gravity: FL_NoGravity FL_NoGravity
name: button_close
callback: C_FormBaseDeprecatedCancelCB
argument: 0
+
+--------------------
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 130 70 130 30
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Quadratin|#Q
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: button_quadratin
+callback: C_FormBaseDeprecatedInputCB
+argument: 6
+
+--------------------
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 10 100 120 30
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Thin|#I
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: button_thin
+callback: C_FormBaseDeprecatedInputCB
+argument: 3
+
+--------------------
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 130 10 130 30
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Medium|#M
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: button_medium
+callback: C_FormBaseDeprecatedInputCB
+argument: 4
==============================
create_the_forms
msg45009/pgp00000.pgp
Description: PGP signature
