Martin's patch to shorten and broaded the AMS relational symbols in the

math panel.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3443 a592a061-630c-0410-9148-cb99ea01b6c8

images/ChangeLog

@@ -3,6 +3,9 @@
 	* deco.xbm: added math accents as a separate bitmap to the Decorations
         sub-panel of mathed. See Lamport Table 3.11.
 
+	* ams_rel.xbm:
+	* ams_nrel.xbm: shorten and broaden the pixmaps.
+
 2002-01-17  Martin Vermeer <martin.vermeer@hut.fi>
 
 	* ams_arrows.xbm:

src/frontends/xforms/ChangeLog

@@ -4,6 +4,10 @@
 	* forms/form_maths_deco.fd: added math accents as a separate bitmap to
 	the Decorations sub-panel of mathed. See Lamport Table 3.11.
 
+	* FormMathsPanel.C:
+	* MathsSymbols.C: reorganization of the two AMS panels "relations" and
+	"negated relations". Lower and broader.
+
 2002-01-25  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* FormTabular.C (update): Remove redundant code.

src/frontends/xforms/FormMathsDeco.C

@@ -68,8 +68,6 @@ void FormMathsDeco::build()
 
 void FormMathsDeco::apply()
 {
-	//int const i = fl_get_bmtable(dialog_->bmtable_deco1);
- 
 	if (deco_ >= nr_decoration_names)
 		return;
  

src/frontends/xforms/FormMathsDeco.h

@@ -36,7 +36,7 @@ private:
 	/// Apply from dialog (modify or create inset)
 	virtual void apply();
 	/// Input selection:
-	virtual bool FormMathsDeco::input(FL_OBJECT *, long);
+	virtual bool input(FL_OBJECT *, long);
 
 	/// Pointer to the actual instantiation of the xforms form
 	virtual FL_FORM * form() const;
@@ -48,7 +48,7 @@ private:
 	boost::scoped_ptr<FD_form_maths_deco> dialog_;
 
 	/// Current choice
-	short deco_;
+	int deco_;
 
 };
 

src/frontends/xforms/FormMathsPanel.C

@@ -224,9 +224,9 @@ void FormMathsPanel::build()
 	ams_arrows_->addBitmap(32, 3, 11, ams2_width, ams2_height, ams2_bits);
 	ams_arrows_->addBitmap(6, 3, 2, ams3_width, ams3_height, ams3_bits);
 
-	ams_rel_->addBitmap(66, 3, 22, ams_rel_width, ams_rel_height, ams_rel_bits);
+	ams_rel_->addBitmap(66, 6, 11, ams_rel_width, ams_rel_height, ams_rel_bits);
 
-	ams_nrel_->addBitmap(51, 3, 17, ams_nrel_width, ams_nrel_height, ams_nrel_bits);
+	ams_nrel_->addBitmap(51, 6, 9, ams_nrel_width, ams_nrel_height, ams_nrel_bits);
 	
 	ams_ops_->addBitmap(23, 3, 8, ams_ops_width, ams_ops_height, ams_ops_bits);
 

src/frontends/xforms/MathsSymbols.C

@@ -190,50 +190,32 @@ char const * latex_ams_arrows[] = {
 int const nr_latex_ams_arrows = sizeof(latex_ams_arrows) / sizeof(char const *);
 
 char const * latex_ams_rel[] = {
-	"leqq", "leqslant", "eqslantless",
-	"lesssim", "lessapprox", "approxeq",
-	"lessdot", "lll", "lessgtr",
-	"lesseqgtr", "lesseqqgtr", "doteqdot",
-	"risingdotseq", "fallingdotseq", "backsim",
-	"backsimeq", "subseteqq", "Subset",
-	"sqsubset", "preccurlyeq", "curlyeqprec",
-	"precsim", "precapprox", "vartriangleleft",
-	"trianglelefteq", "vDash", "Vvdash",
-	"smallsmile", "smallfrown", "bumpeq",
-	"Bumpeq", "geqq", "geqslant",
-	"eqslantgtr", "gtrsim", "gtrapprox",
-	"gtrdot", "ggg", "gtrless", 
-	"gtreqless", "gtreqqless", "eqcirc",
-	"circeq", "triangleq", "thicksim",
-	"thickapprox", "supseteqq", "Supset",
-	"sqsupset", "succcurlyeq", "curlyeqsucc",
-	"succsim", "succapprox", "vartriangleright",
-	"trianglerighteq", "Vdash", "shortmid",
-	"shortparallel", "between", "pitchfork", 
-	"varpropto", "blacktriangleleft", "therefore",
-	"backepsilon", "blacktriangleright", "because"
+	"leqq", "leqslant", "eqslantless", "eqslantgtr", "gtrsim", "gtrapprox",
+	"lesssim", "lessapprox", "approxeq", "gtrdot", "ggg", "gtrless",
+	"lessdot", "lll", "lessgtr", "gtreqless", "gtreqqless", "eqcirc",
+	"lesseqgtr", "lesseqqgtr", "doteqdot", "circeq", "triangleq", "thicksim",
+	"risingdotseq", "fallingdotseq", "backsim", "thickapprox", "supseteqq", "Supset",
+	"backsimeq", "subseteqq", "Subset","sqsupset", "succcurlyeq", "curlyeqsucc",
+	"sqsubset", "preccurlyeq", "curlyeqprec", "succsim", "succapprox", "vartriangleright",
+	"precsim", "precapprox", "vartriangleleft", "trianglerighteq", "Vdash", "shortmid",
+	"trianglelefteq", "vDash", "Vvdash", "shortparallel", "between", "pitchfork",
+	"smallsmile", "smallfrown", "bumpeq", "varpropto", "blacktriangleleft", "therefore",
+	"Bumpeq", "geqq", "geqslant", "backepsilon", "blacktriangleright", "because"
 };
 
 int const nr_latex_ams_rel = sizeof(latex_ams_rel) / sizeof(char const *);
 
 char const * latex_ams_nrel[] = {
-	"nless", "nleq", "nleqslant",
-	"nleqq", "lneq", "lneqq",
-	"lvertneqq", "lnsim", "lnapprox", 
-	"nprec", "npreceq", "precnsim",
-	"precnapprox", "nsim", "nshortmid",
-	"nmid", "nvdash", "nvDash",
-	"ntriangleleft", "ntrianglelefteq", "nsubseteq",
-	"subsetneq", "varsubsetneq", "subsetneqq",
-	"varsubsetneqq", "ngtr", "ngeq",
-	"ngeqslant", "ngeqq", "gneq",
-	"gneqq", "gverteqq", "gnsim",
-	"gnapprox", "nsucc", "nsucceq",
-	"succnsim", "succnapprox", "ncong",
-	"nshortparallel", "nparallel", "nvDash",
-	"nVDash", "ntriangleright", "ntrianglerighteq",
-	"nsupseteq", "nsupseteqq", "supsetneq",
-	"varsupsetneq", "supsetneqq", "varsupsetneqq"
+	"nless", "nleq", "nleqslant", "ngeqslant", "ngeqq", "gneq",
+	"nleqq", "lneq", "lneqq","gneqq", "gverteqq", "gnsim",
+	"lvertneqq", "lnsim", "lnapprox", "gnapprox", "nsucc", "nsucceq",
+	"nprec", "npreceq", "precnsim","succnsim", "succnapprox", "ncong",
+	"precnapprox", "nsim", "nshortmid", "nshortparallel", "nparallel", "nvDash",
+	
+	"nmid", "nvdash", "nvDash","nVDash", "ntriangleright", "ntrianglerighteq",
+	"ntriangleleft", "ntrianglelefteq", "nsubseteq", "nsupseteq", "nsupseteqq", "supsetneq",
+	"subsetneq", "varsubsetneq", "subsetneqq", "varsupsetneq", "supsetneqq", "varsupsetneqq",
+	"varsubsetneqq", "ngtr", "ngeq","", "", ""
 };
 
 int const nr_latex_ams_nrel = sizeof(latex_ams_nrel) / sizeof(char const *);