From a2d4b0223870e9fbbd0b3ddc84aad1b44a3a7d59 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 7 Feb 2020 19:05:45 +0100
Subject: [PATCH] WIP: refactoring ongoing.

---
 TODO                                     | 1 +
 src/laybasic/laybasic/layAbstractMenu.cc | 6 +++---
 src/laybasic/laybasic/layPlugin.cc       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO
index e76d1ab33..90c752c3b 100644
--- a/TODO
+++ b/TODO
@@ -35,4 +35,5 @@ Tests:
   - adding of rulers/removing
   - ruby plugin (debugging, re-running)
   - changing of macro title, move macro to different place
+  - funktionieren die check marks vor den menus? (Mode, selection modes, ruler template)
 
diff --git a/src/laybasic/laybasic/layAbstractMenu.cc b/src/laybasic/laybasic/layAbstractMenu.cc
index 33b5c9e54..64f3c563b 100644
--- a/src/laybasic/laybasic/layAbstractMenu.cc
+++ b/src/laybasic/laybasic/layAbstractMenu.cc
@@ -1611,7 +1611,7 @@ AbstractMenu::find_item (tl::Extractor &extr)
     } else {
 
       std::string n;
-      extr.read (n, ".+>(");
+      extr.read (n, ".;+>(");
 
       if (n.empty ()) {
 
@@ -1629,7 +1629,7 @@ AbstractMenu::find_item (tl::Extractor &extr)
 
         std::string nn;
         if (extr.test (">")) {
-          extr.read (nn, ".+>(");
+          extr.read (nn, ".;+>(");
         }
 
         std::string name (parent->name ());
@@ -1645,7 +1645,7 @@ AbstractMenu::find_item (tl::Extractor &extr)
 
         std::string ndesc;
         if (! nn.empty () && extr.test ("(")) {
-          extr.read_word_or_quoted (ndesc, " _.$");
+          extr.read_word_or_quoted (ndesc, " _.;$");
           extr.test (")");
         }
 
diff --git a/src/laybasic/laybasic/layPlugin.cc b/src/laybasic/laybasic/layPlugin.cc
index 322827d8d..b2d44ea8f 100644
--- a/src/laybasic/laybasic/layPlugin.cc
+++ b/src/laybasic/laybasic/layPlugin.cc
@@ -232,7 +232,7 @@ PluginDeclaration::init_menu (lay::Dispatcher *dispatcher)
 
   title = std::string ();
   if (implements_mouse_mode (title)) {
-    modes.push_back (std::make_pair (title, std::make_pair ("edit_menu.mode_menu.end;@toolbar.end", id ())));
+    modes.push_back (std::make_pair (title, std::make_pair ("edit_menu.mode_menu.end;@toolbar.end_modes", id ())));
   }
 
   //  the primary mouse modes (special for LayoutView)