anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Martin's Angstrom patch.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3655 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-03-04 11:10:26 +00:00
parent 356caadd6d
commit 0d248253bc
8 changed files with 75 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
images/misc.xbm
View File

@ -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};
#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};

10
lib/bind/math.bind
View File

@ -28,8 +28,14 @@
\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"

16
lib/ui/default.ui
View File

@ -234,26 +234,10 @@ Menuset
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
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

4
src/LaTeXFeatures.C
View File

@ -297,7 +297,9 @@ string const LaTeXFeatures::getMacros() const
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;

1
src/frontends/xforms/FormMathsPanel.C
View File

@ -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);
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);

4
src/frontends/xforms/MathsSymbols.C
View File

@ -137,10 +137,12 @@ char const * latex_misc[] = {
"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",
"mathcal H", "mathcal O",""
"mathcal H", "mathcal O", ""
};
int const nr_latex_misc = sizeof(latex_misc) / sizeof(char const *);

5
src/lyx_sty.C
View File

@ -122,3 +122,8 @@ string const binom_def =
"%% 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";

2
src/lyx_sty.h
View File

@ -62,5 +62,7 @@ extern string const minipageindent_def;
extern string const boldsymbol_def;
///
extern string const binom_def;
///
extern string const mathcircumflex_def;
#endif