From 1b2e0411efa632ca66a450c5b156cb52beaf741a Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Mon, 18 Apr 2005 18:09:57 +0000 Subject: [PATCH] Clean up around character styles git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9827 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 7 +++++++ lib/layouts/stdclass.inc | 15 --------------- lib/ui/stdmenus.ui | 4 ++-- lib/ui/stdtoolbars.ui | 6 +++--- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 3db753d324..241b08acad 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2005-04-18 Martin Vermeer + + * ui/stdtoolbars.ui: + * ui/stdmenus.ui: + * layouts/stdclass.inc: clean up around character styles + 2005-04-15 Angus Leeming * scripts/convertDefault.sh: post error messages to STDERR. @@ -42,6 +48,7 @@ * reLyX/syntax.default: update natbib/jurabib commands, add \DescribeMacro, \let, \subfigure and bibunit commands +>>>>>>> 1.685 2005-02-20 Jean-Marc Lasgouttes * layouts/stdlayouts.inc: change labelstring to "Senseless!" diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc index 784274041f..937a7e1ecf 100644 --- a/lib/layouts/stdclass.inc +++ b/lib/layouts/stdclass.inc @@ -35,21 +35,6 @@ Style Standard LabelType No_Label End -CharStyle Noun - LatexType Command - LatexName noun - Font - Shape SmallCaps - EndFont - LabelFont - Shape SmallCaps - Color blue - EndFont - Preamble - \newcommand{\noun}[1]{\textsc{#1}} - EndPreamble -End - Input stdlists.inc Input stdsections.inc diff --git a/lib/ui/stdmenus.ui b/lib/ui/stdmenus.ui index 7cc13bca42..522fce649b 100644 --- a/lib/ui/stdmenus.ui +++ b/lib/ui/stdmenus.ui @@ -237,8 +237,8 @@ Menuset Submenu "Float|a" "insert_float" # YUCK Submenu "Note|N" "insert_note" - Submenu "Branch|B" "branches" - Submenu "Character Style|y" "charstyle" + OptSubmenu "Branch|B" "branches" + OptSubmenu "Character Style|y" "charstyle" Submenu "File|e" "insert_file" Item "Box" "box-insert Frameless" Separator diff --git a/lib/ui/stdtoolbars.ui b/lib/ui/stdtoolbars.ui index 31fab8bb32..8884f1ffbe 100644 --- a/lib/ui/stdtoolbars.ui +++ b/lib/ui/stdtoolbars.ui @@ -50,9 +50,9 @@ Toolbar "standard" "Standard" Item "Paste" "paste" Item "Find and replace" "dialog-show findreplace" Separator - Item "Toggle emphasis style" "font-emph" - Item "Toggle noun style" "font-noun" - Item "Toggle user style" "font-free-apply" + Item "Toggle emphasis" "font-emph" + Item "Toggle noun" "font-noun" + Item "Apply last" "font-free-apply" Separator Item "Insert math" "math-mode" Item "Insert graphics" "dialog-show-new-inset graphics" -- 2.39.2