The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 6baa65119b22e88186ecc5291445e1f2f595d906 Merge: f33454b 1b6c138 Author: Uwe Stöhr <[email protected]> Date: Thu May 30 18:15:57 2013 +0200 Merge branch 'master' of git.lyx.org:lyx commit f33454b3c7c58aa86c9e30ae92f3c9e909909f52 Author: Uwe Stöhr <[email protected]> Date: Thu May 30 18:15:44 2013 +0200 LaTeXFeatures.cpp: add rsphrase - also modify the rsphrase.module - correct naming scheme for the bicaption.module diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module index 5f87a8f..4d3c872 100644 --- a/lib/layouts/bicaption.module +++ b/lib/layouts/bicaption.module @@ -1,4 +1,4 @@ -#\DeclareLyXModule[bicaption.sty]{Multilingual captions} +#\DeclareLyXModule[bicaption.sty]{Multilingual Captions} #DescriptionBegin #Provides two styles to typeset multilingual captions. #For a description see the file MultilingualCaptions.lyx in LyX's examples folder. diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module index 06fde1b..935da9f 100644 --- a/lib/layouts/rsphrase.module +++ b/lib/layouts/rsphrase.module @@ -8,14 +8,11 @@ Format 45 -AddToPreamble - \usepackage{rsphrase} -EndPreamble - InsetLayout "Flex:R-S number" LyxType custom LatexType command LatexName rsnumber + Requires rsphrase LabelString "R-S number" Font Color foreground @@ -42,6 +39,7 @@ End Style "Safety phrase" LatexType command LatexName rsphrase + Requires rsphrase Category MainText NextNoIndent 1 Argument 1 diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 924308c..d23f8b0 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -734,7 +734,8 @@ char const * simplefeatures[] = { "multicol", "multirow", "tfrupee", - "shapepar" + "shapepar", + "rsphrase" }; char const * bibliofeatures[] = { ----------------------------------------------------------------------- Summary of changes: lib/layouts/bicaption.module | 2 +- lib/layouts/rsphrase.module | 6 ++---- src/LaTeXFeatures.cpp | 3 ++- 3 files changed, 5 insertions(+), 6 deletions(-) hooks/post-receive -- The LyX Source Repository
