From 5753760b5984fef498dac367d8008ec63327f89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 8 Mar 2015 03:39:54 +0400 Subject: [PATCH] MultilingualCaptions.lyx: port recent changes to master --- lib/examples/MultilingualCaptions.lyx | 102 +++++++++++++++++------ lib/examples/fr/MultilingualCaptions.lyx | 59 +++++++++---- 2 files changed, 120 insertions(+), 41 deletions(-) diff --git a/lib/examples/MultilingualCaptions.lyx b/lib/examples/MultilingualCaptions.lyx index 6c5fcb78cf..569cecc972 100644 --- a/lib/examples/MultilingualCaptions.lyx +++ b/lib/examples/MultilingualCaptions.lyx @@ -4,7 +4,17 @@ \begin_header \textclass scrartcl \begin_preamble -% use this when you only need the document language captions in te list of figures/tables +% if pdflatex is used +\usepackage{ifpdf} +\ifpdf + +% set fonts for nicer pdf view +\IfFileExists{lmodern.sty} + {\usepackage{lmodern}}{} + +\fi % end if pdflatex is used + +% use this when you only need the document language captions in the list of figures/tables %\PassOptionsToPackage{list=off}{bicaption} % all this is only necessary if you want to have a different list of floats for each language @@ -56,7 +66,7 @@ bicaption \pdf_colorlinks true \pdf_backref false \pdf_pdfusetitle true -\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue" +\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" \papersize default \use_geometry false \use_package amsmath 1 @@ -130,11 +140,11 @@ Multilingual captions \family default allows to typeset captions in two languages. - It requires the LaTeX-package + It requires the LaTeX package \series bold bicaption \series default - which is part of the LaTeX-package + which is part of the LaTeX package \series bold caption \series default @@ -143,7 +153,11 @@ caption \series bold caption \series default - is installed, bicaption should be installed too. + is installed, +\series bold +bicaption +\series default + should be installed too. \end_layout \begin_layout Standard @@ -217,7 +231,7 @@ Caption setup \series bold ngerman \series default - by the babel name of your language. + by the babel name of the language. The list of babel names is given in Table \begin_inset space ~ \end_inset @@ -238,7 +252,11 @@ To add a multilingual caption to a float, press the right mouse button on the caption that is automatically added when inserting a new float and select \family sans -Caption (Bicaption +Caption +\begin_inset space ~ +\end_inset + +(Bicaption \family default ) from the context menu. If no caption is inserted, you can insert the multilingual caption via @@ -289,6 +307,25 @@ reference "fig:example-figure" is an example of a figure float with a multilingual caption. \end_layout +\begin_layout Standard +\begin_inset Float figure +wide false +sideways false +status open + +\begin_layout Plain Layout + +\end_layout + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + +\end_layout + \begin_layout Caption setup \begin_inset Argument 1 status open @@ -371,18 +408,12 @@ English Title status open \begin_layout Plain Layout - -\lang ngerman German short title \end_layout \end_inset - -\lang ngerman German Title -\lang english - \begin_inset CommandInset label LatexCommand label name "fig:example-figure" @@ -409,7 +440,6 @@ status open \begin_layout Plain Layout \series bold -\color none Note \series default : Multilingual captions cannot be used for longtables. @@ -456,7 +486,7 @@ font= \series default . For more information about possible customizations, see the documentation - of the LaTeX-package + of the LaTeX package \series bold caption \series default @@ -748,7 +778,7 @@ listoffigureGeres \end_layout \begin_layout Standard -as TeX-Code. +as TeX code. Here is the German list of figures: \end_layout @@ -811,7 +841,7 @@ bi-second \end_layout \begin_layout Standard -For more information what can be done with the LaTeX-package +For more information what can be done with the LaTeX package \series bold bicaption \series default @@ -834,7 +864,7 @@ key "bicaption" \begin_layout Standard \begin_inset Tabular - + @@ -1232,6 +1262,26 @@ Galician galician \end_layout +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Georgian +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +georgian +\end_layout + \end_inset @@ -1620,7 +1670,7 @@ scottish \begin_inset Text \begin_layout Plain Layout -Spanish +Serbian \end_layout \end_inset @@ -1629,7 +1679,7 @@ Spanish \begin_inset Text \begin_layout Plain Layout -spanish +serbian \end_layout \end_inset @@ -1680,7 +1730,7 @@ slovene \begin_inset Text \begin_layout Plain Layout -Swedish +Spanish \end_layout \end_inset @@ -1689,7 +1739,7 @@ Swedish \begin_inset Text \begin_layout Plain Layout -swedish +spanish \end_layout \end_inset @@ -1700,7 +1750,7 @@ swedish \begin_inset Text \begin_layout Plain Layout -Serbian +Swedish \end_layout \end_inset @@ -1709,7 +1759,7 @@ Serbian \begin_inset Text \begin_layout Plain Layout -serbian +swedish \end_layout \end_inset @@ -1809,7 +1859,7 @@ key "bicaption" \end_inset -Documentation of the LaTeX-package +Documentation of the LaTeX package \series bold \begin_inset CommandInset href @@ -1829,7 +1879,7 @@ key "caption" \end_inset -Documentation of the LaTeX-package +Documentation of the LaTeX package \series bold \begin_inset CommandInset href diff --git a/lib/examples/fr/MultilingualCaptions.lyx b/lib/examples/fr/MultilingualCaptions.lyx index f7ab85ab0e..a17d5f7f9d 100644 --- a/lib/examples/fr/MultilingualCaptions.lyx +++ b/lib/examples/fr/MultilingualCaptions.lyx @@ -4,7 +4,17 @@ \begin_header \textclass scrartcl \begin_preamble -% use this when you only need the document language captions in te list of figures/tables +% if pdflatex is used +\usepackage{ifpdf} +\ifpdf + +% set fonts for nicer pdf view +\IfFileExists{lmodern.sty} + {\usepackage{lmodern}}{} + +\fi % end if pdflatex is used + +% use this when you only need the document language captions in the list of figures/tables %\PassOptionsToPackage{list=off}{bicaption} % all this is only necessary if you want to have a different list of floats for each language @@ -56,7 +66,7 @@ bicaption \pdf_colorlinks true \pdf_backref false \pdf_pdfusetitle true -\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue" +\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" \papersize default \use_geometry false \use_package amsmath 1 @@ -301,7 +311,11 @@ Pour ajouter une légende multilingue à un flottant, presser la touche droite de la souris sur la légende qui apparaît automatiquement à la création d'un nouveau flottant et sélectionner \family sans -Légende (Double légende +Légende +\begin_inset space ~ +\end_inset + +(Double légende \family default ) dans le menu contextuel. Si aucune légende n'apparaît, il est possible d'insérer la légende multilingue @@ -352,7 +366,6 @@ reference "fig:example-figure" \end_layout \begin_layout Caption setup - \begin_inset Argument 1 status open @@ -466,7 +479,6 @@ status open \begin_layout Plain Layout \series bold -\color none Not \series default a: les légendes multilingues ne fonctionnent pas pour les tableaux longs. @@ -553,7 +565,6 @@ reference "fig:example-figure-custom" \end_layout \begin_layout Caption setup - \begin_inset Note Note status open @@ -604,7 +615,6 @@ la police de l'étiquette doit être grasse, le séparateur d'étiquette doit \end_layout \begin_layout Caption setup - \begin_inset Argument 1 status open @@ -628,7 +638,6 @@ l'étiquette dans la langue principale doit être en police grasse \end_layout \begin_layout Caption setup - \begin_inset Argument 1 status open @@ -895,7 +904,7 @@ key "bicaption" \begin_layout Standard \begin_inset Tabular - + @@ -1293,6 +1302,26 @@ Galician galician \end_layout +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Georgian +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +georgian +\end_layout + \end_inset @@ -1681,7 +1710,7 @@ scottish \begin_inset Text \begin_layout Plain Layout -Spanish +Serbian \end_layout \end_inset @@ -1690,7 +1719,7 @@ Spanish \begin_inset Text \begin_layout Plain Layout -spanish +serbian \end_layout \end_inset @@ -1741,7 +1770,7 @@ slovene \begin_inset Text \begin_layout Plain Layout -Swedish +Spanish \end_layout \end_inset @@ -1750,7 +1779,7 @@ Swedish \begin_inset Text \begin_layout Plain Layout -swedish +spanish \end_layout \end_inset @@ -1761,7 +1790,7 @@ swedish \begin_inset Text \begin_layout Plain Layout -Serbian +Swedish \end_layout \end_inset @@ -1770,7 +1799,7 @@ Serbian \begin_inset Text \begin_layout Plain Layout -serbian +swedish \end_layout \end_inset