From: Scott Kostyshak <skostysh@lyx.org>
Date: Sat, 24 Oct 2015 04:57:08 +0000 (-0400)
Subject: Fix export with polyglossia and uninvert a manual
X-Git-Tag: 2.2.0alpha1~166
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d6a3dcbd586aca34fcd43ff322c0580ea15d9540;p=features.git

Fix export with polyglossia and uninvert a manual
---

diff --git a/development/autotests/revertedTests b/development/autotests/revertedTests
index 79b22e09f6..f977028f9d 100644
--- a/development/autotests/revertedTests
+++ b/development/autotests/revertedTests
@@ -61,8 +61,6 @@ export/examples/gl/exemplo_lyxificado_(dvi3)_systemF
 export/examples/sr/Braille_pdf4_systemF
 export/examples/sr/splash_pdf4_systemF
 export/templates/RJournal_(dvi3|pdf[45])_systemF
-# TODO the Spanish Math_pdf5_systemF test passes. Why does this one fail?
-export/doc/fr/Math_pdf5_systemF
 # Changes in TeX Live 2014 (see git blame for info) fixed IEEEtran-CompSoc
 # pdf4_systemF but not others. TODO Investigate if others can be fixed?
 export/templates/IEEEtran-(Journal|TransMag)_pdf4_systemF
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index 80bc0e622d..b32546a10b 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -33,13 +33,15 @@
 \renewcommand{\l@subsection}{\@dottedtocline{2}{1.5em}{2.8em}}
 \renewcommand{\l@subsubsection}{\@dottedtocline{3}{4.3em}{3.6em}}
 
-% increase link area for cross-references and autoname them,
-\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
-\addto\extrasfrench{%
- \renewcommand*{\equationautorefname}[1]{}%
- \renewcommand{\sectionautorefname}{sec.\negthinspace}%
- \renewcommand{\subsectionautorefname}{sec.\negthinspace}%
- \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}%
+\@ifpackageloaded{babel}{
+ % increase link area for cross-references and autoname them,
+ \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
+ \addto\extrasfrench{%
+  \renewcommand*{\equationautorefname}[1]{}%
+  \renewcommand{\sectionautorefname}{sec.\negthinspace}%
+  \renewcommand{\subsectionautorefname}{sec.\negthinspace}%
+  \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}%
+ }
 }
 
 % don't load packages twice
@@ -140,8 +142,10 @@
   \setboolean{upgreek}{true}}
  {\setboolean{upgreek}{false}}
 
-% use normal list environments also in French documents
-\frenchbsetup{StandardLayout}
+\@ifpackageloaded{babel}{
+ % use normal list environments also in French documents
+ \frenchbsetup{StandardLayout}
+}{}
 \end_preamble
 \options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading
 \use_default_options false