The branch, master, has been updated. - Log -----------------------------------------------------------------
commit b0381b68a1992697513fb99aa69d2389a326a2c4 Author: Uwe Stöhr <[email protected]> Date: Sat Jan 12 16:16:30 2013 +0100 bicaption.module: update to new argument layout mechanism - also fix a bug in the caption setup style to get rid of ERT - MultilingualCaptions.lyx: update descriptions accordingly diff --git a/lib/examples/MultilingualCaptions.lyx b/lib/examples/MultilingualCaptions.lyx index 640c155..cad71a3 100644 --- a/lib/examples/MultilingualCaptions.lyx +++ b/lib/examples/MultilingualCaptions.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 458 +\lyxformat 459 \begin_document \begin_header \textclass scrartcl @@ -180,7 +180,6 @@ status open \begin_layout Plain Layout \series bold -\color none Note \series default : If no optional argument is used for @@ -208,7 +207,7 @@ lang=ngerman \end_layout \begin_layout Standard -in TeX-Code in a +in a \family sans Caption setup \family default @@ -299,18 +298,7 @@ bi-second \end_inset - -\begin_inset ERT -status open - -\begin_layout Plain Layout - lang=ngerman -\end_layout - -\end_inset - - \begin_inset Note Note status collapsed @@ -513,7 +501,7 @@ status open \series bold Note \series default -: This setup doesn't have an effect in this file as described in section +: This setup does not have an effect in this file as described in section \begin_inset space ~ \end_inset @@ -539,18 +527,7 @@ bi-both \end_inset - -\begin_inset ERT -status open - -\begin_layout Plain Layout - -labelfont=bf,labelsep=newline -\end_layout - -\end_inset - - +labelfont=bf, labelsep=newline \begin_inset Note Note status collapsed @@ -574,18 +551,7 @@ bi-first \end_inset - -\begin_inset ERT -status open - -\begin_layout Plain Layout - -labelfont=bf,labelsep=newline -\end_layout - -\end_inset - - +labelfont=bf, labelsep=newline \begin_inset Note Note status collapsed @@ -608,18 +574,7 @@ bi-second \end_inset - -\begin_inset ERT -status open - -\begin_layout Plain Layout - -labelfont=bf,textfont={sf,it},labelsep=newline -\end_layout - -\end_inset - - +labelfont=bf, textfont={sf,it}, labelsep=newline \begin_inset Note Note status collapsed @@ -825,7 +780,6 @@ status open \begin_layout Plain Layout \series bold -\color none Note \series default : If you are using this feature, the diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module index 131d8b3..de6af7c 100644 --- a/lib/layouts/bicaption.module +++ b/lib/layouts/bicaption.module @@ -8,26 +8,27 @@ Format 43 Style "Caption setup" - LatexType command - LatexName captionsetup - Category FrontMatter + LatexType command + LatexName captionsetup + Category FrontMatter Argument 1 - LabelString "Caption Setup Options|S" - Tooltip "Options for the caption setup command (see bicaption manual)" + LabelString "Caption Setup Options" + Tooltip "Options for the caption setup" EndArgument - Margin Dynamic - LabelSep xx - ParSkip 0.0 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block - LabelType Static - LabelString "Caption setup:" + PassThru 1 + Margin Dynamic + LabelSep xx + ParSkip 0.0 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block + LabelType Static + LabelString "Caption setup:" LabelFont - Color Green + Color Green EndFont BabelPreamble \usepackage{bicaption} % for multilingual captions @@ -36,28 +37,28 @@ End InsetLayout Caption:Bicaption - LabelString bilingual - LaTeXType command - LatexName bicaption + LabelString bilingual + LaTeXType command + LatexName bicaption Argument 1 - LabelString "Main Language Caption Short Title" - Tooltip "A short title (for list of figures/tables) in the document language" + LabelString "Main Language Short Title" + Tooltip "Short title for the main(document) language" EndArgument Argument 2 - Mandatory 1 - LabelString "Main Language Caption Text|S" - Tooltip "The caption text in the document language" + Mandatory 1 + LabelString "Main Language Text" + Tooltip "Text in the main(document) language" EndArgument Argument 3 - LabelString "Second Language Caption Short Title" - Tooltip "A short title (for list of figures/tables) in the second language" + LabelString "Second Language Short Title" + Tooltip "Short title for the second language" EndArgument HTMLStyle - div.float-caption { - text-align: center; - border: 2px solid black; - padding: 1ex; - margin: 1ex; - } + div.float-caption { + text-align: center; + border: 2px solid black; + padding: 1ex; + margin: 1ex; + } EndHTMLStyle End ----------------------------------------------------------------------- Summary of changes: lib/examples/MultilingualCaptions.lyx | 58 +++------------------------- lib/layouts/bicaption.module | 67 +++++++++++++++++---------------- 2 files changed, 40 insertions(+), 85 deletions(-) hooks/post-receive -- The LyX Source Repository
