Clean up around character styles

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9827 a592a061-630c-0410-9148-cb99ea01b6c8

lib/ChangeLog

@@ -1,3 +1,9 @@
+2005-04-18  Martin Vermeer  <martin.vermeer@hut.fi>
+
+	* ui/stdtoolbars.ui:
+	* ui/stdmenus.ui:
+	* layouts/stdclass.inc: clean up around character styles
+
 2005-04-15  Angus Leeming  <leeming@lyx.org>
 
 	* 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  <lasgouttes@lyx.org>
 
 	* layouts/stdlayouts.inc: change labelstring to "Senseless!"

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

lib/ui/stdmenus.ui

@@ -237,8 +237,8 @@ Menuset
 		Submenu "Float|a" "insert_float"
 # YUCK
 		Submenu "Note|N" "insert_note"
-		Submenu "Branch|B" "branches"
+		OptSubmenu "Branch|B" "branches"
-		Submenu "Character Style|y" "charstyle"
+		OptSubmenu "Character Style|y" "charstyle"
 		Submenu "File|e" "insert_file"
 		Item "Box" "box-insert Frameless"
 		Separator

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 emphasis" "font-emph"
-	Item "Toggle noun style" "font-noun"
+	Item "Toggle noun" "font-noun"
-	Item "Toggle user style" "font-free-apply"
+	Item "Apply last" "font-free-apply"
 	Separator
 	Item "Insert math" "math-mode"
 	Item "Insert graphics" "dialog-show-new-inset graphics"