Remove local layout from Additional.lyx and Development.lyx. It

was not actually  used in the latter. In the former, convert the
MenuItem insets to Noun.

diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index ca348207e887dfc6539ca6c46acf95aa745df037..d1855bb7fcae4186e2b9b4c81901fb4b51c7a8f2 100644 (file)
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -47,22 +47,6 @@ multicol
 shapepar
 \end_modules
 \maintain_unincluded_children false
-\begin_local_layout
-Format 57
-InsetLayout Flex:MenuItem
-LyxType               charstyle
-LabelString          menu
-LatexType           command
-LatexName          menuitem
-Font
-Family              Sans
-EndFont
-Preamble
-\newcommand*{\menuitem}[1]{{\sffamily #1}}
-EndPreamble
-ResetsFont true
-End
-\end_local_layout
 \language english
 \language_package default
 \inputencoding auto
@@ -353,7 +337,7 @@ does
  has added its own extensions to \SpecialChar LaTeX
 .
  Try the following sometime: select 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -365,7 +349,7 @@ Export\SpecialChar menuseparator
 \end_inset
 
  from the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -375,7 +359,7 @@ File
 \end_inset
 
  menu (or 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -413,7 +397,7 @@ There are several commands that automatically invoke \SpecialChar LaTeX
 \end_layout
 
 \begin_layout Itemize
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -427,7 +411,7 @@ View
 \end_layout
 
 \begin_layout Itemize
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -441,7 +425,7 @@ Update
 \end_layout
 
 \begin_layout Itemize
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -455,7 +439,7 @@ Print
 \end_layout
 
 \begin_layout Itemize
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -550,7 +534,7 @@ If there are any errors, show the error log.
 \begin_layout Standard
 If you have run \SpecialChar LaTeX
  using 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -567,7 +551,7 @@ DVI
 , \SpecialChar LyX
  then runs a DVI viewer to display the DVI-file.
  If you have used 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -628,7 +612,7 @@ Translating \SpecialChar LaTeX
 You can import a \SpecialChar LaTeX
  file into \SpecialChar LyX
  by using the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -766,7 +750,7 @@ status collapsed
 \end_inset
 
  box, which you can insert into your document with 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -1012,7 +996,7 @@ In addition to using \SpecialChar TeX
  code, you can also create a separate file containing
  some complex \SpecialChar LaTeX
  structure and then use 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -1273,7 +1257,7 @@ The commands which \SpecialChar LyX
  change them without patching \SpecialChar LyX
  itself.
  You can, however, add your own stuff to the preamble by selecting 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -1288,7 +1272,7 @@ Preamble
 \end_inset
 
  in the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -1301,7 +1285,7 @@ Settings
  dialog.
  \SpecialChar LyX
  adds anything in the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -1745,7 +1729,7 @@ Well, usually.
 \begin_layout Standard
 Some folks also like to look at the log file directly: It is available from
  
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -1867,7 +1851,7 @@ status collapsed
 
 \begin_layout Plain Layout
 You can also enable the `draft' option in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -1994,7 +1978,7 @@ usepackage{}
  command, then one of the packages \SpecialChar LyX
  tried to load is missing.
  Use 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2009,7 +1993,7 @@ Help\SpecialChar menuseparator
  knows about.
  This file is updated whenever you reconfigure \SpecialChar LyX
  (using 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2385,7 +2369,7 @@ jurabib
 The handling of both packages in \SpecialChar LyX
  is basically the same.
  Go to 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2396,7 +2380,7 @@ Settings
 \end_inset
 
  and select under 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2406,7 +2390,7 @@ Bibliography
 \end_inset
 
  the option 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2416,7 +2400,7 @@ Natbib
 \end_inset
 
  or 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2604,7 +2588,7 @@ scientific.bib
 
 \begin_layout Standard
 Go to 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2615,7 +2599,7 @@ Settings
 \end_inset
 
  and check under 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2625,7 +2609,7 @@ Bibliography
 \end_inset
 
  the option 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2758,7 +2742,7 @@ bibtopic
  \SpecialChar LyX
  (see the previous section), provides an easy way to solve this task, if
  you are willing to use some 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2814,7 +2798,7 @@ bibunits
 
 \begin_layout Standard
 First go to 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2825,7 +2809,7 @@ Settings
 \end_inset
 
  and under 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2835,7 +2819,7 @@ Bibliography
 \end_inset
 
  check 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -2989,7 +2973,7 @@ end{document}
 \begin_layout Standard
 \SpecialChar LyX
  allows you to include files quite easily with 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -3116,7 +3100,7 @@ verbatim
  are conserved, unlike \SpecialChar LyX
 's normal treatment of spaces.
  However, setting the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -3936,7 +3920,7 @@ How it looks
 
 \begin_layout Standard
 Open the dialog by selecting the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -3947,7 +3931,7 @@ Settings
 \end_inset
 
  menu item and then select the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -4444,7 +4428,7 @@ star
 
  Specify each individual entry by starting each item with the bullet shape
  enclosed in square brackets and set as 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -5044,7 +5028,7 @@ Math Images Scaling
 \end_inset
 
  parameter under 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -5135,7 +5119,7 @@ class='math'
 
 \begin_layout Standard
 One of these output methods must be selected under 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -5513,7 +5497,7 @@ lyxpipe.out
 
 .
  The stem of the pipe names can be defined in the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6115,7 +6099,7 @@ name "subsec:rev-search"
 \begin_layout Standard
 In most cases \SpecialChar LyX
  will do the work for you by enabling the option 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6125,7 +6109,7 @@ Synchronize with Output
 \end_inset
 
  in the menu 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6157,7 +6141,7 @@ View/Update
 \begin_layout Standard
 If you need a different setting, you can select or input a custom macro
  from the drop down box just below 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6304,7 +6288,7 @@ This method provides the DVI file with the necessary information for reverse
  distribution
  should include it), and it works reliably.
  To enable it, change the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6318,7 +6302,7 @@ TeX
 \end_inset
 
  or 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6332,7 +6316,7 @@ TeX
 \end_inset
 
  converter in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6520,7 +6504,7 @@ The generation of the required info can be forced by changing the converter
 \begin_layout Standard
 To enable Sync\SpecialChar TeX
  for DVI output, change the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6534,7 +6518,7 @@ TeX
 \end_inset
 
  or 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6548,7 +6532,7 @@ TeX
 \end_inset
 
  converter in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6570,7 +6554,7 @@ latex -synctex=1 $$i
 \end_inset
 
 , and for PDF output, change the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6677,7 +6661,7 @@ lyxclient
 However, if for whatever reason you want to use the named pipe instead of
  the socket for communicating with \SpecialChar LyX
 , simply change the DVI viewer in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6775,7 +6759,7 @@ status collapsed
 \end_inset
 
 XServer pipe path specified in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6885,7 +6869,7 @@ open -a Skim.app $$i
 \end_inset
 
  to the viewer setting in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6898,7 +6882,7 @@ PDF (pdflatex)
 \end_inset
 
 , and then in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6910,7 +6894,7 @@ Sync
 \end_inset
 
  choose 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6920,7 +6904,7 @@ custom
 \end_inset
 
  preset and enter command 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6943,7 +6927,7 @@ Okular (KDE)
 
 \begin_layout Standard
 Go to 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -6987,7 +6971,7 @@ Qpdfview (Unix)
 Qpdfview supports Sync\SpecialChar TeX
  since version 0.3.5.
  Go to 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -7029,7 +7013,7 @@ YAP (Windows)
 
 \begin_layout Standard
 Launch yap, choose its 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -7217,7 +7201,7 @@ SumatraPDF -inverse-search "lyxeditor.bat %f %l"
 \end_inset
 
  in the viewer setting in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -7254,7 +7238,7 @@ YAP (Cygwin)
 \begin_layout Standard
 First of all, make sure that yap is your default DVI viewer in the Windows
  environment, then launch it, choose its 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -7387,7 +7371,7 @@ SumatraPDF -inverse-search "lyxeditor -g %f %l"
 \end_inset
 
  in the viewer setting in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -7458,7 +7442,7 @@ opposite
  If forward search is set up (as described in what follows), you can put
  the cursor anywhere in your \SpecialChar LyX
  document, and hit 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -7469,7 +7453,7 @@ Forward search
 \end_inset
 
  (or select 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -7500,7 +7484,7 @@ reference "subsec:rev-search"
 \begin_layout Standard
 Additionally, you need to configure \SpecialChar LyX
  for using your viewers in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -7595,7 +7579,7 @@ okular –unique
 \end_inset
 
  in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -19012,7 +18996,7 @@ Chk\SpecialChar TeX
 
 \family default
  invocation command line in 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -20229,7 +20213,7 @@ cvs -r
  of your document exists in the CVS/Base sub-directory a reserved otherwise
  a non-reserved checkout is assumed.
  When a reserved checkout is detected you have to use 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -20240,7 +20224,7 @@ Check Out
 
  to make your working copy writable if it's readonly.
  After doing so the 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -20374,7 +20358,7 @@ When you are finished editing a file, you commit your changes.
  After that changes are written to the repository.
  In case you didn't change the document and a reserved checkout is detected
  the reservation made on 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -22842,7 +22826,7 @@ VC_COMPARE
  \SpecialChar LyX
  function (for details see \SpecialChar LyX
  functions manual) or by icon/menu item 
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout
@@ -22855,7 +22839,7 @@ Compare with older revision...
  One can either compare two chosen revisions of the document or he can simply
  compare the current version of edited text with older revisions (where
  '
-\begin_inset Flex MenuItem
+\begin_inset Flex Noun
 status collapsed
 
 \begin_layout Plain Layout

diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx
index b76bf7dca3f28cd121729016b62143fd523d8cd0..a33f13cf3bb75c8120c7bca36223a797a84c088d 100644 (file)
--- a/lib/doc/Development.lyx
+++ b/lib/doc/Development.lyx
@@ -10,21 +10,6 @@
 logicalmkup
 \end_modules
 \maintain_unincluded_children false
-\begin_local_layout
-Format 7
-InsetLayout CharStyle:MenuItem
-LyxType               charstyle
-LabelString           menu
-LatexType             command
-LatexName             menuitem
-Font
-Family              Sans
-EndFont
-Preamble
-\newcommand*{\menuitem}[1]{{\sffamily #1}}
-EndPreamble
-End
-\end_local_layout
 \language english
 \language_package default
 \inputencoding auto