From 7d7ec758c0a5c36642392e677d416cb20a8626fd Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 13 Feb 2001 16:40:19 +0000 Subject: [PATCH] math compile cleanups + add bookmarks bindings for emacs git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1498 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 6 ++++++ lib/bind/emacs.bind | 7 ++++++- lib/bind/xemacs.bind | 6 ++++++ src/mathed/ChangeLog | 14 ++++++++++++++ src/mathed/Makefile.am | 2 -- src/mathed/math_bigopinset.h | 4 ++-- src/mathed/math_decorationinset.h | 2 +- src/mathed/math_funcinset.h | 2 +- src/mathed/math_parinset.C | 2 ++ src/mathed/math_spaceinset.h | 4 ++-- src/mathed/math_xiter.C | 1 + src/mathed/support.C | 5 +++++ 12 files changed, 46 insertions(+), 9 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 02150ec809..9e65cc981f 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2001-02-13 Jean-Marc Lasgouttes + + * bind/emacs.bind: + * bind/xemacs.bind: add bookmark commands. + + 2001-02-07 Allan Rae * bind/emacs.bind: diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind index 164545c0b3..5b72ee63fa 100644 --- a/lib/bind/emacs.bind +++ b/lib/bind/emacs.bind @@ -143,7 +143,12 @@ \bind "C-~S-greater" "reference-goto" \bind "C-~S-less" "bookmark-goto 0" - +\bind "C-~S-1" "bookmark-goto 1" +\bind "C-~S-2" "bookmark-goto 2" +\bind "C-~S-3" "bookmark-goto 3" +\bind "C-M-~S-1" "bookmark-save 1" +\bind "C-M-~S-2" "bookmark-save 2" +\bind "C-M-~S-3" "bookmark-save 3" # The below are xemacs bindings #\bind "Home" "line-begin" diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind index 08dadad220..3e211275b8 100644 --- a/lib/bind/xemacs.bind +++ b/lib/bind/xemacs.bind @@ -158,6 +158,12 @@ \bind "C-~S-greater" "reference-goto" \bind "C-~S-less" "bookmark-goto 0" +\bind "C-~S-1" "bookmark-goto 1" +\bind "C-~S-2" "bookmark-goto 2" +\bind "C-~S-3" "bookmark-goto 3" +\bind "C-M-~S-1" "bookmark-save 1" +\bind "C-M-~S-2" "bookmark-save 2" +\bind "C-M-~S-3" "bookmark-save 3" # # Motion + select group diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 71d3948aad..bb5b4b539c 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,17 @@ +2001-02-13 Jean-Marc Lasgouttes + + * Makefile.am (libmathed_la_SOURCES): remove duplicate + math_sqrtinset. + + * support.C: + * math_xiter.C: + * math_parinset.C: add a bunch of "using" directives. + + * math_funcinset.h: + * math_decorationinset.h: + * math_bigopinset.h: + * math_spaceinset.h: remove more couples of inline. + 2001-02-13 Lars Gullik Bjønnes * math_xiter.h: remove a couple of "inline" diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index 32d34a8ef9..04fabc232e 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -56,8 +56,6 @@ libmathed_la_SOURCES = \ math_rowst.h \ math_spaceinset.C \ math_spaceinset.h \ - math_sqrtinset.C \ - math_sqrtinset.h \ math_symbols.C \ math_utils.C \ math_write.C \ diff --git a/src/mathed/math_bigopinset.h b/src/mathed/math_bigopinset.h index 92816f8c64..85c1e0b324 100644 --- a/src/mathed/math_bigopinset.h +++ b/src/mathed/math_bigopinset.h @@ -18,9 +18,9 @@ public: /// void Metrics(); /// - inline bool GetLimits() const; + bool GetLimits() const; /// - inline void SetLimits(bool); + void SetLimits(bool); protected: /// int lims; diff --git a/src/mathed/math_decorationinset.h b/src/mathed/math_decorationinset.h index ea8c70957a..f6eb141034 100644 --- a/src/mathed/math_decorationinset.h +++ b/src/mathed/math_decorationinset.h @@ -17,7 +17,7 @@ public: /// void Metrics(); /// - inline bool GetLimits() const; + bool GetLimits() const; protected: /// int deco; diff --git a/src/mathed/math_funcinset.h b/src/mathed/math_funcinset.h index bbc78d9385..b08fefa026 100644 --- a/src/mathed/math_funcinset.h +++ b/src/mathed/math_funcinset.h @@ -23,7 +23,7 @@ public: /// void Metrics(); /// - inline bool GetLimits() const; + bool GetLimits() const; protected: /// int ln; diff --git a/src/mathed/math_parinset.C b/src/mathed/math_parinset.C index c832dad472..a676e9ebad 100644 --- a/src/mathed/math_parinset.C +++ b/src/mathed/math_parinset.C @@ -11,6 +11,8 @@ #include "math_rowst.h" #include "math_parinset.h" +using std::endl; + extern int number_of_newlines; diff --git a/src/mathed/math_spaceinset.h b/src/mathed/math_spaceinset.h index 33251ed5cd..fb91b26d12 100644 --- a/src/mathed/math_spaceinset.h +++ b/src/mathed/math_spaceinset.h @@ -15,9 +15,9 @@ public: /// void Write(std::ostream &, bool fragile); /// - inline void Metrics(); + void Metrics(); /// - inline void SetSpace(int sp); + void SetSpace(int sp); /// int GetSpace() { return space; } protected: diff --git a/src/mathed/math_xiter.C b/src/mathed/math_xiter.C index 558395858d..ba56a48408 100644 --- a/src/mathed/math_xiter.C +++ b/src/mathed/math_xiter.C @@ -6,6 +6,7 @@ #include "array.h" #include "mathed/support.h" +using std::endl; MathedXIter::MathedXIter() : MathedIter(), sx(0), sw(0) diff --git a/src/mathed/support.C b/src/mathed/support.C index 80506daccb..b815aaf537 100644 --- a/src/mathed/support.C +++ b/src/mathed/support.C @@ -10,6 +10,11 @@ #include "matriz.h" #include "symbol_def.h" +using std::sort; +using std::lower_bound; +using std::endl; +using std::max; + extern LyXFont WhichFont(short type, int size); char const * math_font_name[] = {