From 319117855589c506728b2069cbc2ac562487052a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 5 Nov 2016 19:20:51 +0100 Subject: [PATCH] doc files: backport recent changes in master --- lib/doc/fr/Tutorial.lyx | 15 --------------- lib/doc/ja/EmbeddedObjects.lyx | 4 ++++ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/lib/doc/fr/Tutorial.lyx b/lib/doc/fr/Tutorial.lyx index 98c85de81e..2462119062 100644 --- a/lib/doc/fr/Tutorial.lyx +++ b/lib/doc/fr/Tutorial.lyx @@ -200,21 +200,6 @@ Mise à jour section 5.4, JPC 28/01/16 Mise à jour générale pour 2.2, JPC 25/07/16 - Normalisation typo de l'insertion des notes de bas de page, corrections typographiques mineures et quelques ajouts traduits -\begin_inset Newline newline -\end_inset - - -\end_layout - -\begin_layout Plain Layout -Vous pouvez trouver la dernière version au format PDF de ce manuel ici : -\begin_inset Newline newline -\end_inset - - -\family typewriter -\series bold -http://wiki.lyx.org/LyX/Manuals#Tutorial \end_layout \end_inset diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx index cc8f7ee3c6..4b6a7d34bf 100644 --- a/lib/doc/ja/EmbeddedObjects.lyx +++ b/lib/doc/ja/EmbeddedObjects.lyx @@ -134,6 +134,10 @@ {% \usepackage{sidecap} % This breaks title fonts with pLaTeX \setboolean{sidecap}{true}} {\setboolean{sidecap}{false}} +% set sidecap to false in all cases for Japanese manual. +% It breaks compliation and gives the following error: +% ! LaTeX Error: Environment SCfigure undefined. +\setboolean{sidecap}{false} % check for picinpar % used for surrounded fixed objects -- 2.39.5