The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 11e0d941a25a6e35427b561edb3c71934fac6d0a
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Fri Mar 22 14:41:57 2013 +0100

    Implement inset-select-all in mathed

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 0b24a1d..829bbc0 100644
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -729,6 +729,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & 
cmd)
        case LFUN_MOUSE_DOUBLE:
        case LFUN_MOUSE_TRIPLE:
        case LFUN_WORD_SELECT:
+       case LFUN_INSET_SELECT_ALL:
                cur.pos() = 0;
                cur.idx() = 0;
                cur.resetAnchor();

commit 7d698b43a808b0951537a8d115e0a0c83b233ce2
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Fri Mar 22 11:23:48 2013 +0100

    More documentation for the poor man's profiler

diff --git a/src/support/pmprof.h b/src/support/pmprof.h
index f1506ec..7cd2efc 100644
--- a/src/support/pmprof.h
+++ b/src/support/pmprof.h
@@ -17,7 +17,9 @@
 /** How to use this trivial profiler:
  *
  * * at the beginning of the interesting block, just add:
- *   PROFILE_THIS_BLOCK(some_identifier);
+ *   PROFILE_THIS_BLOCK(some_identifier)
+ *
+ *   A trailing semicolon can be added at your discretion.
  *
  * * when the program ends, statistics will be sent to standard error, like:
  *
@@ -25,8 +27,72 @@
  *
  * The code measured by the profiler corresponds to the lifetime of a
  * local variable declared by the PROFILE_THIS_BLOCK macro.
+ *
+ * Some examples of profiling scope: In the snippets below, c1, c2...
+ * designate code chunks, and the identifiers of profiling blocks are
+ * chosen to reflect what they count.
+ *
+ * {
+ *   c1
+ *   PROFILE_THIS_BLOCK(c2)
+ *   c2
+ * }
+ *
+ *
+ * {
+ *   PROFILE_THIS_BLOCK(c1_c2)
+ *   c1
+ *   PROFILE_THIS_BLOCK(c2)
+ *   c2
+ * }
+ *
+ *
+ * {
+ *   {
+ *     PROFILE_THIS_BLOCK(c1)
+ *     c1
+ *   }
+ *   PROFILE_THIS_BLOCK(c2)
+ *   c2
+ * }
+ *
+ *
+ * {
+ *   PROFILE_THIS_BLOCK(c1_c2_c3)
+ *   c1
+ *   {
+ *     PROFILE_THIS_BLOCK(c2)
+ *     c2
+ *   }
+ *   c3
+ * }
+ *
+ * Influence of identifier names: they are mainly used for display
+ * purpose, but the same name should not be used twice in the same
+ * scope.
+ *
+ * {
+ *   PROFILE_THIS_BLOCK(foo)
+ *   c1
+ *   PROFILE_THIS_BLOCK(foo) // error: identifier clash
+ *   c2
+ * }
+ *
+ * In the example below, c1+c2 and c2 are counted separately, but in
+ * the output, both are confusingly labelled `foo'.
+ *
+ * {
+ *   PROFILE_THIS_BLOCK(foo)
+ *   c1
+ *   {
+ *     PROFILE_THIS_BLOCK(foo) // error: identifier clash
+ *     c2
+ *   }
+ * }
+
  */
 
+
 /* Helper class for gathering data. Instantiate this as a static
  * variable, so that its destructor will be executed when the program
  * ends.
@@ -82,7 +148,7 @@ private:
 
 #define PROFILE_THIS_BLOCK(a) \
        static PMProfStat PMPS_##a(#a);\
-       PMProfInstance PMPI_##a(&PMPS_##a)
+       PMProfInstance PMPI_##a(&PMPS_##a);
 
 
 #endif

-----------------------------------------------------------------------

Summary of changes:
 src/mathed/InsetMathNest.cpp |    1 +
 src/support/pmprof.h         |   70 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to