Martin's Angstrom patch.

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

diff --git a/images/misc.xbm b/images/misc.xbm
index 04a6ea152a0f1e9010d6402165b3f6b805c696ef..b94e2e45222919df6dbc396f54437ccac9d0aac1 100644 (file)
--- a/images/misc.xbm
+++ b/images/misc.xbm
@@ -422,3 +422,56 @@ static unsigned char const misc3_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

+
+
+#define misc4_width 150
+#define misc4_height 30
+static unsigned char const misc4_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00,
+   0x00, 0x60, 0x08, 0x00, 0x00, 0x03, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x98, 0x05, 0x00, 0x80,
+   0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x03, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x0c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0xe0, 0xff, 0x03, 0x00, 0x80, 0x03, 0x00, 0x00, 0x06, 0x05,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x08, 0x02,
+   0x00, 0x80, 0x06, 0x00, 0x00, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x40, 0x06, 0x00, 0x00,
+   0x83, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x08, 0x00, 0x00, 0x40, 0x0c, 0x00, 0x80, 0x41, 0x08, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x40, 0x0c,
+   0x00, 0x80, 0x41, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x08, 0x00, 0x00, 0x20, 0x0c, 0x00, 0x80, 0x21, 0x08, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00,
+   0x20, 0x18, 0x00, 0x80, 0x11, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, 0x11,
+   0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+   0x00, 0x00, 0x20, 0x18, 0x00, 0x00, 0x0b, 0x08, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10, 0x30, 0x00,
+   0x00, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x08, 0x00, 0x00, 0x10, 0x30, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x38,
+   0x78, 0x00, 0x00, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf1, 0x01,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xf0, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index ec2d94a44780297db04d390410feeab8b08bfeff..af514b0807edd30dd28a8e9bec6efd28119adab3 100644 (file)
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -28,8 +28,14 @@
 
 \bind "M-m f"                  "math-insert \frac"
 \bind "M-m s"                  "math-insert \sqrt"
 
 \bind "M-m f"                  "math-insert \frac"
 \bind "M-m s"                  "math-insert \sqrt"

-\bind "M-m e"                  "math-insert ^"
-\bind "M-m x"                  "math-insert _"
+\bind "M-m e"                  "math-insert \mathcircumflex"
+\bind "M-m S-X"                        "math-insert \mathcircumflex"
+\bind "M-m x"                  "math-insert \_ "
+
+\bind "M-m S-A"                "command-sequence math-mode; font-roman; math-insert Å;"
+\bind "M-m S-O"                "command-sequence math-mode; font-roman; math-insert Ø;"
+\bind "M-m S-T"                "command-sequence math-mode; math-insert \mathrm; math-insert T;"
+

 \bind "M-m u"                  "math-insert \sum"
 \bind "M-m i"                  "math-insert \int"
 \bind "M-m m"                  "math-mode"
 \bind "M-m u"                  "math-insert \sum"
 \bind "M-m i"                  "math-insert \int"
 \bind "M-m m"                  "math-mode"

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index cc148b1c6b7c68d60e7fadfcadfc6e1b0d3e78a6..6480fbf27b133d4d18e06979ac41120a55aaef6b 100644 (file)
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -234,26 +234,10 @@ Menuset
   Separator
        Item "Array environment|y" "math-insert matrix 2 2"
        Item "Cases environment|C" "math-insert cases 2"
   Separator
        Item "Array environment|y" "math-insert matrix 2 2"
        Item "Cases environment|C" "math-insert cases 2"

-       Separator
-       Submenu "Symbols|S" "insert_math_symbol"

   Separator
        Item "Math Panel...|l" "math-panel"
     End
 
   Separator
        Item "Math Panel...|l" "math-panel"
     End
 

-    Menu "insert_math_symbol"
-       Item "Blackboard bold N (Natural)" "command-sequence math-mode; font-noun; math-insert N;"
-       Item "Blackboard bold Z (Integer)" "command-sequence math-mode; font-noun; math-insert Z;"
-       Item "Blackboard bold Q (Rational)" "command-sequence math-mode; font-noun; math-insert Q;"
-       Item "Blackboard bold R (Real)" "command-sequence math-mode; font-noun; math-insert R;"
-       Item "Blackboard bold C (Complex)" "command-sequence math-mode; font-noun; math-insert C;"
-       Item "Blackboard bold H (Quaternions)" "command-sequence math-mode; font-noun; math-insert H;"
-       Separator
-       Item "Calligraphic F (Fourier)" "command-sequence math-mode; font-emph; math-insert F;"
-       Item "Calligraphic L (Laplace)" "command-sequence math-mode; font-emph; math-insert L;"
-       Item "Calligraphic H (Hankel)" "command-sequence math-mode; font-emph; math-insert H;"
-       Item "Calligraphic O (Landau)" "command-sequence math-mode; font-emph; math-insert O;"
-    End
-

     Menu "insert_floats"
        FloatInsert
     End
     Menu "insert_floats"
        FloatInsert
     End

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index cf8cec1380241a1bf446aed5e481a9dd0e1ba78b..a4a830e7c2b6a805c728ed55f89c7c8d34267325 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -297,7 +297,9 @@ string const LaTeXFeatures::getMacros() const
                macros << boldsymbol_def << '\n';
        if (isRequired("binom") && !isRequired("amsmath"))
                macros << binom_def << '\n';
                macros << boldsymbol_def << '\n';
        if (isRequired("binom") && !isRequired("amsmath"))
                macros << binom_def << '\n';

-
+       if (isRequired("mathcircumflex"))
+               macros << mathcircumflex_def << '\n';
+               

        // other
        if (isRequired("NeedLyXMinipageIndent"))
                macros << minipageindent_def;
        // other
        if (isRequired("NeedLyXMinipageIndent"))
                macros << minipageindent_def;

diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C
index f5998d1a9d507e2f8de26db3f9c8444b1ad1ce62..07b251ad02970f7eb860da816fa8a7e1b4274a1c 100644 (file)
--- a/src/frontends/xforms/FormMathsPanel.C
+++ b/src/frontends/xforms/FormMathsPanel.C
@@ -212,6 +212,7 @@ void FormMathsPanel::build()
        greek_->addBitmap(28, 7, 4, greek_width, greek_height, greek_bits);
 
        misc_->addBitmap(29, 5, 6, misc_width, misc_height, misc_bits);
        greek_->addBitmap(28, 7, 4, greek_width, greek_height, greek_bits);
 
        misc_->addBitmap(29, 5, 6, misc_width, misc_height, misc_bits);

+       misc_->addBitmap(5, 5, 1, misc4_width, misc4_height, misc4_bits);

        misc_->addBitmap(6, 3, 2, misc2_width, misc2_height, misc2_bits, false);
        misc_->addBitmap(4, 2, 2, misc3_width, misc3_height, misc3_bits);
  
        misc_->addBitmap(6, 3, 2, misc2_width, misc2_height, misc2_bits, false);
        misc_->addBitmap(4, 2, 2, misc3_width, misc3_height, misc3_bits);
  

diff --git a/src/frontends/xforms/MathsSymbols.C b/src/frontends/xforms/MathsSymbols.C
index 873f4c5400a2c92161fdea381a56be6ef073983a..9a212bf4511489e809c4bf7f16d1f05e48fe82ba 100644 (file)
--- a/src/frontends/xforms/MathsSymbols.C
+++ b/src/frontends/xforms/MathsSymbols.C
@@ -137,10 +137,12 @@ char const * latex_misc[] = {
        "angle", "top", "bot", "Vert", "neg",
        "flat", "natural", "sharp", "surd", "triangle",
        "diamondsuit", "heartsuit", "clubsuit", "spadesuit", 
        "angle", "top", "bot", "Vert", "neg",
        "flat", "natural", "sharp", "surd", "triangle",
        "diamondsuit", "heartsuit", "clubsuit", "spadesuit", 

+       "textrm Å", "textrm Ø", "mathcircumflex", "_", 
+       "mathrm T",

        "mathbb N", "mathbb Z", "mathbb Q", 
        "mathbb R", "mathbb C", "mathbb H",
        "mathcal F", "mathcal L", 
        "mathbb N", "mathbb Z", "mathbb Q", 
        "mathbb R", "mathbb C", "mathbb H",
        "mathcal F", "mathcal L", 

-       "mathcal H", "mathcal O",""
+       "mathcal H", "mathcal O", ""

 };
 
 int const nr_latex_misc = sizeof(latex_misc) / sizeof(char const *);
 };
 
 int const nr_latex_misc = sizeof(latex_misc) / sizeof(char const *);

diff --git a/src/lyx_sty.C b/src/lyx_sty.C
index 0f75f801275ebdb442d1dd93ba7e39b72b8af4f1..df388b3b77d5f528a658009a127d64b8f67bcd11 100644 (file)
--- a/src/lyx_sty.C
+++ b/src/lyx_sty.C
@@ -122,3 +122,8 @@ string const binom_def =
        "%% Binom macro for standard LaTeX users\n"
        "\\newcommand{\\binom}[2]{{#1 \\choose #2}}\n";
 
        "%% Binom macro for standard LaTeX users\n"
        "\\newcommand{\\binom}[2]{{#1 \\choose #2}}\n";
 

+string const mathcircumflex_def = 
+       "%% For printing a cirumflex inside a formula\n"
+       "\\newcommand{\\mathcircumflex}[0]{\\mbox{\\^{}}}\n";
+
+

diff --git a/src/lyx_sty.h b/src/lyx_sty.h
index e654a6803b9ccd488fee280d46acaaa73522e787..e56217205f9be033cc1b0e14fe7095856073347c 100644 (file)
--- a/src/lyx_sty.h
+++ b/src/lyx_sty.h
@@ -62,5 +62,7 @@ extern string const minipageindent_def;
 extern string const boldsymbol_def;
 ///
 extern string const binom_def;
 extern string const boldsymbol_def;
 ///
 extern string const binom_def;

+///
+extern string const mathcircumflex_def;

 
 #endif
 
 #endif