Merge branch '2.2.x' into 2.2.2-staging

.gitattributes

@@ -0,0 +1,6 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Our .po file update scripts produce native line endings
+*.po text
+

3rdparty/hunspell/1.3.3/src/hunspell/hunspell.dsp

@@ -1,164 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hunspell" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=hunspell - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hunspell.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hunspell.mak" CFG="hunspell - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hunspell - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "hunspell - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hunspell - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "W32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "W32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x40e /d "NDEBUG"
-# ADD RSC /l 0x40e /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "hunspell - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "W32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "W32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x40e /d "_DEBUG"
-# ADD RSC /l 0x40e /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hunspell - Win32 Release"
-# Name "hunspell - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\affentry.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\affixmgr.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\csutil.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\dictmgr.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\hashmgr.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\hunspell.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\suggestmgr.cxx
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\affentry.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\affixmgr.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\atypes.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\baseaffix.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\csutil.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\dictmgr.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\hashmgr.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\htypes.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\langnum.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\hunspell.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\suggestmgr.hxx
-# End Source File
-# End Group
-# End Target
-# End Project

3rdparty/hunspell/Makefile.am

@@ -15,7 +15,6 @@ EXTRA_DIST = \
 	1.3.3/license.hunspell \
 	1.3.3/README \
 	1.3.3/THANKS \
-	1.3.3/src/hunspell/hunspell.dsp \
 	1.3.3/src/hunspell/hunvisapi.h.in \
 	1.3.3/src/hunspell/license.hunspell \
 	1.3.3/src/hunspell/license.myspell \

ANNOUNCE

@@ -1,35 +1,38 @@
-Public release of LyX version 2.2.0rc1
+Public release of LyX version 2.2.1
-========================================
+===================================
 
-We are proud to announce the first release candidate of LyX 2.2.0.
+We are proud to announce the release of LyX 2.2.1.
 
-With this release, LyX celebrates 20 years of existence. The 2.2 series
+LyX 2.2.1 is the first maintenance release in the 2.2.x series. You can 
-has a rich set of new features compared to the current stable series.
+download LyX 2.2.1 from http://www.lyx.org/Download/.
 
-LyX 2.2.0rc1 is the culmination of two years of hard work. An overview
+LyX 2.2.1 is the result of on-going efforts to make our stable version more 
-of the new features can be found here:
+reliable and more stable. We have fixed a number of bugs and made a number 
-  http://wiki.lyx.org/LyX/NewInLyX22
+of improvements. FILL IN
 
-You can download LyX 2.2.0rc1 from ftp://ftp.lyx.org/pub/lyx/devel/.
+One important change is to the behavior of character styles. By default,
+these now prohibit changes to the paragraph layout. Putting a description 
+inside a character style typically results in invalid LaTeX code, so this 
+makes certain mistakes harder to make. Power users who have taken advantage 
+of the previous behavior can restore it by adding "ForcePlain 0" to the 
+declaration of the character style, so long as this is done after "LyXType 
+charstyle" has been declared.
 
-For Windows users, if you installed a previous pre-release of LyX 2.2.0, you
+LyX is a document processor that encourages an approach to writing based 
-should uninstall that version before installing this newer release.
+on the structure of your documents and not simply their appearance. It is
+released under a Free and Open Source Software license.
 
-We hope you will enjoy the result!
+If you think you have found a bug in LyX 2.2.1, please open a bug report at
-
+http://www.lyx.org/trac/wiki/BugTrackerHome. If you're not sure whether it
-The file lib/RELEASE-NOTES lists some known issues and problems compared
+really is a bug, you can e-mail the LyX developers' mailing list (lyx-devel 
-to the current stable releases (LyX 2.1.x). We strongly recommend that
+<at> lists.lyx.org) and ask. 
-packagers of LyX on various platforms and distributions read this file.
-
-As with any major release, this one comes with a lot of new features but
-also some bugs. If you think you have found a bug in LyX 2.2.0rc1, either
-email the LyX developers' mailing list (lyx-devel at lists.lyx.org),
-or open a bug report at http://www.lyx.org/trac/wiki/BugTrackerHome.
 
 If you have trouble using LyX or have a question, consult the
-documentation that comes with LyX (under Help) and the LyX wiki, which you
+documentation that comes with LyX and the LyX wiki, which lives at
-will find at http://wiki.lyx.org/. You can also send email to the LyX users'
+http://wiki.lyx.org/. If you can't find the answer there, e-mail the LyX 
-list (lyx-users at lists.lyx.org).
+users' list (lyx-users <at> lists.lyx.org).
+
+We hope you enjoy using LyX 2.2.1.
 
 The LyX team.
 http://www.lyx.org

CMakeLists.txt

@@ -766,10 +766,14 @@ if(WIN32)
 		set(WIN32_CONSOLE WIN32)
 	endif()
 	if(MSVC)
-		add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
+		# -DPSAPI_VERSION=1 is needed to run on vista (bug 10186)
+		add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX -DPSAPI_VERSION=1)
 		# disable checked iterators for msvc release builds to get maximum speed
 		set(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
 	else()
+		# -DPSAPI_VERSION=1 is not needed for mingw, since the mingw psapi.h
+		# does not use it and always declares the vista compatible API.
+		# If this ever changes then -DPSAPI_VERSION might be needed here as well. 
 		add_definitions(-DWINVER=0x0500)
 	endif()
 endif()

INSTALL.Win32

@@ -1,4 +1,4 @@
-Compiling LyX 2.1 for Win32 and creating Windows installer
+Compiling LyX 2.2 for Win32 and creating Windows installer
 ==========================================================
 
 It's recommended to compile LyX using Microsoft Visual C++ 2010 and CMake.

configure.ac

@@ -2,6 +2,7 @@ dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(LyX,2.2.2dev,[lyx-devel@lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
+
 # Use ISO format only. The frontend needs to parse this
 AC_SUBST(LYX_DATE, ["2016-05-23"])
 AC_PREREQ(2.60)
@@ -231,6 +232,7 @@ dnl AC_LANG_POP(C)
 lyx_win_res=false;
 case ${host} in
     *mingw*|*cygwin*) lyx_win_res=true;;
+    *freebsd*) AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 esac
 AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res)
 LYX_SET_VERSION_INFO

development/Win32/packaging/installer/ChangeLog.txt

@@ -1,4 +1,37 @@
-Changelog for LyX.220-RC1-1:
+Changelog for LyX-220-4:
+- recompiled LyX using MSVC 2015 update 3
+- updated to MiKTeX 2.9 build 6022
+- updated to Imagemagick 6.9.x
+
+
+
+Changelog for LyX-220-3:
+- updated to Qt 5.6.1
+- updated to MiKTeX 2.9 build 5997
+- updated to JabRef 3.4
+- updated to Imagemagick 6.9.4-8
+
+
+Changelog for LyX-220-2:
+- remove also the user dependent LyX settings from the registry if the user
+  preferences should be uninstalled
+- calculate the required installation size correctly
+- updated to Imagemagick 6.9.4-6 (fixes 2 security issues)
+
+
+Changelog for LyX.220-1:
+- installs LyX 2.2.0
+- updated to MiKTeX 2.9 build 5987
+- updated to Imagemagick 6.9.4-4
+- updated to JabRef 3.3
+- new thesaurus for Norwegian (Nynorsk)
+- updated thesaurus for English (US) and Norwegian (Bokmal)
+- updated spell-checker dictionary for English (AU and GB), Norwegian (Bokmal and Nynorsk) and Scottish
+  (To benefit from it you must uninstall an already installed LyX 2.2.0 and
+   then use this installer.)
+
+
+Changelog for LyX.220-RC1-1:
 - installs LyX 2.2.0 RC1
 - updated to Ghostscript 9.19
 - updated to Imagemagick 6.9.3-8

development/Win32/packaging/installer/Packages.txt

@@ -1,4 +1,3 @@
-unicode-data
 l3experimental
 l3kernel
 l3packages
@@ -152,6 +151,7 @@ eulervm
 feyn
 fontaxes
 fourier
+fpl
 garamondx
 iwona
 kurier
@@ -168,7 +168,6 @@ tex-gyre
 tipa
 txfonts
 zhmetrics
-ascii
 bbding
 ifsym
 marvosym

development/Win32/packaging/installer/ThesaurusDictionaryNames.txt

@@ -32,6 +32,8 @@ th_it_IT_v2.dat
 th_it_IT_v2.idx
 th_nb_NO_v2.dat
 th_nb_NO_v2.idx
+th_nn_NO_v2.dat
+th_nn_NO_v2.idx
 th_pl_PL_v2.dat
 th_pl_PL_v2.idx
 th_pt_PT_v2.dat

development/Win32/packaging/installer/include/declarations.nsh

@@ -44,7 +44,7 @@ Configuration of LyX installer
 
 !define APP_NAME "LyX"
 !define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}"
-# for the proposed install folder we use the scheme "LyX 2.0" while we need for the registry the scheme "LyX 2.0.4"
+# for the proposed install folder we use the scheme "LyX 2.1" while we need for the registry the scheme "LyX 2.1.4"
 # to check if it is exactly this version (to support side by side installations)
 !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
 !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}"
@@ -57,12 +57,12 @@ Configuration of LyX installer
 !define APP_WEBPAGE_INFO "${APP_NAME} Website"
 !define APP_WIKI "http://wiki.lyx.org"
 !define APP_WIKI_INFO "${APP_NAME} Wiki"
-!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2016 by the LyX Team"
+!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-${COPYRIGHT_YEAR} by the LyX Team"
 
 !define APP_RUN "bin\lyx.exe"
 !define BIN_LYX "lyx.exe"
 
-!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX200"
+!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX220"
 !define APP_REGKEY_SETUP "${APP_REGKEY}\Setup"
 !define APP_REGKEY_SETTINGS "${APP_REGKEY}\Settings"
 

development/Win32/packaging/installer/include/detection.nsh

@@ -157,17 +157,9 @@ Function MissingPrograms
   ${endif}
 
   # test if and where the BibTeX-editor JabRef is installed
-  ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
+  ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
   ${if} $PathBibTeXEditor == ""
-   ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
+   ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
-  ${endif}
-  # since JabRef 3.x the pathes are different
-  # there is currently a bug in the Jabref installer that prevents to install it without admin permissions
-  # therefore only check the admin installation
-  ${if} $PathBibTeXEditor == ""
-   ReadRegStr $PathBibTeXEditor HKLM "SOFTWARE\Classes\JabRef\shell\open\command" ""
-   StrCpy $PathBibTeXEditor $PathBibTeXEditor -17 # remove '\JabRef.exe" "%1"'
-   StrCpy $PathBibTeXEditor $PathBibTeXEditor "" 1 # remove the leading quote
   ${endif}
 
   ${ifnot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"

development/Win32/packaging/installer/include/dictionaries.nsh

@@ -43,8 +43,8 @@ Function FindDictionaries
   
   # read out the possible thesaurus filenames from the file	
   FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
-  ${for} $5 1 25
+  ${for} $5 1 26
-   # the file has 50 lines, but we only need to check for one of the 2 dictionary files per language
+   # the file has 52 lines, but we only need to check for one of the 2 dictionary files per language
    # therefore check only for every second line
    FileRead $R5 $String   # $String is now the dictionary name
    FileRead $R5 $String   # $String is now the dictionary name
@@ -112,7 +112,7 @@ Function DownloadThesaurusDictionaries
  
  # read out the locations from the file	
  FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
- ${For} $5 1 50          # the file has 50 lines
+ ${For} $5 1 52          # the file has 52 lines
  
   FileRead $R5 $String   # $String is now the dictionary name
   StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code

development/Win32/packaging/installer/include/init.nsh

@@ -14,7 +14,7 @@ Var LyXLangName
 !macro EXTERNAL_INIT COMPONENT
 
   # APP_REGKEY_SETUP = "Software\${APP_NAME}${APP_SERIES_KEY}\Setup"
-  # where ${APP_NAME}${APP_SERIES_KEY} is something like LyX16
+  # where ${APP_NAME}${APP_SERIES_KEY} is something like LyX22
   ReadRegStr $ComponentPath SHELL_CONTEXT "${APP_REGKEY_SETUP}" "${COMPONENT} Path"
   
   # BIN_LATEX etc are defined in settings.nsh
@@ -46,20 +46,24 @@ FunctionEnd
 
 Section "!${APP_NAME}" SecCore
  SectionIn RO
+ !if ${SETUPTYPE} == BUNDLE
+  # if no TeX was found MiKTeX will be installed which requires space
+  !if $PathLaTeX == ""
+   AddSize 1020000 # size in KB
+  !endif
+ !endif
 SectionEnd
 
 Section "$(SecFileAssocTitle)" SecFileAssoc
- SectionIn RO
  StrCpy $CreateFileAssociations "true" 
 SectionEnd
 
 Section "$(SecDesktopTitle)" SecDesktop
- SectionIn RO
+ StrCpy $CreateDesktopIcon "true"
- StrCpy $CreateDesktopIcon "false"
 SectionEnd
 
 !if ${SETUPTYPE} == BUNDLE
- Section /o "$(SecInstJabRefTitle)" SecInstJabRef
+ Section "$(SecInstJabRefTitle)" SecInstJabRef
   AddSize ${SIZE_JABREF}
   StrCpy $InstallJabRef "true"
  SectionEnd
@@ -164,7 +168,7 @@ SectionEnd
 
 Section /o "English (AU)" SecDEnglishAU
  StrCpy $DictCodes "en_AU,$DictCodes"
- AddSize 587
+ AddSize 651
 SectionEnd
 
 Section /o "English (CA)" SecDEnglishCA
@@ -176,7 +180,7 @@ Section "English (GB)" SecDEnglishGB
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 652
+ AddSize 760
 SectionEnd
 
 Section /o "English (NZ)" SecDEnglishNZ
@@ -188,7 +192,7 @@ Section "English (US)" SecDEnglishUS
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_US,$DictCodes"
- AddSize 530
+ AddSize 547
 SectionEnd
 
 Section "Español (ES)" SecDSpanishES
@@ -239,7 +243,7 @@ SectionEnd
 
 Section /o "Gàidhlig" SecDScottish
  StrCpy $DictCodes "gd_GB,$DictCodes"
- AddSize 3090
+ AddSize 4161
 SectionEnd
 
 Section /o "Galego" SecDGalician
@@ -319,12 +323,12 @@ SectionEnd
 
 Section /o "Norsk (Bokmål)" SecDNorwegianNB
  StrCpy $DictCodes "nb_NO,$DictCodes"
- AddSize 3992
+ AddSize 5291
 SectionEnd
 
 Section /o "Norsk (Nynorsk)" SecDNorwegianNN
  StrCpy $DictCodes "nn_NO,$DictCodes"
- AddSize 1540
+ AddSize 3292
 SectionEnd
 
 Section /o "Occitan" SecDOccitan
@@ -479,7 +483,7 @@ SectionEnd
 
 Section /o "English (US/AU)" SecTEnglishUSAU
  StrCpy $ThesCodes "en_US,$ThesCodes"
- AddSize 21600
+ AddSize 22095
 SectionEnd
 
 Section /o "Español" SecTSpanish
@@ -524,7 +528,12 @@ SectionEnd
 
 Section /o "Norsk (Bokmål)" SecTNorwegianNB
  StrCpy $ThesCodes "nb_NO,$ThesCodes"
- AddSize 2535
+ AddSize 2595
+SectionEnd
+
+Section /o "Norsk (Nynorsk)" SecTNorwegianNN
+ StrCpy $ThesCodes "nn_NO,$ThesCodes"
+ AddSize 2
 SectionEnd
 
 Section /o "Polski" SecTPolish
@@ -1330,6 +1339,13 @@ Function .onInit
    SectionSetFlags ${SecTNorwegianNB} $0
    SectionSetSize ${SecTNorwegianNB} 0
   ${endif}
+  StrCpy $Search "nn_NO"
+  Call StrPoint
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecTNorwegianNN} $0
+   SectionSetSize ${SecTNorwegianNN} 0
+  ${endif}
   StrCpy $Search "pl_PL"
   Call StrPoint
   ${if} $Pointer != "-1"
@@ -1443,7 +1459,7 @@ Function un.onInit
   ${endif}
   
   # test if JabRef was installed together with LyX
-  ReadRegStr $0 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX"
+  ReadRegStr $0 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "OnlyWithLyX"
   ${if} $0 == "Yes${APP_SERIES_KEY}"
    SectionSetText 3 "JabRef" # names the corersponding uninstaller section
    StrCpy $JabRefInstalled "Yes"

development/Win32/packaging/installer/settings.nsh

@@ -12,12 +12,14 @@ These typically need to be modified for each LyX release
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 2
 !define APP_VERSION_REVISION 0
-!define APP_VERSION_EMERGENCY "RC1" # use "1" for an emergency release of LyX otherwise ""
+!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise ""
-!define APP_EMERGENCY_DOT "." # use "." for an emergency release of LyX otherwise ""
+!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise ""
-!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each version
 
 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
 
+!define COPYRIGHT_YEAR 2016
+
 #--------------------------------
 # Installer file name
 
@@ -38,27 +40,23 @@ These typically need to be modified for each LyX release
 # !!! you need to adjust them to the folders in your Windows system !!!
 
 !define FILES_LYX "D:\LyXPackage2.2\LyX"
-!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2010"
+!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
-!define FILES_QT "C:\Qt\Qt5.6.0-MSVC2015\5.6\msvc2015"
+!define FILES_QT "C:\Qt\Qt5.6.1-MSVC2015\5.6\msvc2015"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
 !define DVIPostFileDir "${FILES_DEPS}\tex"
 
 #--------------------------------
 # MiKTeX and JabRef
-# Sizes in KB
 
-# it seems that some companies block ftp access by default, therefore http access is preferred here
+!define MiKTeXRepo "ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
-!define MiKTeXRepo "http://ftp.fernuni-hagen.de/ftp-dir/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
-#!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
 
-!define JabRefVersion "2.11.1"
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.9.3"
+!define ImageMagickVersion "6.9.4"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef-2.11.1-setup.exe"
+ !define JabRefInstall "external\JabRef_windows_3_4.exe"
- !define SIZE_JABREF 18514
+ !define SIZE_JABREF 25700 # size in KB
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5872.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6022.exe"
 !endif
 

development/Win32/packaging/installer/setup/install.nsh

@@ -134,7 +134,6 @@ Section -ProgramFiles SecProgramFiles
    
    # install JabRef if not already installed, the user selected it
    # and if no BibTeX editor is installed
-   # due to an installer bug in the installer of JabRef version 3.x, we still install JabRef 2.11.1
    ${if} $PathBibTeXEditor == ""
    ${andif} $InstallJabRef == "true"
     # launch installer
@@ -146,11 +145,12 @@ Section -ProgramFiles SecProgramFiles
     StrCpy $PathBibTeXEditor ""
     ${if} $MultiUser.Privileges == "Admin"
      ${orif} $MultiUser.Privileges == "Power"
-     ReadRegStr $PathBibTeXEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString"
+     ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
-     StrCpy $PathBibTeXEditor $PathBibTeXEditor -14 # remove "\uninstall.exe"
     ${else}
-     # for non-admin users we can only check if it is in the start menu
+     ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
-     ReadRegStr $PathBibTeXEditor HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "StartMenu"
+     ${ifnot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"
+      StrCpy $PathBibTeXEditor ""
+     ${endif}
     ${endif}
     ${if} $PathBibTeXEditor == ""
      MessageBox MB_OK|MB_ICONEXCLAMATION "$(JabRefError)" /SD IDOK
@@ -159,9 +159,11 @@ Section -ProgramFiles SecProgramFiles
      # so that we can later uninstall it together with LyX
      ${if} $MultiUser.Privileges == "Admin"
      ${orif} $MultiUser.Privileges == "Power"
-      WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
+      WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
+      WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "UninstallString" "$PathBibTeXEditor\uninstall.exe"
      ${else}
-      WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
+      WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
+      WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "UninstallString" "$PathBibTeXEditor\uninstall.exe"
      ${endif}
     ${endif}
    ${endif} # end if PathBibTeXEditor

development/Win32/packaging/installer/setup/uninstall.nsh

@@ -73,11 +73,13 @@ Section "un.LyX" un.SecUnProgramFiles
   SetOutPath "$TEMP"
   RMDir /r "$INSTDIR"
   
-  # Registry keys
+  # Registry keys and values
   DeleteRegKey SHCTX "${APP_REGKEY_SETUP}"
   DeleteRegKey SHCTX "${APP_REGKEY}"
   DeleteRegKey SHCTX "${APP_UNINST_KEY}"
   DeleteRegKey HKCR "Applications\lyx.exe"
+  DeleteRegValue HKCR "LyX.Document\Shell\open\command" ""
+  DeleteRegValue HKCR "LyX.Document\DefaultIcon" ""
   
   # File associations
   ReadRegStr $FileAssociation SHELL_CONTEXT "Software\Classes\${APP_EXT}" ""
@@ -91,7 +93,6 @@ Section "un.LyX" un.SecUnProgramFiles
   DeleteRegKey SHCTX "SOFTWARE\${APP_REGKEY}"
   
   # delete info that programs were installed together with LyX
-  DeleteRegValue SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX"
   DeleteRegValue SHCTX "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX"
   
   # for texindy the path to the perl.exe must unfortunately be in Windows' PATH variable
@@ -113,6 +114,8 @@ Section /o "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences
  # remove LyX's config files
  StrCpy $AppSubfolder ${APP_DIR_USERDATA}
  Call un.DelAppPathSub # function from LyXUtils.nsh
+ # remove registry settings
+ DeleteRegKey HKCU "Software\LyX\LyX${APP_SERIES_NAME}"
   
 SectionEnd
 
@@ -134,15 +137,17 @@ Section "un.JabRef" un.SecUnJabRef
  ${if} $JabRefInstalled == "Yes" # only uninstall JabRef when it was installed together with LyX
   ${If} $MultiUser.Privileges == "Admin"
   ${OrIf} $MultiUser.Privileges == "Power"
-   ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString"
+   ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "UninstallString"
    IfSilent 0 +2
    ExecWait "$1 /S" # run JabRef's uninstaller
    ExecWait "$1" # run JabRef's uninstaller
+   DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef"
   ${else}
-   # in this case we can only read the start menu location and then start the linked uninstaller
+   ReadRegStr $1 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "UninstallString"
-   ReadRegStr $1 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "StartMenu"
+   IfSilent 0 +2
-   StrCpy $1 "$1\Uninstall JabRef "${JabRefVersion}".lnk"
+   ExecWait "$1 /S" # run JabRef's uninstaller
-   ExecShell "" "$1" # run JabRef's uninstaller
+   ExecWait "$1" # run JabRef's uninstaller
+   DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef"
   ${endif}
  ${endif}
 

development/cmake/build5-2015-x64.bat

@@ -33,7 +33,7 @@ REM Save path
 set CALLED_FROM=%CD%
 
 REM Add path to qmake here or set PATH correctly on your system.
-set PATH=C:\Qt\Qt5.6.0-MSVC2015-x64\5.6\msvc2015_64\bin;%PATH%
+set PATH=C:\Qt\Qt5.6.1-MSVC2015-x64\5.6\msvc2015_64\bin;%PATH%
 
 REM Edit pathes here or set the environment variables on your system.
 set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64

development/cmake/build5-2015.bat

@@ -0,0 +1,91 @@
+echo off
+
+echo -------------------------------------------------------------------------------------
+echo -
+echo Usage build.bat devel/install
+echo     devel   - Builds Visual Studio project files for development on LyX
+echo     install - Builds Visual Studio project files with all enabled for installation
+echo
+echo -------------------------------------------------------------------------------------
+echo -
+echo Call this script from a build directory or set variables (or edit this file)
+echo     LYX_SOURCE
+echo     LXY_BUILD
+echo
+echo Be sure you've set qmake in PATH.
+echo -
+echo GNUWin32 will be downloaded if you don't set the variable GNUWIN32_DIR
+echo -------------------------------------------------------------------------------------
+echo -
+echo -
+
+if [%1]==[] (
+	echo ERROR: no options.
+    echo Exiting now.
+	goto :eof
+)
+
+REM Uncomment the following line if you want to compile in parallel.
+REM This uses N cl.exe processes, where N is the number of cores.
+set CL=/MP
+
+REM Save path
+set CALLED_FROM=%CD%
+
+REM Add path to qmake here or set PATH correctly on your system.
+set PATH=C:\Qt\Qt5.6.1-MSVC2015\5.6\msvc2015\bin;%PATH%
+
+REM Edit pathes here or set the environment variables on your system.
+set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015
+set LYX_SOURCE=D:\LyXGit\2.2.x\
+set LYX_BUILD=D:\LyXGit\2.2.x\compile-2015
+
+if [%LYX_SOURCE%]==[] (
+	set LYX_SOURCE=%~DP0\..\..
+)
+echo LyX source: "%LYX_SOURCE%"
+
+if [%LYX_BUILD%]==[] (
+	set LYX_BUILD=%CD%
+)
+echo LyX build : "%LYX_BUILD%"
+
+if [%GNUWIN32_DIR%]==[] (
+	echo GNUWIN32_DIR not set.
+	echo Downloading win32 deps.
+	set DEPENDENCIES_DOWNLOAD="-DLYX_DEPENDENCIES_DOWNLOAD=1"
+) else set PATH="%GNUWIN32_DIR%\bin";%PATH%
+
+if not exist %LYX_BUILD% (
+	echo creating "%LYX_BUILD%"
+	mkdir "%LYX_BUILD%"
+	if not exist %LYX_BUILD% (
+		echo Exiting script.
+		goto :eof
+	)
+)
+
+cd "%LYX_BUILD%"
+
+REM start with a new cmake run
+::del CMakeCache.txt
+
+if "%1%" == "devel" (
+	REM Build solution to develop LyX
+	REM you can add the option "-GNinja" for a faster compilation
+	cmake %LYX_SOURCE% -G"Visual Studio 14 2015" -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD%
+	msbuild src\LyX.vcxproj /p:Configuration=Debug
+	msbuild src\tex2lyx\tex2lyx.vcxproj /p:Configuration=Debug
+)
+
+if "%1%" == "install" (
+	REM Build solution to develop LyX
+	REM set -DLYX_MERGE_REBUILD and -DLYX_MERGE_FILES to 1 for a version released with an installer
+	cmake %LYX_SOURCE% -GNinja -G"Visual Studio 14 2015" -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF %DEPENDENCIES_DOWNLOAD%
+	msbuild INSTALL.vcxproj /p:Configuration=Release
+)
+
+REM go back to the dir where the script was called from
+cd /D %CALLED_FROM%
+
+:eof

development/tools/mergepo.py

@@ -14,17 +14,14 @@
 
 
 import os, re, string, sys
+import io
 import polib
 from optparse import OptionParser
 
 
-# we do unix/windows line trimming ourselves since it can happen that we
-# are on unix, but the file has been written on windows or vice versa.
 def trim_eol(line):
-    " Remove end of line char(s)."
+    " Remove end of line char."
-    if line[-2:-1] == '\r':
+    if line[-1:] == '\n':
-        return line[:-2]
-    elif line[-1:] == '\r' or line[-1:] == '\n':
         return line[:-1]
     else:
         # file with no EOL in last line
@@ -39,7 +36,7 @@ def read(input):
         if not line:
             break
         line = trim_eol(line)
-        lines.append(line.decode('UTF-8'))
+        lines.append(line)
     return lines
 
 
@@ -59,7 +56,7 @@ def parse_msg(lines):
     return polib.unescape(msg)
 
 
-def translate(msgid, msgstr_lines, po2, options):
+def translate(msgid, flags, msgstr_lines, po2, options):
     msgstr = parse_msg(msgstr_lines)
     if options.overwrite:
         other = po2.find(msgid)
@@ -70,7 +67,7 @@ def translate(msgid, msgstr_lines, po2, options):
         if msgstr == other.msgstr:
             return 0
     else:
-        if msgstr != '':
+        if msgstr != '' and not u'fuzzy' in flags:
             return 0
         other = po2.find(msgid)
         if not other:
@@ -80,6 +77,12 @@ def translate(msgid, msgstr_lines, po2, options):
     if options.nonnull and other.msgstr == other.msgid:
         return 0
     msgstr = other.msgstr
+    if 'fuzzy' in other.flags:
+        if not u'fuzzy' in flags:
+            flags.append(u'fuzzy')
+    else:
+        if u'fuzzy' in flags:
+            flags.remove(u'fuzzy')
     obsolete = (msgstr_lines[0].find('#~') == 0)
     j = msgstr_lines[0].find('"')
     # must not assign to msgstr_lines, because that would not be seen by our caller
@@ -108,6 +111,12 @@ def mergepo_polib(target, source, options):
                 continue
             if other.translated() and other.msgstr != entry.msgstr:
                 entry.msgstr = other.msgstr
+                if 'fuzzy' in other.flags:
+                    if not 'fuzzy' in entry.flags:
+                        entry.flags.append('fuzzy')
+                else:
+                    if 'fuzzy' in entry.flags:
+                        entry.flags.remove('fuzzy')
                 changed = changed + 1
     else:
         for entry in po1.untranslated_entries():
@@ -130,14 +139,17 @@ def mergepo_minimaldiff(target, source, options):
     target_enc = polib.detect_encoding(target)
     # for utf8 files we can use our self written parser to minimize diffs,
     # otherwise we need to use polib
-    if target_enc != 'UTF-8':
+    if not target_enc in ['UTF-8', 'utf-8', 'utf_8']:
         raise
-    po1 = open(target, 'rb')
+    # open file with universal newlines, since it can happen that we are
+    # on unix, but the file has been written on windows or vice versa.
+    po1 = io.open(target, 'r', encoding='utf_8', newline=None)
     oldlines = read(po1)
     po1.close()
     newlines = []
     in_msgid = False
     in_msgstr = False
+    flags = []
     msgstr_lines = []
     msgid_lines = []
     msgid = ''
@@ -148,19 +160,25 @@ def mergepo_minimaldiff(target, source, options):
             else:
                 in_msgid = False
                 msgid = parse_msg(msgid_lines)
-                newlines.extend(msgid_lines)
-                msgid_lines = []
         elif in_msgstr:
             if line.find('"') == 0 or line.find('#~ "') == 0:
                 msgstr_lines.append(line)
             else:
                 in_msgstr = False
-                changed = changed + translate(msgid, msgstr_lines, po2, options)
+                changed = changed + translate(msgid, flags, msgstr_lines, po2, options)
+                if len(flags) > 0:
+                    flagline = u'#, ' + u', '.join(flags)
+                    newlines.append(flagline)
+                    flags = []
+                newlines.extend(msgid_lines)
                 newlines.extend(msgstr_lines)
+                msgid_lines = []
                 msgstr_lines = []
                 msgid = ''
         if not in_msgid and not in_msgstr:
-            if line.find('msgid') == 0 or line.find('#~ msgid') == 0:
+            if line.find('#,') == 0 and len(flags) == 0:
+                flags = line[2:].strip().split(u', ')
+            elif line.find('msgid') == 0 or line.find('#~ msgid') == 0:
                 msgid_lines.append(line)
                 in_msgid = True
             elif line.find('msgstr') == 0 or line.find('#~ msgstr') == 0:
@@ -173,16 +191,22 @@ def mergepo_minimaldiff(target, source, options):
                 newlines.append(line)
     if msgid != '':
         # the file ended with a msgstr
-        changed = changed + translate(msgid, msgstr_lines, po2, options)
+        changed = changed + translate(msgid, flags, msgstr_lines, po2, options)
+        if len(flags) > 0:
+            flagline = u'#, ' + u', '.join(flags)
+            newlines.append(flagline)
+            flags = []
+        newlines.extend(msgid_lines)
         newlines.extend(msgstr_lines)
+        msgid_lines = []
         msgstr_lines = []
         msgid = ''
     if changed > 0:
         # we store .po files with unix line ends in git,
         # so do always write them even on windows
-        po1 = open(target, 'wb')
+        po1 = io.open(target, 'w', encoding='utf_8', newline='\n')
         for line in newlines:
-            po1.write(line.encode('UTF-8') + '\n')
+            po1.write(line + '\n')
     return changed
 
 
@@ -197,7 +221,8 @@ def mergepo(target, source, options):
     try:
         changed = mergepo_minimaldiff(target, source, options)
         sys.stderr.write('Updated %d translations with minimal diff.\n' % changed)
-    except:
+    except Exception as e:
+        sys.stderr.write('Unable to use minimal diff: %s\n' % e)
         changed = mergepo_polib(target, source, options)
         sys.stderr.write('Updated %d translations using polib.\n' % changed)
 

development/tools/separator-convert.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# Lyx files converted from 2.1 to 2.2 contain parbeak and latexpar separators
+# that would not appear if the lyx file was written in 2.2 from scratch. The
+# script removes latexpar separators and transforms parbreak separators into
+# plain separators. Then it displays a diff of the resulting pdf files (requires
+# diffpdf) for manual control. All lyx files shipped with lyx should be updated
+# in this way. See #10068.
+#
+# example usage:
+# cd lib/doc
+# ../development/tools/separator-convert.sh Math.lyx
+#
+BUILD=../../build
+LYX=$BUILD/src/lyx
+cp $1 $1.old
+$LYX -E pdf2 $1.old.pdf $1
+sed -i "s/^\\\\begin_inset Separator parbreak$/\\\\begin_inset Separator plain/" $1
+sed -i "/^\\\\begin_inset Separator latexpar$/ { N; d; }" $1
+$LYX -e lyx $1
+$LYX -E pdf2 $1.pdf $1
+diffpdf $1.old.pdf $1.pdf

lib/CREDITS

@@ -468,6 +468,9 @@
 @bPaul A. Rubin
 @iE-mail: rubin () msu ! edu
    Major rework of the AMS classes
+@bDima Ruinskiy
+@iE-mail: dima.ruinskiy () outlook ! com
+   Reintroduction of Windows Vista support (bug 10186)
 @bGuy Rutenberg
 @iE-mail: guyrutenberg () gmail ! com
    System call fixes

lib/Makefile.am

@@ -1467,8 +1467,10 @@ dist_imagesipa_DATA = \
 	images/ipa/unicode-insert_0x0064.svgz \
 	images/ipa/unicode-insert_0x0065.svgz \
 	images/ipa/unicode-insert_0x0066.svgz \
+	images/ipa/unicode-insert_0x0067.svgz \
 	images/ipa/unicode-insert_0x0068.svgz \
 	images/ipa/unicode-insert_0x0069.svgz \
+	images/ipa/unicode-insert_0x006a.svgz \
 	images/ipa/unicode-insert_0x006b.svgz \
 	images/ipa/unicode-insert_0x006c.svgz \
 	images/ipa/unicode-insert_0x006d.svgz \
@@ -1507,8 +1509,10 @@ dist_imagesipa_DATA = \
 	images/ipa/unicode-insert_0x0257.svgz \
 	images/ipa/unicode-insert_0x0258.svgz \
 	images/ipa/unicode-insert_0x0259.svgz \
+	images/ipa/unicode-insert_0x025a.svgz \
 	images/ipa/unicode-insert_0x025b.svgz \
 	images/ipa/unicode-insert_0x025c.svgz \
+	images/ipa/unicode-insert_0x025d.svgz \
 	images/ipa/unicode-insert_0x025e.svgz \
 	images/ipa/unicode-insert_0x025f.svgz \
 	images/ipa/unicode-insert_0x0260.svgz \
@@ -1520,7 +1524,9 @@ dist_imagesipa_DATA = \
 	images/ipa/unicode-insert_0x0266.svgz \
 	images/ipa/unicode-insert_0x0267.svgz \
 	images/ipa/unicode-insert_0x0268.svgz \
+	images/ipa/unicode-insert_0x0269.svgz \
 	images/ipa/unicode-insert_0x026a.svgz \
+	images/ipa/unicode-insert_0x026b.svgz \
 	images/ipa/unicode-insert_0x026c.svgz \
 	images/ipa/unicode-insert_0x026d.svgz \
 	images/ipa/unicode-insert_0x026e.svgz \
@@ -1532,17 +1538,23 @@ dist_imagesipa_DATA = \
 	images/ipa/unicode-insert_0x0274.svgz \
 	images/ipa/unicode-insert_0x0275.svgz \
 	images/ipa/unicode-insert_0x0276.svgz \
+	images/ipa/unicode-insert_0x0277.svgz \
 	images/ipa/unicode-insert_0x0278.svgz \
 	images/ipa/unicode-insert_0x0279.svgz \
 	images/ipa/unicode-insert_0x027a.svgz \
 	images/ipa/unicode-insert_0x027b.svgz \
+	images/ipa/unicode-insert_0x027c.svgz \
 	images/ipa/unicode-insert_0x027d.svgz \
 	images/ipa/unicode-insert_0x027e.svgz \
+	images/ipa/unicode-insert_0x027f.svgz \
 	images/ipa/unicode-insert_0x0280.svgz \
 	images/ipa/unicode-insert_0x0281.svgz \
 	images/ipa/unicode-insert_0x0282.svgz \
 	images/ipa/unicode-insert_0x0283.svgz \
 	images/ipa/unicode-insert_0x0284.svgz \
+	images/ipa/unicode-insert_0x0285.svgz \
+	images/ipa/unicode-insert_0x0286.svgz \
+	images/ipa/unicode-insert_0x0287.svgz \
 	images/ipa/unicode-insert_0x0288.svgz \
 	images/ipa/unicode-insert_0x0289.svgz \
 	images/ipa/unicode-insert_0x028a.svgz \
@@ -1554,16 +1566,33 @@ dist_imagesipa_DATA = \
 	images/ipa/unicode-insert_0x0290.svgz \
 	images/ipa/unicode-insert_0x0291.svgz \
 	images/ipa/unicode-insert_0x0292.svgz \
+	images/ipa/unicode-insert_0x0293.svgz \
 	images/ipa/unicode-insert_0x0294.svgz \
 	images/ipa/unicode-insert_0x0295.svgz \
+	images/ipa/unicode-insert_0x0296.svgz \
+	images/ipa/unicode-insert_0x0297.svgz \
 	images/ipa/unicode-insert_0x0298.svgz \
 	images/ipa/unicode-insert_0x0299.svgz \
+	images/ipa/unicode-insert_0x029a.svgz \
 	images/ipa/unicode-insert_0x029b.svgz \
 	images/ipa/unicode-insert_0x029c.svgz \
 	images/ipa/unicode-insert_0x029d.svgz \
+	images/ipa/unicode-insert_0x029e.svgz \
 	images/ipa/unicode-insert_0x029f.svgz \
+	images/ipa/unicode-insert_0x02a0.svgz \
 	images/ipa/unicode-insert_0x02a1.svgz \
 	images/ipa/unicode-insert_0x02a2.svgz \
+	images/ipa/unicode-insert_0x02a3.svgz \
+	images/ipa/unicode-insert_0x02a4.svgz \
+	images/ipa/unicode-insert_0x02a5.svgz \
+	images/ipa/unicode-insert_0x02a6.svgz \
+	images/ipa/unicode-insert_0x02a7.svgz \
+	images/ipa/unicode-insert_0x02a8.svgz \
+	images/ipa/unicode-insert_0x02a9.svgz \
+	images/ipa/unicode-insert_0x02aA.svgz \
+	images/ipa/unicode-insert_0x02ab.svgz \
+	images/ipa/unicode-insert_0x02ac.svgz \
+	images/ipa/unicode-insert_0x02ad.svgz \
 	images/ipa/unicode-insert_0x02b0.svgz \
 	images/ipa/unicode-insert_0x02b2.svgz \
 	images/ipa/unicode-insert_0x02b7.svgz \
@@ -1637,6 +1666,19 @@ dist_imagesoxygen_DATA1X = \
 	images/oxygen/bookmark-goto_0.svgz \
 	images/oxygen/bookmark-save.svgz \
 	images/oxygen/box-insert.svgz \
+	images/oxygen/break-line.svgz \
+	images/oxygen/buffer-close.svgz \
+	images/oxygen/buffer-export.svgz \
+	images/oxygen/buffer-export_dvi.svgz \
+	images/oxygen/buffer-export_dvi3.svgz \
+	images/oxygen/buffer-export_latex.svgz \
+	images/oxygen/buffer-export_pdf.svgz \
+	images/oxygen/buffer-export_pdf2.svgz \
+	images/oxygen/buffer-export_pdf3.svgz \
+	images/oxygen/buffer-export_pdf4.svgz \
+	images/oxygen/buffer-export_pdf5.svgz \
+	images/oxygen/buffer-export_ps.svgz \
+	images/oxygen/buffer-export_text.svgz \
 	images/oxygen/buffer-new.svgz \
 	images/oxygen/buffer-reload.svgz \
 	images/oxygen/buffer-toggle-output-sync.svgz \
@@ -1660,27 +1702,34 @@ dist_imagesoxygen_DATA1X = \
 	images/oxygen/buffer-view_ps.svgz \
 	images/oxygen/buffer-write-as.svgz \
 	images/oxygen/buffer-write.svgz \
+	images/oxygen/build-program.svgz \
 	images/oxygen/change-accept.svgz \
 	images/oxygen/change-next.svgz \
 	images/oxygen/change-reject.svgz \
+	images/oxygen/changes-merge.svgz \
 	images/oxygen/changes-output.svgz \
 	images/oxygen/changes-track.svgz \
-	images/oxygen/tab-group-close.svgz \
 	images/oxygen/closetab.svgz \
 	images/oxygen/copy.svgz \
 	images/oxygen/cut.svgz \
 	images/oxygen/depth-decrement.svgz \
 	images/oxygen/depth-increment.svgz \
+	images/oxygen/dialog-preferences.svgz \
 	images/oxygen/dialog-show-new-inset_citation.svgz \
 	images/oxygen/dialog-show-new-inset_graphics.svgz \
 	images/oxygen/dialog-show-new-inset_include.svgz \
 	images/oxygen/dialog-show-new-inset_ref.svgz \
 	images/oxygen/dialog-show_character.svgz \
 	images/oxygen/dialog-show_findreplace.svgz \
+	images/oxygen/dialog-show_mathdelimiter.svgz \
+	images/oxygen/dialog-show_mathmatrix.svgz \
 	images/oxygen/dialog-show_print.svgz \
 	images/oxygen/dialog-show_spellchecker.svgz \
+	images/oxygen/dialog-show_vclog.svgz \
 	images/oxygen/dialog-toggle_findreplaceadv.svgz \
 	images/oxygen/dialog-toggle_toc.svgz \
+	images/oxygen/down.svgz \
+	images/oxygen/editclear.svgz \
 	images/oxygen/ert-insert.svgz \
 	images/oxygen/file-open.svgz \
 	images/oxygen/float-insert_figure.svgz \
@@ -1688,42 +1737,109 @@ dist_imagesoxygen_DATA1X = \
 	images/oxygen/font-bold.svgz \
 	images/oxygen/font-emph.svgz \
 	images/oxygen/font-noun.svgz \
+	images/oxygen/font-sans.svgz \
+	images/oxygen/font-smallcaps.svgz \
 	images/oxygen/footnote-insert.svgz \
+	images/oxygen/hidetab.svgz \
 	images/oxygen/href-insert.svgz \
 	images/oxygen/index-insert.svgz \
+	images/oxygen/info-insert_buffer_vcs-revision.svgz \
 	images/oxygen/label-insert.svgz \
 	images/oxygen/layout-document.svgz \
 	images/oxygen/layout-paragraph.svgz \
 	images/oxygen/layout.svgz \
+	images/oxygen/layout_Chunk.svgz \
 	images/oxygen/layout_Description.svgz \
 	images/oxygen/layout_Enumerate.svgz \
 	images/oxygen/layout_Itemize.svgz \
 	images/oxygen/layout_List.svgz \
+	images/oxygen/layout_LyX-Code.svgz \
+	images/oxygen/layout_Section.svgz \
 	images/oxygen/lyx-quit.svgz \
 	images/oxygen/marginalnote-insert.svgz \
 	images/oxygen/master-buffer-update.svgz \
+	images/oxygen/master-buffer-update_pdf2.svgz \
 	images/oxygen/master-buffer-view.svgz \
+	images/oxygen/math-display.svgz \
+	images/oxygen/math-macro-add-greedy-optional-param.svgz \
+	images/oxygen/math-macro-add-optional-param.svgz \
+	images/oxygen/math-macro-add-param.svgz \
+	images/oxygen/math-macro-append-greedy-param.svgz \
+	images/oxygen/math-macro-make-nonoptional.svgz \
+	images/oxygen/math-macro-make-optional.svgz \
+	images/oxygen/math-macro-remove-greedy-param.svgz \
+	images/oxygen/math-macro-remove-optional-param.svgz \
+	images/oxygen/math-macro-remove-param.svgz \
 	images/oxygen/math-macro_newmacroname_newcommand.svgz \
+	images/oxygen/math-matrix.svgz \
 	images/oxygen/math-mode.svgz \
+	images/oxygen/math-subscript.svgz \
+	images/oxygen/math-superscript.svgz \
 	images/oxygen/nomencl-insert.svgz \
 	images/oxygen/note-insert.svgz \
 	images/oxygen/note-next.svgz \
+	images/oxygen/outline-down.svgz \
+	images/oxygen/outline-in.svgz \
+	images/oxygen/outline-out.svgz \
+	images/oxygen/outline-up.svgz \
 	images/oxygen/paste.svgz \
 	images/oxygen/redo.svgz \
 	images/oxygen/reload.svgz \
+	images/oxygen/script-insert_subscript.svgz \
+	images/oxygen/script-insert_superscript.svgz \
 	images/oxygen/spelling-continuously.svgz \
-	images/oxygen/view-split_horizontal.svgz \
+	images/oxygen/sub.svgz \
-	images/oxygen/view-split_vertical.svgz \
+	images/oxygen/super.svgz \
+	images/oxygen/tab-group-close.svgz \
+	images/oxygen/tabular-feature_align-decimal.svgz \
+	images/oxygen/tabular-feature_append-column.svgz \
+	images/oxygen/tabular-feature_append-row.svgz \
+	images/oxygen/tabular-feature_delete-column.svgz \
+	images/oxygen/tabular-feature_delete-row.svgz \
+	images/oxygen/tabular-feature_m-align-center.svgz \
+	images/oxygen/tabular-feature_m-align-left.svgz \
+	images/oxygen/tabular-feature_m-align-right.svgz \
+	images/oxygen/tabular-feature_m-valign-bottom.svgz \
+	images/oxygen/tabular-feature_m-valign-middle.svgz \
+	images/oxygen/tabular-feature_m-valign-top.svgz \
+	images/oxygen/tabular-feature_move-column-left.svgz \
+	images/oxygen/tabular-feature_move-column-right.svgz \
+	images/oxygen/tabular-feature_move-row-down.svgz \
+	images/oxygen/tabular-feature_move-row-up.svgz \
+	images/oxygen/tabular-feature_multicolumn.svgz \
+	images/oxygen/tabular-feature_multirow.svgz \
+	images/oxygen/tabular-feature_set-all-lines.svgz \
+	images/oxygen/tabular-feature_set-border-lines.svgz \
+	images/oxygen/tabular-feature_set-longtabular.svgz \
+	images/oxygen/tabular-feature_toggle-line-bottom.svgz \
+	images/oxygen/tabular-feature_toggle-line-left.svgz \
+	images/oxygen/tabular-feature_toggle-line-right.svgz \
+	images/oxygen/tabular-feature_toggle-line-top.svgz \
+	images/oxygen/tabular-feature_toggle-rotate-cell.svgz \
+	images/oxygen/tabular-feature_toggle-rotate-tabular.svgz \
+	images/oxygen/tabular-feature_unset-all-lines.svgz \
 	images/oxygen/tabular-insert.svgz \
 	images/oxygen/textstyle-apply.svgz \
 	images/oxygen/thesaurus-entry.svgz \
 	images/oxygen/toolbar-toggle_math.svgz \
+	images/oxygen/toolbar-toggle_math_panels.svgz \
 	images/oxygen/toolbar-toggle_table.svgz \
 	images/oxygen/undo.svgz \
+	images/oxygen/unknown.svgz \
+	images/oxygen/up.svgz \
 	images/oxygen/update-others.svgz \
 	images/oxygen/url-insert.svgz \
+	images/oxygen/vc-check-in.svgz \
+	images/oxygen/vc-check-out.svgz \
+	images/oxygen/vc-compare.svgz \
+	images/oxygen/vc-compare_0.svgz \
+	images/oxygen/vc-locking-toggle.svgz \
+	images/oxygen/vc-register.svgz \
+	images/oxygen/vc-repo-update.svgz \
 	images/oxygen/vc-revert.svgz \
-	images/oxygen/view-others.svgz
+	images/oxygen/view-others.svgz \
+	images/oxygen/view-split_horizontal.svgz \
+	images/oxygen/view-split_vertical.svgz
 
 dist_imagesoxygen_DATA = \
 	images/oxygen/iconsize.png \

lib/RELEASE-NOTES

@@ -118,20 +118,36 @@
   several regressions with respect to Qt 4.x. See #9215 for a list of bugs
   related to compiling LyX with different versions of Qt.
 
+* The Qt libraries must have support for the SVG graphic format, because
+  LyX now uses svg icons. If this support is lacking, icons cannot be shown.
+
+* If compiling LyX on Windows with Qt 5.6, it is recommended to use MSVC 2015
+  update 2 to avoid #9892.
+
 * LyX now gives an error if the underlying LaTeX command exited with error.
 
 
 !!Known issues in version 2.2.0
 
-* LyX needs to be run under Python 2 and will not work properly on systems
+* LyX needs Python 2.7 at runtime. The python 2 interpreter needs to be named
-  where Python 3 is the default binary. See #7030 to know how to fix this
+  either 'python' or 'python2'.
-  properly, since simple shebang conversion in *.py files will not be enough.
+  Building LyX usually works with Python 3 as well, but there might be cases
+  where it does not work properly on systems where Python 3 is the default
+  binary. See #7030 to know how to fix this properly, since simple shebang
+  conversion in *.py files will not be enough.
 
 * If using LyX with Qt 4, it is possible to suddenly get keyboard keys wrong,
   and deadlock. To work around the issue, you can disable IBus for LyX by
   starting LyX as 'XMODIFIERS= lyx'. For further discussion and alternative
   workarounds, see #9362.
 
+* LyX can produce LuaTeX output that is not compatible with the newest versions
+  of the engine (e.g. 0.95.0, the version in TeX Live 2016). In a later 2.2.x
+  version we plan to implement exporting of LuaTeX code that is compatible
+  with the LuaTeX versions shipped with both TeX Live 2015 and TeX Live 2016.
+  For more information, see the following mailing list thread:
+  https://www.mail-archive.com/search?l=mid&q=20160520075810.yi3uspufehev5aln%40cotopaxi
+
 
 !!Caveats when upgrading from earlier versions to 2.2.x
 

lib/configure.py

@@ -539,37 +539,13 @@ def checkLatex(dtl_tools):
 
 
 def checkLuatex():
-    ''' Check if luatex is there and usable '''
+    ''' Check if luatex is there '''
     path, LUATEX = checkProg('LuaTeX', ['lualatex $$i'])
     path, DVILUATEX = checkProg('LuaTeX (DVI)', ['dvilualatex $$i'])
     if LUATEX != '':
-    # luatex binary is there
+        addToRC(r'\converter luatex      pdf5       "%s"	"latex=lualatex"' % LUATEX)
-        msg = "checking if LuaTeX is usable ..."
+    if DVILUATEX != '':
-        # Check if luatex is usable
+        addToRC(r'\converter luatex      dvi3        "%s"	"latex=dvilualatex"' % DVILUATEX)
-        writeToFile('luatest.tex', r'''
-\nonstopmode
-\documentclass{minimal}
-\usepackage{fontspec}
-\begin{document}
-.
-\end{document}
-''')
-        # run lualatex on luatest.tex and check result
-        luatest = cmdOutput(LUATEX + ' luatest.tex')
-        if luatest.find('XeTeX is required to compile this document') != -1:
-            # fontspec/luatex too old! We do not support this version.
-            logger.info(msg + ' no (probably not recent enough)')
-        elif luatest.find('! LaTeX Error: File `fontspec.sty\' not found') != -1:
-            # fontspec missing
-            logger.info(msg + ' no (missing fontspec)')
-        else:
-            # working luatex
-            logger.info(msg + ' yes')
-            addToRC(r'\converter luatex      pdf5       "%s"	"latex=lualatex"' % LUATEX)
-            if DVILUATEX != '':
-                addToRC(r'\converter luatex      dvi3        "%s"	"latex=dvilualatex"' % DVILUATEX)
-        # remove temporary files
-        removeFiles(['luatest.tex', 'luatest.log', 'luatest.aux', 'luatest.pdf'])
 
 
 def checkModule(module):
@@ -605,7 +581,8 @@ def checkFormatEntries(dtl_tools):
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""	""'])
     #
     checkViewerEditor('a SVG viewer and editor', [inkscape_name],
-        rc_entry = [r'\Format svg        "svg, svgz" SVG                "" "%%" "%%"	"vector,zipped=native"	"image/svg+xml"'],
+        rc_entry = [r'''\Format svg        "svg" SVG                "" "%%" "%%"	"vector"	"image/svg+xml"
+\Format svgz       "svgz" "SVG (compressed)" "" "%%" "%%"	"vector,zipped=native"	""'''],
         path = [inkscape_path])
     #
     imageformats = r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""	"image/x-bmp"
@@ -972,7 +949,7 @@ def checkConverterEntries():
     checkProg('an EPS -> PDF converter', ['epstopdf'],
         rc_entry = [ r'\converter eps        pdf6       "epstopdf --outfile=$$o $$i"	""'])
     #
-    checkProg('an EPS -> PNG converter', ['convert $$i $$o'],
+    checkProg('an EPS -> PNG converter', ['magick $$i $$o', 'convert $$i $$o'],
         rc_entry = [ r'\converter eps        png        "%%"	""'])
     #
     # no agr -> pdf6 converter, since the pdf library used by gracebat is not
@@ -1002,18 +979,27 @@ def checkConverterEntries():
     # odg->png and odg->pdf converters, since the bb would be too large as well.
     checkProg('an OpenDocument -> EPS converter', ['libreoffice -headless -nologo -convert-to eps $$i', 'unoconv -f eps --stdout $$i > $$o'],
         rc_entry = [ r'\converter odg        eps2       "%%"	""'])
+    #
+    checkProg('a SVG (compressed) -> SVG converter', ['gunzip -c $$i > $$o'],
+        rc_entry = [ r'\converter svgz       svg        "%%"	""'])
+    #
+    checkProg('a SVG -> SVG (compressed) converter', ['gzip -c $$i > $$o'],
+        rc_entry = [ r'\converter svg        svgz       "%%"	""'])
     # Only define a converter to pdf6 for graphics
     # Prefer rsvg-convert over inkscape since it is faster (see http://www.lyx.org/trac/ticket/9891)
     checkProg('a SVG -> PDF converter', ['rsvg-convert -f pdf -o $$o $$i', inkscape_name + ' --file=$$i --export-area-drawing --without-gui --export-pdf=$$o'],
-        rc_entry = [ r'\converter svg        pdf6       "%%"    ""'],
+        rc_entry = [ r'''\converter svg        pdf6       "%%"    ""
+\converter svgz       pdf6       "%%"    ""'''],
         path = ['', inkscape_path])
     #
     checkProg('a SVG -> EPS converter', ['rsvg-convert -f ps -o $$o $$i', inkscape_name + ' --file=$$i --export-area-drawing --without-gui --export-eps=$$o'],
-        rc_entry = [ r'\converter svg        eps        "%%"    ""'],
+        rc_entry = [ r'''\converter svg        eps        "%%"    ""
+\converter svgz       eps        "%%"    ""'''],
         path = ['', inkscape_path])
     #
     checkProg('a SVG -> PNG converter', ['rsvg-convert -f png -o $$o $$i', inkscape_name + ' --without-gui --file=$$i --export-png=$$o'],
-        rc_entry = [ r'\converter svg        png        "%%"    ""'],
+        rc_entry = [ r'''\converter svg        png        "%%"    "",
+\converter svgz       png        "%%"    ""'''],
         path = ['', inkscape_path])
 
     #
@@ -1522,7 +1508,10 @@ def rescanTeXFiles():
     if not os.path.isfile( os.path.join(srcdir, 'scripts', 'TeXFiles.py') ):
         logger.error("configure: error: cannot find TeXFiles.py script")
         sys.exit(1)
-    tfp = cmdOutput("python -tt " + '"' + os.path.join(srcdir, 'scripts', 'TeXFiles.py') + '"')
+    interpreter = sys.executable
+    if interpreter == '':
+        interpreter = "python"
+    tfp = cmdOutput(interpreter + " -tt " + '"' + os.path.join(srcdir, 'scripts', 'TeXFiles.py') + '"')
     logger.info(tfp)
     logger.info("\tdone")
 

lib/doc/Additional.lyx

@@ -333,8 +333,7 @@ status collapsed
 
 \begin_layout Plain Layout
 Export\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX
-
 \end_layout
 
 \end_inset
@@ -413,34 +412,6 @@ Update
 \end_inset
 
 
-\end_layout
-
-\begin_layout Itemize
-\begin_inset Flex Noun
-status collapsed
-
-\begin_layout Plain Layout
-File\SpecialChar menuseparator
-Print
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Itemize
-\begin_inset Flex Noun
-status collapsed
-
-\begin_layout Plain Layout
-File\SpecialChar menuseparator
-Fax
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -601,8 +572,7 @@ status collapsed
 \begin_layout Plain Layout
 File\SpecialChar menuseparator
 Import\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX
-
 \end_layout
 
 \end_inset
@@ -1717,7 +1687,7 @@ status collapsed
 
 \begin_layout Plain Layout
 Document\SpecialChar menuseparator
-Latex
+LaTeX
 \begin_inset space ~
 \end_inset
 
@@ -1738,8 +1708,7 @@ Log
 status collapsed
 
 \begin_layout Plain Layout
-\SpecialChar LaTeX
+LaTeX Warning
- Warning
 \end_layout
 
 \end_inset
@@ -1771,8 +1740,7 @@ debugging
 status collapsed
 
 \begin_layout Plain Layout
-\SpecialChar LaTeX
+LaTeX Font Warning
- Font Warning
 \end_layout
 
 \end_inset
@@ -1910,8 +1878,7 @@ Warnings about troubles breaking the page.
 status collapsed
 
 \begin_layout Plain Layout
-\SpecialChar LaTeX
+LaTeX Error: File 
- Error: File 
 \begin_inset Quotes els
 \end_inset
 
@@ -2003,8 +1970,7 @@ usepackage{}
 status collapsed
 
 \begin_layout Plain Layout
-\SpecialChar LaTeX
+LaTeX Error: Unknown option
- Error: Unknown option
 \end_layout
 
 \end_inset
@@ -10586,7 +10552,7 @@ This section documents the class
 
 
 \family sans
-slides (FoilTeX)
+FoilTeX
 \family default
 
 \begin_inset Quotes erd
@@ -10633,19 +10599,11 @@ reference "sec:slitex"
 \family sans
 foils
 \family default
- class [
+ class 
-\begin_inset Quotes eld
-\end_inset
-
-
 \family sans
-slides (FoilTeX)
+FoilTeX
 \family default
-
+ installed, you'll probably have to use the default 
-\begin_inset Quotes erd
-\end_inset
-
-] installed, you'll probably have to use the default 
 \family sans
 slides
 \family default
@@ -10659,7 +10617,11 @@ The
 \family sans
 foils
 \family default
- class is designed for use with version 2.1 of the 
+ class is designed for use with version
+\begin_inset space ~
+\end_inset
+
+2.1 of the 
 \family sans
 foils.cls
 \family default
@@ -10674,17 +10636,9 @@ Getting Started
 
 \begin_layout Standard
 Obviously, to use this document class, you need to select 
-\begin_inset Quotes eld
-\end_inset
-
-
 \family sans
-slides (FoilTeX)
+FoilTeX
 \family default
-
-\begin_inset Quotes erd
-\end_inset
-
  from the 
 \family sans
 Class

lib/doc/Changelog-Customization-LyX_22x.txt

@@ -1,4 +1,11 @@
-Modified:
+For LyX 2.2.1:
+
+- sec. 5.3.9: additions in description of "LyxType"
+
+
+For LyX 2.2.0:
+
+Modified:
 
 first step:
 - sec. 5.3.4 new sentence for "Requires"

lib/doc/Changelog-Math-LyX_22.txt

@@ -1,13 +1,18 @@
+For LyX 2.2.1:
+
+- sec. 23.1: new note
+
+
+For LyX 2.2.0:
+
 In the first step:
 
 Modified:
-
 - sec. 15.1: Spanish only: new note behind the table
 - sec. 16.1: Spanish only: correct note in the table
 - sec. 18.1: Japanese only: updated paragraph
 
 New:
-
 - sec. 13.3: new note behind the table
 
 

lib/doc/Changelog-Tutorial-LyX_22x.txt

@@ -0,0 +1,3 @@
+Modified:
+
+- sec. 2.1.1: new hint

lib/doc/Changelog-UserGuide-LyX_22x.txt

@@ -1,4 +1,9 @@
-Modified:
+For LyX 2.2.1:
+
+- sec. 6.11: new sentence
+
+
+For LyX 2.2.0:
 
 in the first step:
 - sec. 3.3.10.1 (Japanese only) changed sentence

lib/doc/Customization.lyx

@@ -6763,16 +6763,7 @@ Format
  Any format is acceptable, but one would normally use the format current
  at the time.
  (In \SpecialChar LyX
- 2.1, the current layout format is 48.) You should be aware that local
+ 2.2, the current layout format is 60.)
- layout is not supported by versions of \SpecialChar LyX
- prior to 1.6, so you should not
- use it if you want to be able to export your document to \SpecialChar LyX
- 1.5 or earlier
- (without, that is, losing the local layout information).
- If you wish to be able to export to 1.6—local layout is supported in 1.6,
- though there is no UI for it—then you should use format 11 and, of course,
- use only layout constructs that were available in \SpecialChar LyX
- 1.6.
 \end_layout
 
 \begin_layout Standard
@@ -6939,8 +6930,7 @@ myclass.layout
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass{report}
-Class{report}
 \end_layout
 
 \begin_layout Standard
@@ -6950,8 +6940,7 @@ to read
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass[report, myclass.sty]{report (myclass)}
-Class[report, myclass.sty]{report (myclass)}
 \end_layout
 
 \begin_layout Standard
@@ -7144,7 +7133,7 @@ DeclareLyXModule{My Package}
 \end_layout
 
 \begin_layout LyX-Code
-Format 35
+Format 60
 \begin_inset Newline newline
 \end_inset
 
@@ -7278,8 +7267,7 @@ thesis.layout
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass[thesis,book]{thesis}
-Class[thesis,book]{thesis}
 \end_layout
 
 \begin_layout Standard
@@ -8433,7 +8421,7 @@ Format
 
 .
  The format for the present version of \SpecialChar LyX
- is format 59.
+ is format 60.
  But each version of \SpecialChar LyX
  is capable of reading earlier versions' layout files,
  just as they are capable of reading files produced by earlier versions
@@ -18485,7 +18473,7 @@ end
 status collapsed
 
 \begin_layout Plain Layout
-LyXType
+LyxType
 \end_layout
 
 \end_inset
@@ -18510,7 +18498,17 @@ MultiPar
 
 \end_inset
 
- to false.
+ to false and 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ to true.
  
 \begin_inset Flex Code
 status collapsed
@@ -18521,7 +18519,17 @@ MultiPar
 
 \end_inset
 
- can be set to true for 
+ can be set to true, or 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ to false, for 
 \begin_inset Flex Code
 status collapsed
 
@@ -18540,7 +18548,7 @@ after
 status collapsed
 
 \begin_layout Plain Layout
-LyXType
+LyxType
 \end_layout
 
 \end_inset

lib/doc/EmbeddedObjects.lyx

@@ -24645,7 +24645,6 @@ arg   "label-insert"
  A grey label box like this one: 
 \begin_inset Graphics
 	filename clipart/label.png
-	scale 85
 	scaleBeforeRotation
 
 \end_inset
@@ -24690,7 +24689,6 @@ arg   "dialog-show-new-inset ref"
  A grey cross-reference box like this one: 
 \begin_inset Graphics
 	filename clipart/reference.png
-	scale 85
 	scaleBeforeRotation
 
 \end_inset
@@ -30934,19 +30932,27 @@ sideways false
 status open
 
 \begin_layout Plain Layout
-\begin_inset ERT
+\noindent
-status collapsed
+\align center
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename clipart/without_fntright.pdf
 	width 100col%
@@ -30955,12 +30961,6 @@ framebox{
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -30999,19 +30999,27 @@ sideways false
 status open
 
 \begin_layout Plain Layout
-\begin_inset ERT
+\noindent
-status collapsed
+\align center
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename clipart/with_fntright.pdf
 	width 100col%
@@ -31020,12 +31028,6 @@ framebox{
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -31139,33 +31141,35 @@ sideways false
 status open
 
 \begin_layout Plain Layout
+\noindent
 \align center
-\begin_inset ERT
+\begin_inset Box Boxed
-status collapsed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename clipart/endnotes.pdf
+	width 100col%
 	scaleBeforeRotation
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -39216,7 +39220,7 @@ Text
 Here is a child document inserted as Verbatim: 
 \begin_inset CommandInset include
 LatexCommand verbatiminput
-filename "DUMMYT~1.TXT"
+filename "DummyTextDocument.txt"
 
 \end_inset
 
@@ -39231,7 +39235,7 @@ Mark spaces in output
  option: 
 \begin_inset CommandInset include
 LatexCommand verbatiminput*
-filename "DUMMYT~1.TXT"
+filename "DummyTextDocument.txt"
 
 \end_inset
 

lib/doc/Makefile.am

@@ -165,6 +165,7 @@ dist_frclipartdoc_DATA = \
 	fr/clipart/GreyedOutNoteImage.png \
 	fr/clipart/label.png \
 	fr/clipart/LyXNoteImage.png \
+	fr/clipart/reference.png \
 	fr/clipart/SousDocument.png
 
 gldocdir = $(docdir)/gl

lib/doc/Math.lyx

@@ -34196,6 +34196,35 @@ Maxima
 \end_inset
 
 
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ One needs to use proper delimiter insets 
+\begin_inset Formula $\left(\right)$
+\end_inset
+
+ instead of simple '(' ')' characters.
+\end_layout
+
+\end_inset
+
+ 
 \end_layout
 
 \begin_layout Itemize
@@ -34214,6 +34243,20 @@ Maxima
 \end_inset
 
 
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsection
@@ -35118,6 +35161,13 @@ As one can see, the distance of the numerator and the denominator to the
  fraction bar is round about three times the bar thickness.
 \end_layout
 
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
 \begin_layout Subsection
 Canceled Formulas
 \begin_inset Index idx

lib/doc/Tutorial.lyx

@@ -5,25 +5,6 @@
 \save_transient_properties true
 \origin /systemlyxdir/doc/
 \textclass book
-\begin_preamble
-% DO NOT ALTER THIS PREAMBLE!!!
-%
-%This preamble is designed to ensure that the document prints
-% out as advertised. If you mess with this preamble,
-% parts of the document may not print out as expected.  If you
-% have problems LaTeXing this file, please contact 
-% the documentation team
-% email: lyx-docs@lists.lyx.org
-
-% the pages of the TOC is numbered roman
-% and a pdf-bookmark for the TOC is added
-\let\myTOC\tableofcontents
-\renewcommand\tableofcontents{%
-  \frontmatter
-  \pdfbookmark[1]{\contentsname}{}
-  \myTOC
-  \mainmatter }
-\end_preamble
 \use_default_options false
 \begin_modules
 logicalmkup
@@ -59,7 +40,7 @@ logicalmkup
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen true
 \pdf_bookmarksopenlevel 1
-\pdf_breaklinks false
+\pdf_breaklinks true
 \pdf_pdfborder false
 \pdf_colorlinks true
 \pdf_backref false
@@ -160,7 +141,7 @@ Welcome to \SpecialChar LyX
 This manual is designed for all of you who have never heard of \SpecialChar LaTeX
 , or do not
  know it very well.
- Now, do not panic - you will not need to learn \SpecialChar LaTeX
+ Now, do not panic – you will not need to learn \SpecialChar LaTeX
  to use \SpecialChar LyX
 .
  That is, after all, the whole point of \SpecialChar LyX
@@ -458,6 +439,10 @@ Notes
 
  If you want to cheat, or check what you have done, there is also a file
  called
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
 example_lyxified.lyx
 \family default
@@ -549,28 +534,6 @@ arg   "buffer-view"
  \SpecialChar LyX
  will open a PDF-viewer program displaying your document as it will look
  when printed.
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-You can save time by leaving the PDF-viewer running in the background.
- Then, you can use 
-\family sans
-Document\SpecialChar menuseparator
-Update
-\family default
- or the toolbar button 
-\begin_inset Info
-type  "icon"
-arg   "buffer-update"
-\end_inset
-
- and just click on the PDF-viewer window (or unminimize it) afterwards.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Itemize
@@ -588,6 +551,42 @@ Export
 Congratulations! You have written your first \SpecialChar LyX
  document.
  All of the rest is just details.
+\begin_inset Newline newline
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+A hint:
+\series default
+ You can save time by leaving the PDF viewer running in the background.
+ Under MacOS and Linux you can use 
+\family sans
+Document\SpecialChar menuseparator
+Update
+\family default
+ or the toolbar button 
+\begin_inset Info
+type  "icon"
+arg   "buffer-update"
+\end_inset
+
+ and just click on the PDF viewer window afterwards.
+ Under Windows still use 
+\family sans
+Document\SpecialChar menuseparator
+View
+\family default
+ or 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
+\end_inset
+
+ respectively.
 \end_layout
 
 \begin_layout Subsection
@@ -889,7 +888,7 @@ Space
 \family sans
 Tab
 \family default
- has no grammatical function at all - so \SpecialChar LyX
+ has no grammatical function at all – so \SpecialChar LyX
  does not support it.
  Using \SpecialChar LyX
 , you will spend more of your time worrying about the 
@@ -1391,12 +1390,17 @@ Subsubsection
  and note how the other section numbers are updated.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
 \series default
 : Fix the section and subsection headings in
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
 example_raw.lyx
 \family default
@@ -1686,7 +1690,8 @@ Space
 s.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
@@ -1766,7 +1771,8 @@ User's Guide
  environments.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
@@ -1781,6 +1787,10 @@ Quote, \SpecialChar LyX
 Verse
 \family default
  in
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
 example_raw.lyx
 \end_layout
@@ -2261,6 +2271,13 @@ Templates can be a huge time-saver, and we urge you to use them whenever
  a letter template customized for their company, for example.
 \end_layout
 
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
 \begin_layout Section
 Document Titles
 \end_layout
@@ -2318,7 +2335,8 @@ Abstract
  page, like the first page of this tutorial.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
@@ -2421,7 +2439,11 @@ Place the cursor somewhere in Section
 \end_layout
 
 \begin_layout LyX-Code
-If you want to know more about this document, then see Section .
+If you want to know more about this document,
+\begin_inset Newline newline
+\end_inset
+
+then see Section .
 \end_layout
 
 \begin_layout Standard
@@ -2693,7 +2715,8 @@ reference "sec:Document-Classes"
 
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
@@ -2871,7 +2894,8 @@ Change your \SpecialChar LyX
  again to see what the margin note looks like.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
@@ -3063,7 +3087,8 @@ User's Guide
  for details.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise:
@@ -3175,7 +3200,8 @@ To get rid of the Table of Contents, you can delete the table of contents
  button just like any other text.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
@@ -3225,8 +3251,11 @@ Somewhere in your \SpecialChar LyX
 \end_layout
 
 \begin_layout LyX-Code
-I like what Einstein said, E=mc^2, because it is so simple.
+I like what Einstein said, E=mc^2, because it is
+\begin_inset Newline linebreak
+\end_inset
 
+so simple.
 \end_layout
 
 \begin_layout Standard
@@ -3519,7 +3548,7 @@ _
 \begin_inset Quotes erd
 \end_inset
 
- .
+.
  You can subscript and superscript both subscripts and superscripts like
  this: 
 \begin_inset Formula $A_{a_{0}+b^{2}}+C^{a_{0}+b^{2}}$
@@ -3529,12 +3558,17 @@ _
  
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
 \series default
-: Put equation 1 of 
+: Put equation
+\begin_inset space ~
+\end_inset
+
+1 of 
 \family typewriter
 example_raw.lyx
 \family default
@@ -3869,12 +3903,17 @@ Down
  
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
 \series default
-: Put equation 2 of 
+: Put equation
+\begin_inset space ~
+\end_inset
+
+2 of 
 \family typewriter
 example_raw.lyx
 \family default
@@ -4052,12 +4091,17 @@ The function list includes other trigonometric functions and their inverses,
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
 \series default
-: Put equation 3 of 
+: Put equation
+\begin_inset space ~
+\end_inset
+
+3 of 
 \family typewriter
 example_raw.lyx
 \family default
@@ -4200,11 +4244,7 @@ arg   "math-display"
 
  in the 
 \family sans
-Math
+Math Toolbar
-\begin_inset space ~
-\end_inset
-
-Toolbar
 \family default
 .
  This centers the formula and adds a blank line before and after it.
@@ -4262,7 +4302,8 @@ after
  paragraph settings, which is probably not what you want.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
@@ -4274,7 +4315,8 @@ example_raw.lyx
  into display mode, and see how they are typeset differently.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercise
@@ -4626,8 +4668,7 @@ Anything that you enter in \SpecialChar TeX
  by choosing 
 \family sans
 Insert\SpecialChar menuseparator
-\SpecialChar TeX
+TeX
-
 \begin_inset space ~
 \end_inset
 
@@ -4798,8 +4839,7 @@ You can import a \SpecialChar LaTeX
 \family sans
 File\SpecialChar menuseparator
 Import\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX
-
 \begin_inset space ~
 \end_inset
 
@@ -4914,8 +4954,7 @@ You might wish to convert a \SpecialChar LyX
 \family sans
 File\SpecialChar menuseparator
 Export\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX
-
 \family default
 .
  This will create a file 
@@ -4979,8 +5018,7 @@ If you have special commands to put in the preamble of a \SpecialChar LaTeX
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX
-
 \begin_inset space ~
 \end_inset
 
@@ -5015,8 +5053,7 @@ List
 \end_inset
 
 TOC\SpecialChar menuseparator
-Bib\SpecialChar TeX
+BibTeX
-
 \begin_inset space ~
 \end_inset
 

lib/doc/UserGuide.lyx

@@ -3148,7 +3148,7 @@ IOP
 
 \begin_layout Standard
 If there is a document class you would like to use that is marked as 
-\begin_inset Quotes erd
+\begin_inset Quotes eld
 \end_inset
 
 Unavailable
@@ -4157,19 +4157,19 @@ Default
 \begin_layout Itemize
 
 \family sans
-A0 - A6
+A0 – A6
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-B0 - B6
+B0 – B6
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-C0 - C6
+C0 – C6
 \end_layout
 
 \begin_layout Itemize
@@ -4181,7 +4181,7 @@ US letter, US legal, US executive
 \begin_layout Itemize
 
 \family sans
-JIS B0 - JIS B6
+JIS B0 – JIS B6
 \end_layout
 
 \begin_layout Itemize
@@ -4625,7 +4625,7 @@ begin{
 \emph on
 environment
 \emph default
-} ...
+} \SpecialChar ldots
  
 \backslash
 end{
@@ -12276,8 +12276,8 @@ You shouldn't use forced line breaks to correct \SpecialChar LaTeX
 's line breaking, as \SpecialChar LaTeX
  is
  very good at line breaking.
- There are, however, a number of situations where it is necessaryactively
+ There are, however, a number of situations where it is necessary to set
- to set a line break, for example, in a poem or for an address (see sections
+ a line break actively, for example, in a poem or for an address (see sections
 \begin_inset space ~
 \end_inset
 
@@ -17053,15 +17053,7 @@ Text
 
 
 \family default
- Use quotes like 
+ Use quotes like ”this”
-\begin_inset Quotes sld
-\end_inset
-
-this
-\begin_inset Quotes srd
-\end_inset
-
-
 \end_layout
 
 \begin_layout Labeling
@@ -26100,7 +26092,6 @@ arg   "label-insert"
  A gray label box like this: 
 \begin_inset Graphics
 	filename clipart/label.png
-	scale 85
 
 \end_inset
 
@@ -26174,7 +26165,6 @@ arg   "dialog-show-new-inset ref"
  A gray cross-reference box like this: 
 \begin_inset Graphics
 	filename clipart/reference.png
-	scale 85
 
 \end_inset
 
@@ -31019,7 +31009,11 @@ Modules
 \begin_inset Quotes eld
 \end_inset
 
+
+\emph on
 Custom Header/Footerlines
+\emph default
+
 \begin_inset Quotes erd
 \end_inset
 
@@ -31028,7 +31022,7 @@ Custom Header/Footerlines
 \begin_inset space ~
 \end_inset
 
-styles:
+environments:
 \end_layout
 
 \begin_layout Description
@@ -31081,6 +31075,7 @@ Footer
 
 \begin_layout Standard
 for the different positions in the header/footer.
+ These environments can be selected in the environment pull-down box.
 \end_layout
 
 \begin_layout Standard
@@ -31328,12 +31323,13 @@ Definition
 \end_layout
 
 \begin_layout Standard
-To define your header line, add all three header styles.
+To define your header line, add all three header environments.
- The things you add to the styles appear on odd numbered pages, the things
+ The things you add to each environment appear on odd numbered pages, the
- in the optional arguments on even numbered pages.
+ things in the optional arguments on even numbered pages.
  For single-sided documents, the optional arguments will not be used and
  can be omitted.
- If you leave a style or its argument empty, nothing appears in the output.
+ If you leave a header environment or its argument empty, nothing appears
+ in the output.
  Defining the footer line works similarly.
 \end_layout
 
@@ -31425,8 +31421,8 @@ Appearance
 \begin_layout Standard
 The header and footer will appear on normal pages.
  Some pages are different.
- The title page has a style of its own, and so does any page that starts
+ The title page has a header/footer environment of its own, and so does
- a new part or chapter in your book.
+ any page that starts a new part or chapter in your book.
  Such pages will not have the custom headers/footers, but that is normal.
  There is for example no need to print a header with the chapter name on
  the chapter page where the chapter heading is in big bold letters anyway.
@@ -31470,12 +31466,16 @@ headrulewidth}{thickness}
 \begin_layout Standard
 where thickness is a size in standard units like 
 \family sans
+\emph on
 pt
 \family default
+\emph default
  or 
 \family sans
+\emph on
 mm
 \family default
+\emph default
 .
  If you don't want a line, set the thickness to 0
 \begin_inset space \thinspace{}
@@ -31507,7 +31507,7 @@ Several header/footer lines
 
 \begin_layout Standard
 In case you need more than one text line as a header/footer, you can do
- this by adding a normal line break in the style definition.
+ this by adding a ragged line break in the style definition.
  However, the default height of the header/footer is only the one of one
  text line.
  To expand the height, redefine the \SpecialChar LaTeX
@@ -31523,7 +31523,7 @@ headheight
 \backslash
 footheight
 \series default
- in this entry in 
+ with this entry in 
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
@@ -31547,14 +31547,34 @@ headheight}{height}
 \end_layout
 
 \begin_layout Standard
-where height is a size in standard units.
+where 
- If you don't know which amount of space is needed for the height, define
+\series bold
- your header/footer and preview your document as a PDF.
+height
+\series default
+ is a size in standard units (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+
+\series bold
+1cm
+\series default
+).
+ If you don't know how much space is needed for the height, define your
+ header/footer and preview your document as a PDF.
  Then open the \SpecialChar LaTeX
  logfile with the menu 
 \family sans
 Document\SpecialChar menuseparator
-LaTeX Log
+LaTeX
+\begin_inset space ~
+\end_inset
+
+Log
 \family default
  and use the button 
 \family sans
@@ -32486,10 +32506,10 @@ Find
  When searching for a formula, it is found both when it is alone and when
  it occurs in sub-formulas and nested parts of sub-formulas.
  For example the mentioned segments would be found in something like 
-\begin_inset Formula $\frac{x^{2}}{\sqrt{\frac{x^{2}}{1+x^{2}}}}.$
+\begin_inset Formula $\frac{x^{2}}{\sqrt{\frac{x^{2}}{1+x^{2}}}}$
 \end_inset
 
-
+.
 \end_layout
 
 \begin_layout Subsubsection
@@ -44682,7 +44702,7 @@ prefix The TEXINPUTS environment variable allows you to use external files
  Note that any non-absolute path listed in the TEXINPUTS prefix is considered
  to be relative to the directory of your \SpecialChar LyX
  file.
- It is recommended that you always include ‘.' as one of the paths; otherwise
+ It is recommended that you always include '.' as one of the paths; otherwise
  compilation may fail for some documents.
 \end_layout
 

lib/doc/de/Additional.lyx

@@ -68,7 +68,7 @@ shapepar
 \pdf_bookmarksopen false
 \pdf_bookmarksopenlevel 1
 \pdf_breaklinks false
-\pdf_pdfborder true
+\pdf_pdfborder false
 \pdf_colorlinks true
 \pdf_backref false
 \pdf_pdfusetitle false
@@ -327,50 +327,7 @@ Einst nannten wir \SpecialChar LyX
 \begin_inset Quotes gld
 \end_inset
 
-WYSIWYM
+WYSIWYM-Oberfläche für \SpecialChar LaTeX
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-What You See Is What You Mean
-\lang ngerman
- 
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-HHa: Der Text wurde von \SpecialChar LyX
- unterstrichen, weil er als englisch markiert wurde
- (
-\family sans
-Bearbeiten\SpecialChar menuseparator
-Textstil\SpecialChar menuseparator
-Benutzerdefiniert\SpecialChar menuseparator
-Sprache
-\family default
- oder 
-\begin_inset Graphics
-	filename ../../images/dialog-show_character.png
-	scale 70
-	BoundingBox 0bp 6bp 20bp 20bp
-
-\end_inset
-
-).
- Das hat bei der Rechtschreibprüfung den Vorteil, dass er dann übergangen
- wird.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
--Oberfläche für \SpecialChar LaTeX
 
 \begin_inset Quotes grd
 \end_inset
@@ -482,32 +439,6 @@ Dokument\SpecialChar menuseparator
 Aktualisieren
 \end_layout
 
-\begin_layout Itemize
-
-\family sans
-Datei\SpecialChar menuseparator
-Drucken
-\family default
- (
-\family sans
-Strg+P
-\family default
- oder 
-\begin_inset Info
-type  "icon"
-arg   "dialog-show print"
-\end_inset
-
- )
-\end_layout
-
-\begin_layout Itemize
-
-\family sans
-Datei\SpecialChar menuseparator
-Faxen
-\end_layout
-
 \begin_layout Standard
 \SpecialChar LaTeX
  wird nur gestartet, wenn die Datei seit dem letzten \SpecialChar LaTeX
@@ -557,19 +488,9 @@ Wenn \SpecialChar LaTeX
  mit 
 \family sans
 Ansicht\SpecialChar menuseparator
-DVI (Strg+D
+DVI 
 \family default
- oder 
+gestartet wurde, wird \SpecialChar LyX
-\begin_inset Info
-type  "icon"
-arg   "buffer-view dvi"
-\end_inset
-
-
-\family sans
-)
-\family default
- gestartet wurde, wird \SpecialChar LyX
  dann den DVI-Betrachter mit der 
 \family typewriter
 .dv
@@ -590,17 +511,7 @@ Anzeigeprogramm
  Wenn Sie 
 \family sans
 Ansicht\SpecialChar menuseparator
-Postscript (Strg+T 
+Postscript
-\family default
-oder 
-\begin_inset Info
-type  "icon"
-arg   "buffer-view ps"
-\end_inset
-
-
-\family sans
-)
 \family default
  oder 
 \family sans
@@ -779,14 +690,9 @@ Mit
 \family sans
 Datei\SpecialChar menuseparator
 Importieren\SpecialChar menuseparator
-LaTeX\SpecialChar ldots
+LaTeX
-
 \family default
-
+ können Sie eine \SpecialChar LaTeX
-\begin_inset space \space{}
-\end_inset
-
-können Sie eine \SpecialChar LaTeX
 -Datei nach \SpecialChar LyX
  importieren.
  Dadurch wird ein Programm namens 
@@ -1445,8 +1351,7 @@ Die Befehle, die \SpecialChar LyX
 Wählen Sie 
 \family sans
 Dokument\SpecialChar menuseparator
-Einstellungen\SpecialChar ldots
+Einstellungen\SpecialChar menuseparator
-\SpecialChar menuseparator
 LaTeX-Vorspann.
 
 \family default
@@ -1872,13 +1777,12 @@ LaTeX-Protokoll
 \end_layout
 
 \begin_layout Itemize
-
-\family typewriter
 \begin_inset Quotes gld
 \end_inset
 
-\SpecialChar LaTeX
+
- Warning:
+\family typewriter
+LaTeX Warning:
 \family default
 
 \begin_inset Quotes eld
@@ -1918,8 +1822,7 @@ Sie können sie weitgehend ignorieren.
 
 
 \family typewriter
-\SpecialChar LaTeX
+LaTeX Font Warning:
- Font Warning:
 \family default
 
 \begin_inset Quotes grd
@@ -2071,9 +1974,8 @@ Dies Warnungen erscheinen bei Problemen mit dem Seitenumbruch.
 \begin_inset Quotes gld
 \end_inset
 
- 
+LaTeX
 \family typewriter
-\SpecialChar LaTeX
  Error: File 
 \begin_inset Quotes els
 \end_inset
@@ -2168,8 +2070,7 @@ usepackage{}
 
 
 \family typewriter
-\SpecialChar LaTeX
+LaTeX Error: Unknown option
- Error: Unknown option
 \family default
 
 \begin_inset Quotes grd
@@ -8580,20 +8481,10 @@ Das erste, was Sie eingeben müssen, sind die Informationen für den Titel.
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\family sans
-
+\begin_inset Flex Multiple Columns
-
+status open
-\backslash
-begin{multicols}{3}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -8672,17 +8563,6 @@ ed
 .
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -8819,20 +8699,10 @@ paper (A&A)
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\family sans
-
+\begin_inset Flex Multiple Columns
-
+status open
-\backslash
-begin{multicols}{3}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -8906,17 +8776,6 @@ Literaturliste
 LaTeX
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -8940,20 +8799,10 @@ paper (A&A)
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\family typewriter
-
+\begin_inset Flex Multiple Columns
-
+status open
-\backslash
-begin{multicols}{3}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -9019,17 +8868,6 @@ object{}
 titlerunning{}
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -13171,8 +13009,7 @@ Der größte Vorteil der neuen Klasse ist jedoch ihre Flexibilität, denn das
 -Vorspanns (
 \family sans
 Dokument\SpecialChar menuseparator
-Einstellungen\SpecialChar ldots
+Einstellungen\SpecialChar menuseparator
-\SpecialChar menuseparator
 LaTeX-Vorspann)
 \family default
  oder mittels einer speziellen Stildatei (einer sogenannten 
@@ -13946,8 +13783,7 @@ name "Folien-Start"
 Als erstes müssen Sie im Dialogfeld 
 \family sans
 Dokument\SpecialChar menuseparator
-Einstellungen\SpecialChar ldots
+Einstellungen\SpecialChar menuseparator
-\SpecialChar menuseparator
 Dokumentklasse
 \family default
  die 
@@ -14180,20 +14016,8 @@ slides
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Multiple Columns
-status collapsed
+status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{4}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -14261,17 +14085,6 @@ LyX-Code
 Kommentar
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -14291,20 +14104,8 @@ Dafür gibt es folgende neue Umgebungstypen:
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Multiple Columns
-status collapsed
+status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{3}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -14334,19 +14135,23 @@ Unsichtbarer Text
 
 \family sans
 SichtbarerText
+\family default
+
+\begin_inset Separator latexpar
+\end_inset
+
+
 \end_layout
 
-\begin_layout Standard
+\begin_deeper
-\begin_inset ERT
-status collapsed
-
 \begin_layout Plain Layout
+\begin_inset space ~
+\end_inset
 
 
-\backslash
-end{multicols}
 \end_layout
 
+\end_deeper
 \end_inset
 
 
@@ -15482,9 +15287,9 @@ reference "Folien-mit-slides"
 \family sans
 foils
 \family default
--Klasse (
+-Klasse
 \family sans
-slides (FoilTeX))
+ FoilTeX
 \family default
  nicht an, ist das entsprechende \SpecialChar LaTeX
 -Paket vermutlich nicht auf Ihrem Rechner
@@ -15500,9 +15305,13 @@ slides (default)
 Die \SpecialChar LyX
 -Dokumentklasse 
 \family sans
-slides (FoilTeX)
+FoilTeX
 \family default
- basiert auf der Version 2.1 der Klassen\SpecialChar softhyphen
+ basiert auf der Version
+\begin_inset space ~
+\end_inset
+
+2.1 der Klassen\SpecialChar softhyphen
 datei 
 \family typewriter
 foils.cls
@@ -15519,8 +15328,7 @@ Zu Beginn
 Als erstes müssen Sie im Dialogfeld 
 \family sans
 Dokument\SpecialChar menuseparator
-Einstellungen\SpecialChar ldots
+Einstellungen\SpecialChar menuseparator
-\SpecialChar menuseparator
 Dokumentklasse
 \family default
  die 
@@ -15529,11 +15337,7 @@ Dokumentklasse
 \family default
  
 \family sans
-slides
+FoilTeX
-\begin_inset space ~
-\end_inset
-
-(FoilTeX)
 \family default
  auswählen.
  Einige zusätzliche Dinge sollten Sie zu den Einstellungsmöglichkeiten für
@@ -15564,7 +15368,23 @@ foils
 \end_layout
 
 \begin_layout Itemize
-Die Standardschriftgröße ist 20pt, alternativ sind 17pt, 15pt und 30pt möglich.
+Die Standardschriftgröße ist 20
+\begin_inset space \thinspace{}
+\end_inset
+
+pt, alternativ sind 17
+\begin_inset space \thinspace{}
+\end_inset
+
+pt, 15
+\begin_inset space \thinspace{}
+\end_inset
+
+pt und 30
+\begin_inset space \thinspace{}
+\end_inset
+
+pt möglich.
 \end_layout
 
 \begin_layout Itemize
@@ -15599,7 +15419,7 @@ A4
 Letter
 \family default
  sowie eine spezielle Größe für 35
-\begin_inset Formula $\,$
+\begin_inset space \thinspace{}
 \end_inset
 
 mm Dias.
@@ -15781,7 +15601,8 @@ s
  anlegen.
  Diese Option sagt 
 \family sans
-FoilTeX
+Foil\SpecialChar TeX
+
 \family default
 , den dvips-Treiber zu verwenden, um Seiten, die im Querformat gesetzt werden
  sollen, zu drehen.
@@ -15827,7 +15648,8 @@ foils
 -Klasse unterstützt.
  Außerdem bietet 
 \family sans
-FoilTeX
+Foil\SpecialChar TeX
+
 \family default
  eine Reihe zusätzlicher Typen, und ein paar weitere werden von \SpecialChar LyX
  hinzugefügt.
@@ -15835,20 +15657,8 @@ FoilTeX
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Multiple Columns
-status collapsed
+status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{4}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -15989,17 +15799,6 @@ Beschriftung
 Kommentar
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -16014,27 +15813,12 @@ gebungen.
  und Inhalt darstellen, gibt es für derartige Aufteilungen spezielle Befehle
  in 
 \family sans
-FoilTeX
+Foil\SpecialChar TeX
+
 \family default
 , die neue Folien beginnen:
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{4}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
 \begin_layout Itemize
 
 \family sans
@@ -16047,44 +15831,12 @@ head
 Rotatehead
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
 \begin_layout Standard
 \noindent
 Außerdem bietet \SpecialChar LyX
  leicht abgeänderte Versionen dieser Umgebungen:
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{3}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
 \begin_layout Itemize
 
 \family sans
@@ -16097,22 +15849,6 @@ Shorthead
 ShortRotatehead
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
 \begin_layout Standard
 \noindent
 Die Unterschiede zwischen diesen beiden Typen werden im nächsten Abschnitt
@@ -16129,20 +15865,8 @@ FoilTeX
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Multiple Columns
-status collapsed
+status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{4}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -16210,24 +15934,6 @@ Proposition*
 Definition*
 \end_layout
 
-\begin_layout Standard
-\begin_inset space ~
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -16240,22 +15946,6 @@ Die Umgebungen mit einem Stern am Ende des Namens sind nicht nummeriert.
  noch zwei Aufzählungstypen hinzu:
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{4}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
 \begin_layout Itemize
 
 \family sans
@@ -16268,27 +15958,12 @@ TickList
 CrossList
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
 \begin_layout Standard
 \noindent
 
 \family sans
-FoilTeX
+Foil\SpecialChar TeX
+
 \family default
  bietet einige sehr mächtige Befehle, um Kopf- und Fußzeilen für die Folien
  zu erzeugen, die Sie am besten im \SpecialChar LaTeX
@@ -16302,28 +15977,12 @@ Foilhead
 \end_layout
 
 \begin_layout Standard
-Hierfür gibt es die folgende Befehle [
+Hierfür gibt es die folgende Befehle:
-\shape smallcaps
-Martin Vermeer
-\shape default
-]:
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Multiple Columns
-status collapsed
+status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{4}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -16378,7 +16037,7 @@ Header
 \end_layout
 
 \begin_deeper
-\begin_layout Standard
+\begin_layout Plain Layout
 \begin_inset space ~
 \end_inset
 
@@ -16386,17 +16045,6 @@ Header
 \end_layout
 
 \end_deeper
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -16406,7 +16054,8 @@ end{multicols}
 \noindent
 Außerdem gibt es noch eine Reihe von Befehlen in 
 \family sans
-FoilTeX
+Foil\SpecialChar TeX
+
 \family default
 , die von \SpecialChar LyX
  nicht direkt unterstützt werden.
@@ -16437,8 +16086,7 @@ Foils.lyx
 , wenn Sie im Dialog 
 \family sans
 Datei\SpecialChar menuseparator
-Öffnen\SpecialChar ldots
+Öffnen
-
 \family default
  auf den Knopf 
 \family sans
@@ -16629,8 +16277,7 @@ FoilTeX
  Falls Sie die Platzierung der Gleitobjekte verändert haben (
 \family sans
 Dokument\SpecialChar menuseparator
-Einstellungen\SpecialChar ldots
+Einstellungen
-
 \family default
 ), so wird dies ignoriert.
 \end_layout

lib/doc/de/Customization.lyx

@@ -4857,16 +4857,7 @@ Format
  Any format is acceptable, but one would normally use the format current
  at the time.
  (In \SpecialChar LyX
- 2.1, the current layout format is 48.) You should be aware that local
+ 2.2, the current layout format is 60.)
- layout is not supported by versions of \SpecialChar LyX
- prior to 1.6, so you should not
- use it if you want to be able to export your document to \SpecialChar LyX
- 1.5 or earlier
- (without, that is, losing the local layout information).
- If you wish to be able to export to 1.6—local layout is supported in 1.6,
- though there is no UI for it—then you should use format 11 and, of course,
- use only layout constructs that were available in \SpecialChar LyX
- 1.6.
 \end_layout
 
 \begin_layout Standard
@@ -5061,8 +5052,7 @@ myclass.layout
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass{report}
-Class{report}
 \end_layout
 
 \begin_layout Standard
@@ -5074,8 +5064,7 @@ to read
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass[report, myclass.sty]{report (myclass)}
-Class[report, myclass.sty]{report (myclass)}
 \end_layout
 
 \begin_layout Standard
@@ -5296,7 +5285,7 @@ DeclareLyXModule{My Package}
 \end_layout
 
 \begin_layout LyX-Code
-Format 35
+Format 60
 \begin_inset Newline newline
 \end_inset
 
@@ -5448,8 +5437,7 @@ thesis.layout
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass[thesis,book]{thesis}
-Class[thesis,book]{thesis}
 \end_layout
 
 \begin_layout Standard
@@ -6519,7 +6507,7 @@ Format
 
  behandelt.
  Das Format dieser \SpecialChar LyX
--Version ist 59.
+-Version ist 60.
  Aber jede \SpecialChar LyX
 -Version kann ältere Versionen von Layout-Dateien lesen, so wie
  es ältere \SpecialChar LyX
@@ -16902,11 +16890,7 @@ end
 status collapsed
 
 \begin_layout Plain Layout
-
+LyxType
-\family sans
-LyX
-\family default
-Type
 \end_layout
 
 \end_inset
@@ -16939,6 +16923,26 @@ status collapsed
 0
 \end_layout
 
+\end_inset
+
+ und 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ automatisch auf 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+1
+\end_layout
+
 \end_inset
 
  gesetzt.
@@ -16960,6 +16964,26 @@ status collapsed
 1
 \end_layout
 
+\end_inset
+
+ oder 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ auf 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+0
+\end_layout
+
 \end_inset
 
  für 
@@ -16981,11 +17005,7 @@ nach
 status collapsed
 
 \begin_layout Plain Layout
-
+LyxType
-\family sans
-LyX
-\family default
-Type
 \end_layout
 
 \end_inset

lib/doc/de/EmbeddedObjects.lyx

@@ -24783,8 +24783,6 @@ Marke
 \begin_layout Standard
 \begin_inset Graphics
 	filename clipart/Marke.png
-	lyxscale 80
-	scale 50
 	scaleBeforeRotation
 
 \end_inset
@@ -24813,8 +24811,6 @@ arg   "dialog-show-new-inset ref"
 \begin_layout Standard
 \begin_inset Graphics
 	filename clipart/Querverweis.png
-	lyxscale 80
-	scale 50
 	scaleBeforeRotation
 
 \end_inset
@@ -31011,19 +31007,27 @@ sideways false
 status open
 
 \begin_layout Plain Layout
-\begin_inset ERT
+\noindent
-status collapsed
+\align center
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename ../clipart/without_fntright.pdf
 	width 100col%
@@ -31032,12 +31036,6 @@ framebox{
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -31086,19 +31084,27 @@ sideways false
 status open
 
 \begin_layout Plain Layout
-\begin_inset ERT
+\noindent
-status collapsed
+\align center
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename ../clipart/with_fntright.pdf
 	width 100col%
@@ -31107,12 +31113,6 @@ framebox{
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -31238,32 +31238,33 @@ status open
 
 \begin_layout Plain Layout
 \align center
-\begin_inset ERT
+\begin_inset Box Boxed
-status collapsed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename ../clipart/endnotes.pdf
+	width 100col%
 	scaleBeforeRotation
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset

lib/doc/de/Math.lyx

@@ -34086,6 +34086,35 @@ Maxima
 \end_inset
 
 
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Achtung:
+\series default
+ Es muss die Einfügung für automatische Klammern 
+\begin_inset Formula $\left(\right)$
+\end_inset
+
+ verwendet werden statt einfacher zeichen für Klammern '(' ')'.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Itemize
@@ -34104,6 +34133,20 @@ Maxima
 \end_inset
 
 
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsection
@@ -34997,6 +35040,13 @@ Wie man sieht, entspricht der Abstand des Zählers und Nenners vom Strich
  in etwa der dreifachen Strichdicke.
 \end_layout
 
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
 \begin_layout Subsection
 Durchgestrichene Formeln
 \begin_inset Index idx

lib/doc/de/Tutorial.lyx

@@ -5,25 +5,6 @@
 \save_transient_properties true
 \origin /systemlyxdir/doc/de/
 \textclass book
-\begin_preamble
-% DO NOT ALTER THIS PREAMBLE!!!
-%
-%This preamble is designed to ensure that the document prints
-% out as advertised. If you mess with this preamble,
-% parts of the document may not print out as expected.  If you
-% have problems LaTeXing this file, please contact 
-% the documentation team
-% email: lyx-docs@lists.lyx.org
-
-% Die Seiten des Inhaltsverzeichnisses werden römisch numeriert,
-% ein PDF-Lesezeichen für das Inhaltsverzeichnis wird hinzugefügt
-\let\myTOC\tableofcontents
-\renewcommand\tableofcontents{%
-  \frontmatter
-  \pdfbookmark[1]{\contentsname}{}
-  \myTOC
-  \mainmatter }
-\end_preamble
 \use_default_options false
 \maintain_unincluded_children false
 \language ngerman
@@ -56,14 +37,14 @@
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen true
 \pdf_bookmarksopenlevel 1
-\pdf_breaklinks false
+\pdf_breaklinks true
 \pdf_pdfborder false
 \pdf_colorlinks true
 \pdf_backref false
 \pdf_pdfusetitle false
 \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
 \papersize a4paper
-\use_geometry true
+\use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
 \use_package cancel 0
@@ -87,10 +68,6 @@
 \shortcut idx
 \color #008000
 \end_index
-\leftmargin 3.5cm
-\topmargin 3.5cm
-\rightmargin 3.5cm
-\bottommargin 3.5cm
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
@@ -382,9 +359,9 @@ Dies ist nicht nötig.
 -Tricks für \SpecialChar LyX
  kennenlernen wollen, schauen Sie in
  \SpecialChar LyX
-' 
+’ 
 \emph on
-Eingebette Objekte
+Eingebettete Objekte
 \emph default
  Handbuch.
  Ansonsten kaufen Sie sich ein spezielles \SpecialChar LaTeX
@@ -452,7 +429,7 @@ n von \SpecialChar LyX
 \end_inset
 
  Falls Sie mehrere Dokumente gleichzeitig geöffnet haben, können Sie einfach
- über die Karteikarten, das Menü 
+ über die Registerkarten, das Menü 
 \family sans
 Ansicht
 \family default
@@ -509,7 +486,7 @@ beispiel_roh.lyx
 -Fähigkeiten hat.
  Immer wenn Sie neue Funktionen von \SpecialChar LyX
  kennenlernen, werden Sie aufgefordert,
- die entsprechenden Abschnitte in 
+ die entsprechenden Abschnitte in der Datei 
 \family typewriter
 beispiel_roh.lyx
 \family default
@@ -542,15 +519,11 @@ beispiel_gelyxt.lyx
 \begin_layout Standard
 Die Beispieldateien finden Sie im Verzeichnis 
 \family typewriter
-[Resources/]examples/de
+[Resources/]examp\SpecialChar softhyphen
+les/de
 \family default
  des \SpecialChar LyX
--In\SpecialChar softhyphen
+-Installationsordners.
-stal\SpecialChar softhyphen
-la\SpecialChar softhyphen
-tions\SpecialChar softhyphen
-ord\SpecialChar softhyphen
-ners.
  Laden Sie die nicht modifizierte Datei und verwenden Sie 
 \family sans
 Datei\SpecialChar menuseparator
@@ -647,45 +620,10 @@ arg   "buffer-view"
  \SpecialChar LyX
  wird einen PDF-Betrachter starten, der dann ein eigenes Fenster öffnet,
  in dem Sie den Text so sehen können, wie er später gedruckt aussehen wird.
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Sie können Zeit sparen, wenn Sie den PDF-Betrachter nicht jedes Mal neu
- starten, sondern nur das erste Mal, und das Programm dann im Hintergrund
- weiterlaufen lassen.
- Sie können dann den Menüpunkt 
-\family sans
-Ansicht\SpecialChar menuseparator
-Aktualisieren
-\family default
- wählen oder auf 
-\begin_inset Info
-type  "icon"
-arg   "buffer-update"
-\end_inset
-
- klicken und danach in das PDF-Betrachter-Fenster klicken, um die neue Version
- zu sehen.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Itemize
-Drucken Sie den Text aus: 
+Exportieren Sie das druckfertige Dokument mit 
-\family sans
-Datei\SpecialChar menuseparator
-Drucken
-\family default
- und dann auf 
-\family sans
-Drucken
-\family default
- klicken.
- Oder exportieren Sie es mit 
 \family sans
 Datei
 \family default
@@ -701,6 +639,50 @@ Exportieren
 Glückwunsch! Sie haben gerade Ihren ersten Text mit \SpecialChar LyX
  geschrieben und gedruckt.
  Alles andere sind nur noch Details.
+\begin_inset Newline newline
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+Ein Tipp:
+\series default
+ Sie können Zeit sparen, wenn Sie den PDF-Betrachter nicht jedes Mal neu
+ starten, sondern nur das erste Mal, und das Programm dann im Hintergrund
+ weiterlaufen lassen.
+ Sie können dann unter MacOS und Linux den Menüpunkt 
+\family sans
+Dokument\SpecialChar menuseparator
+Ansicht\SpecialChar menuseparator
+Aktualisieren
+\family default
+ wählen oder auf 
+\begin_inset Info
+type  "icon"
+arg   "buffer-update"
+\end_inset
+
+ klicken und danach in das PDF-Betrachter-Fenster klicken, um die neue Version
+ zu sehen.
+ Unter Windows verwenden Sie weiterhin den Menüpunkt 
+\family sans
+Dokument\SpecialChar menuseparator
+Ansicht
+\family default
+ bzw.
+\begin_inset space \space{}
+\end_inset
+
+ 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Subsection
@@ -727,7 +709,8 @@ Rückgängig \SpecialChar LyX
  Dies bedeutet, Sie können durch die wiederholte Auswahl von 
 \family sans
 Bearbeiten\SpecialChar menuseparator
-Rückgängig
+Rück\SpecialChar softhyphen
+gängig
 \family default
  oder einen Klick auf 
 \begin_inset Info
@@ -764,11 +747,8 @@ Derzeit ist das Rückgängig machen auf 100 Schritte beschränkt.
 \begin_layout Description
 Ausschneiden/Kopieren/Einfügen Benutzen Sie die Menüpunkte 
 \family sans
-Bear\SpecialChar softhyphen
+Bearbeiten\SpecialChar menuseparator
-beiten\SpecialChar menuseparator
+Ausschneiden 
-Aus\SpecialChar softhyphen
-schnei\SpecialChar softhyphen
-den 
 \family default
 (
 \begin_inset Info
@@ -908,8 +888,8 @@ einfügen
 \family default
  einfach anzuklicken.
  Wenn Sie den Mauszeiger eine kurze Zeit unbewegt über einem solchen Schalter
- positionieren, erscheint ein kleines hellgelbes Feld, das seine Funktion
+ positionieren, erscheint ein kleines Feld, das die Funktion beschreibt
- beschreibt (genannt 
+ (genannt 
 \emph on
 Tooltip
 \emph default
@@ -1064,11 +1044,12 @@ Umgebungen
 \end_layout
 
 \begin_layout Standard
-Derartige Umgebungen bilden den Hauptteil des WYSIWYM-Konzeptes von \SpecialChar LyX
+Derartige Umgebungen bilden den Hauptteil des WYSIWYM-Konzep\SpecialChar softhyphen
+tes von \SpecialChar LyX
 .
  Ein bestimmter Umgebungstyp verlangt eventuell bestimmte Einstellungen
  für Schriftgröße, Zeichensatz, Einzug, Zeilenabstand und so fort.
- Und das Problem wird teilweise noch verschlimmert: So verwendet vielleicht
+ Das Problem wird teilweise noch verschlimmert: So verwendet vielleicht
  eine Zeitschrift für ihre Titel eine 18-Punkt-Schrift in Fettdruck, zentriert
  gesetzt, eine andere verwendet kursive 15-Punkt-Schriften.
  Verschiedene Sprachen verwenden andere Standardeinstellungen für den Einzug.
@@ -1193,7 +1174,11 @@ Eingabe
 \end_layout
 
 \begin_layout LyX-Code
-Dies ist eine Einleitung für mein erstes \SpecialChar LyX
+Dies ist eine Einleitung für mein erstes
+\begin_inset Newline newline
+\end_inset
+
+\SpecialChar LyX
 -Dokument.
 \end_layout
 
@@ -1313,7 +1298,7 @@ Eingabe
 \end_layout
 
 \begin_layout LyX-Code
-Hier werden Abschnitte und Unterabschnitte erläutert.
+Hier werden Abschnitte und Unterabschnitte erklärt.
 \end_layout
 
 \begin_layout LyX-Code
@@ -1493,7 +1478,8 @@ Unterunterabschn
  sich die Nummerierung der folgenden Abschnitte ändert.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung:
@@ -1561,7 +1547,8 @@ Eine Präsentation auf Projektionsfolien könnte die
 \family sans
 Auflistung
 \family default
--Umgebung mit ihren durch unterschiedliche Symbole abgesetzten Listen verwenden,
+-Umge\SpecialChar softhyphen
+bung mit ihren durch unterschiedliche Symbole abgesetzten Listen verwenden,
  um verschiedene Punkte zu beschreiben.
 \end_layout
 
@@ -1635,7 +1622,11 @@ Der Textsatz wird automatisch erstellt.
 \end_layout
 
 \begin_layout LyX-Code
-Die Darstellung mathematischer Symbole ist im WYSIWYG-Format.
+Die Darstellung mathematischer Symbole ist im
+\begin_inset Newline newline
+\end_inset
+
+WYSIWYG-Format.
 \end_layout
 
 \begin_layout LyX-Code
@@ -1773,7 +1764,8 @@ Strg+Leertaste
 ) verbunden werden.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung
@@ -1863,7 +1855,8 @@ Benutzerhandbuch
  ausführlich beschrieben.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung
@@ -1988,7 +1981,11 @@ Einstellungen
 \SpecialChar menuseparator
 
 \family sans
-Dokumentklasse:
+Dokument-
+\begin_inset Newline linebreak
+\end_inset
+
+klasse
 \family default
 ), und sehen Sie sich an, auf welche Weise es dann gesetzt wird.
  Wenn Sie Ihr Dokument zum Beispiel in die Klasse 
@@ -2238,7 +2235,8 @@ Einstellungen
 \SpecialChar menuseparator
 
 \family sans
-Dokumentklasse
+Dokumentklas\SpecialChar softhyphen
+se
 \family default
  die Dokumentklasse 
 \family sans
@@ -2348,8 +2346,8 @@ Eine Vorlage ist eine ganz normale \SpecialChar LyX
  indem Sie die von Ihnen gewünschten Änderungen an der Vorlage durchführen
  und die Datei dann als Ihre Vorlage abspeichern.
  Für alle folgenden Briefe können Sie dann diese Version als Vorlage verwenden.
- Sie sollten das alles jetzt vielleicht einfach mal ausprobieren – schreiben
+ Sie sollten das alles jetzt vielleicht einfach mal ausprobieren.
- Sie doch als Übung einen kleinen Brief an jemanden!
+ Schreiben Sie doch als Übung einen kleinen Brief an jemanden!
 \end_layout
 
 \begin_layout Standard
@@ -2392,9 +2390,11 @@ Dokumenttitel
 \begin_layout Standard
 Wie auch \SpecialChar LaTeX
  betrachtet \SpecialChar LyX
- den Titelblock – der aus der eigentlichen Überschrift,
+ den Titelblock als einen eigenständigen Teil des Dokumente
- dem Namen des Autors, dem Datum und eventuell sogar dem Abstract eines
+s.
- Artikels bestehen kann – als einen eigenständigen Teil des Dokumentes.
+ Dieser kann aus der eigentlichen Überschrift, dem Namen des Autors, dem
+ Datum und eventuell sogar dem Abstract eines Artikels bestehen.
+ 
 \end_layout
 
 \begin_layout Standard
@@ -2452,7 +2452,8 @@ Abstract
  und betrachten dann das Ganze in der Vorschau.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung
@@ -2469,7 +2470,8 @@ Marken und Querverweise
 \end_layout
 
 \begin_layout Standard
-Sie können jedes Kapitel, Unterkapitel, Formel, Fußnote und Gleitobjekt
+Sie können jedes Kapitel, Unterkapitel, jede Formel, Fußnote und jedes Gleitobje
+kt
 \begin_inset Foot
 status collapsed
 
@@ -2489,8 +2491,8 @@ Eingebettete Objekte
 
  Ihres Dokumentes mit einer Marke versehen.
  Sie können dann in anderen Teilen Ihres Textes auf dieses Element verweisen.
- Sie können sich dabei wahlweise auf die Nummer des Kapitels oder auf die
+ Sie können sich dabei wahlweise auf die Nummer des Kapitels beziehen oder
- Seite im Text, auf der das besagte Kapitel steht, beziehen.
+ auf die Seite im Text, auf der das besagte Kapitel steht.
  Wie auch bei der Nummerierung von Abschnitten und Fußnoten kümmert sich
  \SpecialChar LyX
  um die korrekte Verwaltung dieser Querverweise.
@@ -2506,7 +2508,7 @@ Zu Beginn gleich ein praktisches Beispiel: Markieren Sie den zweiten Abschnitt
 \begin_inset Quotes gld
 \end_inset
 
-Was das Tutorium ist\SpecialChar ldots
+Was das Tutorium\SpecialChar ldots
 
 \begin_inset Quotes grd
 \end_inset
@@ -2600,8 +2602,8 @@ Sie hätten diese Marke übrigens genauso gut irgendwo anders im betreffenden
  Kapitel einfügen können, denn Verweise auf einen Abschnitt beziehen sich
  immer auf die Abschnittsnummer, die als letzte vor der Marke definiert
  ist.
- Dadurch, dass man sie gleich zu Beginn setzt, ist aber sichergestellt,
+ Wenn man sie gleich zu Beginn setzt, ist aber sichergestellt, dass auch
- dass auch Verweise auf die Seitennummer des Kapitels richtig sind.
+ Verweise auf die Seitennummer des Kapitels richtig sind.
 \end_layout
 
 \begin_layout Standard
@@ -2624,11 +2626,11 @@ Positionieren Sie nun den Cursor irgendwo im dritten Kapitel dieses Dokumentes
 \end_layout
 
 \begin_layout LyX-Code
-Wenn Sie mehr über dieses Dokument erfahren wollen,
+Wenn Sie mehr über dieses Dokument erfahren
 \begin_inset Newline newline
 \end_inset
 
-lesen Sie Abschnitt.
+wollen, lesen Sie Abschnitt.
 \end_layout
 
 \begin_layout Standard
@@ -2730,7 +2732,7 @@ Strg+V
 \begin_layout Standard
 \SpecialChar LyX
  stellt die Querverweise in einer grauen Schaltfläche dar, die an der aktuellen
- Cursors-Position eingefügt wird.
+ Cursor-Position eingefügt wird.
  Später, im ausgedruckten Dokument, werden diese Platzhalter durch die tatsächli
 chen Werte von Kapitel und Seitennummer ersetzt.
  Sehen Sie sich Ihren Text in der Vorschau an, und Sie werden feststellen,
@@ -2831,12 +2833,17 @@ Querverweis
  haben.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung:
 \series default
  Korrigieren Sie die Querverweise in der Datei
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
 beispiel_roh.lyx
 \family default
@@ -2880,9 +2887,11 @@ Nummer
 \end_layout
 
 \begin_layout LyX-Code
-\SpecialChar LyX
+LyX ist eine Textverarbeitung, die den Schriftsatz
- ist eine Textverarbeitung, die den Schriftsatz be\SpecialChar softhyphen
+\begin_inset Newline newline
-herrscht.
+\end_inset
+
+beherrscht.
 \end_layout
 
 \begin_layout Standard
@@ -2947,7 +2956,8 @@ Kopieren
 \family default
 .
  Sie können auch einfach gewöhnlichen, bereits geschriebenen Text in eine
- Fußnote umwandeln, indem Sie ihn markieren und dann die Fußnoten-Schaltfläche
+ Fußnote umwandeln, indem Sie ihn markieren und dann die Fußnoten-Schalt\SpecialChar softhyphen
+fläche
  anklicken.
  Umgekehrt können Sie eine Fußnote in gewöhnlichen Text umwandeln, indem
  Sie den Cursor vor den Fußnotentext stellen und die Rücktaste (
@@ -3001,12 +3011,17 @@ Wandeln Sie normalen Text in eine Randnotiz.
  
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung
 \series default
 : Korrigieren Sie die Fußnoten in der Datei
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
 beispiel_roh.lyx
 \family default
@@ -3042,7 +3057,7 @@ Gehen Sie zum Ende des Dokumentes und wechseln Sie in den Umgebungstyp
 Literaturverzeichnis
 \family default
 .
- Jeder Absatz, den Sie von jetzt ab eingeben, wird eine Referenz.
+ Jeder Absatz, den Sie von nun an eingeben, wird eine Referenz.
  Sie sehen, dass \SpecialChar LyX
  automatisch eine Nummer in einem Rahmen vor die Referenz
  setzt.
@@ -3179,7 +3194,8 @@ Benutzerhandbuch
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung:
@@ -3209,15 +3225,16 @@ vor
 \family sans
 Einfügen\SpecialChar menuseparator
 Liste
-\begin_inset space \space{}
+\begin_inset space \thinspace{}
 \end_inset
 
 /
-\begin_inset space \space{}
+\begin_inset space \thinspace{}
 \end_inset
 
 Inhaltsverzeichnis\SpecialChar menuseparator
-Inhaltsverzeichnis
+Inhaltsver\SpecialChar softhyphen
+zeichnis
 \family default
 .
  Der Schriftzug 
@@ -3275,15 +3292,19 @@ Um ein Inhaltsverzeichnis zu löschen, können Sie den Platzhalter ganz einfach
  markieren und wie jedes gewöhnliche Zeichen löschen.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung
 \series default
 : Korrigieren Sie das Inhaltsverzeichnis in der Datei
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
-beispiel_roh.
+beispiel_roh.lyx
- lyx
 \family default
 .
 \end_layout
@@ -3308,13 +3329,16 @@ Mathematische Ausdrücke
  alle gebräuchlichen mathematischen \SpecialChar LaTeX
 -Befehle wie gewohnt eingegeben werden
  können, doch in \SpecialChar LyX
- werden sie in einer WYSIWYM-Art auch angezeigt! Andererseits
+ werden sie in einer WYSIWYM-Art auch angezeigt! Des Weiteren
  ermöglicht die Tafel der Mathematiksymbole
 \family sans
 ,
 \family default
- dass man professionell aussehende mathematische Ausdrücke schnell und leicht
+ dass man professionell aussehende mathematische Ausdrücke schnell und
- schreiben kann, auch wenn man noch nie \SpecialChar LaTeX
+\begin_inset Newline linebreak
+\end_inset
+
+leicht schreiben kann, auch wenn man noch nie \SpecialChar LaTeX
  benutzt hat.
 \begin_inset Foot
 status collapsed
@@ -3347,15 +3371,11 @@ Schreibe Sie irgendwo in Ihrem \SpecialChar LyX
 \end_layout
 
 \begin_layout LyX-Code
-Ich liebe, was Einstein sagte, E=mc^2, weil es so einfach
+Ich liebe, was Einstein sagte, E=mc^2, weil es so
 \begin_inset Newline newline
 \end_inset
 
-ist.
+einfach ist.
-\begin_inset Formula $öl$
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -3392,7 +3412,8 @@ arg   "math-mode"
  umrahmt wird.
  Das purpurrote Kästchen zeigt an, dass man im Mathe-Editor ist.
  Außerdem erscheint am unteren Rand eine weitere Werkzeugleiste zur Eingabe
- von Mathe-Symbolen und -Konstrukten.
+ von Mathe-Symbolen und -Konstruk\SpecialChar softhyphen
+ten.
 \end_layout
 
 \begin_layout Standard
@@ -3409,7 +3430,7 @@ arg   "math-mode"
 
 .
  Die Formel wird nun in blauer Farbe angezeigt und jetzt ansehnlich gesetzt
- - mit Abstand zwischen den Buchstaben und dem Gleichheitszeichen und einer
+ – mit Abstand zwischen den Buchstaben und dem Gleichheitszeichen und einer
  hochgestellten 
 \begin_inset Quotes gld
 \end_inset
@@ -3441,7 +3462,7 @@ phie.
 sqrt
 \family default
 ; dies kann frustrierend sein, weil man nicht sehen kann, wie ein Ausdruck
- gesetzt wird, bis man nicht die Vorschau angesehen und viel Zeit beim Finden
+ gesetzt wird, bis man die Vorschau angesehen und viel Zeit beim Finden
  von fehlenden Klammern und anderen Fehlern verbracht hat.
  Andererseits versucht \SpecialChar LyX
  nicht, den Ausdruck perfekt aussehen zu lassen (WYSIWYG)
@@ -3724,7 +3745,8 @@ Wenn Sie mathematische Ausdrücke schreiben und mit
 \family sans
 Esc
 \family default
- den Mathematik-Modus verlassen, ist zu beachten, dass (normalerweise) kein
+ den Ma\SpecialChar softhyphen
+thematik-Modus verlassen, ist zu beachten, dass (normalerweise) kein
  Leerzeichen nach dem Ausdruck gesetzt wird.
  Das ist gut, wenn ein Punkt oder ein Komma folgen; wenn Sie aber ein Wort
  nach einer Formel schreiben möchten, dann müssen Sie explizit ein Leerzeichen
@@ -3740,7 +3762,8 @@ Ein Exponent kann über das Menü
 \family sans
 Einfügen\SpecialChar menuseparator
 Formatierung\SpecialChar menuseparator
-Hochgestellt
+Hochge\SpecialChar softhyphen
+stellt
 \family default
  eingegeben werden, doch es ist wirklich einfacher, die 
 \begin_inset Quotes gld
@@ -3763,7 +3786,7 @@ Leerzeichen
 \family sans
 Esc
 \family default
--Taste (um den Mathematikeditor vollkommen zu verlassen) drücken, erscheint
+-Taste drücken (um den Mathematikeditor vollkommen zu verlassen), erscheint
  alles als Exponent.
 \end_layout
 
@@ -3786,19 +3809,22 @@ _
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung:
 \series default
- Schreiben Sie die Gleichung 1 von 
+ Schreiben Sie die Gleichung
+\begin_inset space ~
+\end_inset
+
+1 von 
 \family typewriter
 beispiel_roh.lyx
 \family default
  im Ma\SpecialChar softhyphen
-the\SpecialChar softhyphen
+thematik-Modus.
-ma\SpecialChar softhyphen
-tik-Modus.
 \end_layout
 
 \begin_layout Section
@@ -3840,7 +3866,8 @@ Mathe-Werkzeugleiste
  kann über das Menü 
 \family sans
 Ansicht\SpecialChar menuseparator
-Werkzeugleisten\SpecialChar menuseparator
+Werkzeug\SpecialChar softhyphen
+leisten\SpecialChar menuseparator
 Mathe
 \family default
  (
@@ -4087,7 +4114,7 @@ Kontrollfläche
 
  schreiben, haben Sie bereits Ihren ersten einfachen Bruch geschrieben.
  Natürlich können Sie auch beliebige andere Ausdrücke in die zwei Quadrate
- schreiben: Variablen mit Exponenten, Quadratwurzeln, andere Brüche, usw..
+ schreiben: Variablen mit Exponenten, Quadratwurzeln, andere Brüche, usw…
 \end_layout
 
 \begin_layout Standard
@@ -4095,14 +4122,16 @@ Kontrollfläche
 \series bold
 Übung:
 \series default
- Schreiben Sie die Gleichung 2 von 
+ Schreiben Sie die Gleichung
+\begin_inset space ~
+\end_inset
+
+2 von 
 \family typewriter
 beispiel_roh.lyx
 \family default
  im Ma\SpecialChar softhyphen
-the\SpecialChar softhyphen
+thematik-Modus.
-ma\SpecialChar softhyphen
-tik-Modus.
 \end_layout
 
 \begin_layout Subsection
@@ -4227,7 +4256,8 @@ Andere Kommandos, die im \SpecialChar TeX
 \family sans
 Funktionen-
 \family default
-Listenauswahl eingefügt werden müssen, sind andere trigonometrische Funktionen
+Listen\SpecialChar softhyphen
+auswahl eingefügt werden müssen, sind andere trigonometrische Funktionen
  und deren Inverse, hyperbolische Funktionen, Logarithmen, Grenzwerte und
  eine Menge weiterer Funktionen.
  Diese Funktionen können auch mit Exponenten und Indizes versehen werden,
@@ -4258,19 +4288,22 @@ Listenauswahl eingefügt werden müssen, sind andere trigonometrische Funktionen
  wichtig ist.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung:
 \series default
- Schreiben Sie die Gleichung 3 von 
+ Schreiben Sie die Gleichung
+\begin_inset space ~
+\end_inset
+
+3 von 
 \family typewriter
 beispiel_roh.lyx
 \family default
  im Ma\SpecialChar softhyphen
-the\SpecialChar softhyphen
+thematik-Modus.
-ma\SpecialChar softhyphen
-tik-Modus.
 \end_layout
 
 \begin_layout Subsection
@@ -4453,7 +4486,8 @@ Der Modus für abgesetzte Formeln hat einige Unterschiede im Vergleich zum
 \end_layout
 
 \begin_layout Itemize
-Der Standard-Zeichensatz ist für einige Symbole wie 
+Der Standard-Zeichensatz ist für einige Symbole größer, wie zum Beispiel
+ für 
 \begin_inset Formula $\sum$
 \end_inset
 
@@ -4461,7 +4495,7 @@ Der Standard-Zeichensatz ist für einige Symbole wie
 \begin_inset Formula $\int$
 \end_inset
 
- größer
+
 \end_layout
 
 \begin_layout Itemize
@@ -4495,20 +4529,22 @@ nach
  nicht gewünscht ist.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung:
 \series default
- Setzen Sie die verschiedenen Gleichungen in 
+ Setzen Sie in 
 \family typewriter
 beispiel_roh.lyx
 \family default
- in den absetzten Anzeigemodus und sehen Sie sich an, wie sich der Schriftsatz
+ die verschiedenen Gleichungen in den abgesetzten Anzeigemodus und sehen
- verändert.
+ Sie sich an, wie sich der Schriftsatz verändert.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Übung:
@@ -4537,8 +4573,8 @@ Weitere mathematische Dinge
 \end_layout
 
 \begin_layout Standard
-Der Mathematik-Editor hat noch viel weiter reichende Fähigkeiten, bislang
+Der Mathematik-Editor hat noch viel weiter reichende Fähigkeiten.
- haben Sie nur die Grundlagen kennengelernt.
+ Bisher haben Sie nur die Grundlagen kennengelernt.
  Im 
 \emph on
 Mathe
@@ -4602,9 +4638,7 @@ Benutzerhandbuch
  Mit der Auswahl 
 \family sans
 Einfügen\SpecialChar menuseparator
-Ta\SpecialChar softhyphen
+Tabelle
-bel\SpecialChar softhyphen
-le
 \family default
  (
 \begin_inset Info
@@ -4612,7 +4646,7 @@ type  "icon"
 arg   "tabular-insert"
 \end_inset
 
-) legen Sie eine Tabelle an, indem Sie mit der Maus die Größe festlegen..
+) legen Sie eine Tabelle an, indem Sie mit der Maus die Größe festlegen.
  Klicken Sie nun mit dem 
 \emph on
 rechten Mausknopf
@@ -4627,7 +4661,10 @@ Einstellungen
 \family default
  zu öffnen.
  Hier können umfangreiche Einstellungen einfach vorgenommen werden.
- Wenn Sie auf 
+\begin_inset Newline linebreak
+\end_inset
+
+Wenn Sie auf 
 \begin_inset Info
 type  "icon"
 arg   "toolbar-toggle table"
@@ -4665,7 +4702,8 @@ Sowohl Tabellen als auch Abbildungen können mit Beschriftungen versehen
 \SpecialChar LyX
  ist voll konfigurierbar.
  Angefangen vom Aussehen des \SpecialChar LyX
--Fensters bis hin zum Format der Ausgabe, alles
+-Fens\SpecialChar softhyphen
+ters bis hin zum Format der Ausgabe, alles
  kann in weitem Rahmen verändert werden.
  Dies geschieht mit dem Menü 
 \family sans
@@ -4851,8 +4889,8 @@ Objekte
 \emph default
  werden die Unterschiede zwischen \SpecialChar LyX
  und \SpecialChar LaTeX
- sehr viel ausführlicher behandelt,
+ sehr viel ausführlicher behandelt.
- dort finden Sie auch viele Tipps, wie Sie diverse \SpecialChar LaTeX
+ Dort finden Sie auch viele Tipps, wie Sie diverse \SpecialChar LaTeX
 -Tricks auch in \SpecialChar LyX
  einsetzen
  können.
@@ -4979,7 +5017,7 @@ zwischen
  WYSIWYG-Tabellen und -Abbildungen bieten.
  \SpecialChar LyX
  wird niemals alle \SpecialChar LaTeX
--Pakete unterstützen.
+-Pakete direkt unterstützen.
  Indem Sie im \SpecialChar LaTeX
 -Vorspann (siehe Abschnitt 
 \begin_inset CommandInset ref
@@ -4994,8 +5032,8 @@ reference "subsec:LaTeX-Vorspann"
 \backslash
 usepackage{foo}
 \family default
- eingeben, können Sie aber auch solche Pakete verwenden – wenn auch nicht
+ eingeben, können Sie aber auch noch nicht unterstützten Pakete verwenden
- mit Unterstützung von WYSIWYM.
+ – wenn auch nicht mit Unterstützung von WYSIWYM.
 \end_layout
 
 \begin_layout Subsection
@@ -5090,9 +5128,9 @@ tex2lyx
 \end_layout
 
 \begin_layout Standard
-Es ist wichtig zu verstehen, d
+Es ist wichtig zu verstehen, dass
 \family sans
-ass 
+ 
 \family typewriter
 tex2lyx
 \family sans
@@ -5114,8 +5152,8 @@ bekannt
 -Layout-Datei
 \family default
  für die Dokumentklasse vorhanden sein.
- Gibt es keine Layout-Datei, erhalten Sie eine Fehlermeldung, dass die Konvertie
+ Wenn keine Layout-Datei gefunden wird, erhalten Sie eine Fehlermeldung,
-rung fehlgeschlagen ist.
+ dass die Konvertierung fehlgeschlagen ist.
  Ohne Layout-Datei weiß 
 \family typewriter
 tex2lyx
@@ -5149,8 +5187,7 @@ Eventuell wollen Sie ein \SpecialChar LyX
 \family sans
 Datei\SpecialChar menuseparator
 Exportieren\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX
-
 \family default
  wird die von Ihnen editierte Datei (zum Beispiel 
 \family typewriter
@@ -5224,13 +5261,8 @@ Dokument
 \SpecialChar menuseparator
 
 \family sans
-Einstellungen
+Einstellungen\SpecialChar menuseparator
-\family default
+LaTeX-Vorspann
- 
-\family sans
-\SpecialChar menuseparator
-\SpecialChar LaTeX
--Vorspann
 \family default
 , und tragen Sie dort die gewünschten \SpecialChar LaTeX
 -Kommandos ein.
@@ -5265,8 +5297,7 @@ Liste
 \end_inset
 
 Inhaltsverzeichnis\SpecialChar menuseparator
-Bib\SpecialChar TeX
+BibTeX
-
 \begin_inset space \space{}
 \end_inset
 
@@ -5320,10 +5351,11 @@ Unter dem Menüpunkten
 Einfügen\SpecialChar menuseparator
 Sonderzeichen
 \family default
- und 
+ sowie 
 \family sans
 Einfügen\SpecialChar menuseparator
-Formatierung
+For\SpecialChar softhyphen
+matierung
 \family default
  finden Sie weitere besondere Zeichen, wie etwa Fortsetzungspunkte, erzwungene
  Zeilenumbrüche, Trennvorschläge usw.

lib/doc/es/Additional.lyx

@@ -434,42 +434,6 @@ ctualizar
 \end_inset
 
 
-\end_layout
-
-\begin_layout Itemize
-\begin_inset Flex Noun
-status collapsed
-
-\begin_layout Plain Layout
-
-\family sans
-Archivo\SpecialChar menuseparator
-I
-\family default
-m
-\family sans
-primir
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Itemize
-\begin_inset Flex Noun
-status collapsed
-
-\begin_layout Plain Layout
-
-\family sans
-Archivo\SpecialChar menuseparator
-Fax
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -656,8 +620,7 @@ status collapsed
 \family sans
 Archivo\SpecialChar menuseparator
 Importar\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX
-
 \end_layout
 
 \end_inset
@@ -796,8 +759,7 @@ status collapsed
 
 \family sans
 Insertar\SpecialChar menuseparator
-Código \SpecialChar TeX
+Código TeX
-
 \end_layout
 
 \end_inset
@@ -1733,7 +1695,7 @@ BottomBorder=2mm
 \end_layout
 
 \begin_layout Standard
-Esta es la configuración para hojas de etiquetas Avery®, stock #5360.
+Esta es la configuración para hojas de etiquetas Avery, stock #5360.
  Ahora estás preparado para imprimirlas, pero necesitarás insertar código
  \SpecialChar LaTeX
 , poniendo los comandos 
@@ -1980,8 +1942,7 @@ de
 \begin_inset space ~
 \end_inset
 
-\SpecialChar LaTeX
+LaTeX
-
 \end_layout
 
 \end_inset
@@ -2005,8 +1966,7 @@ status collapsed
 \begin_layout Plain Layout
 
 \family typewriter
-\SpecialChar LaTeX
+LaTeX Warning
- Warning
 \end_layout
 
 \end_inset
@@ -2044,8 +2004,7 @@ status collapsed
 \begin_layout Plain Layout
 
 \family typewriter
-\SpecialChar LaTeX
+LaTeX Font Warning
- Font Warning
 \end_layout
 
 \end_inset
@@ -2208,8 +2167,7 @@ status collapsed
 \begin_layout Plain Layout
 
 \family typewriter
-\SpecialChar LaTeX
+LaTeX Error: File 
- Error: File 
 \begin_inset Quotes els
 \end_inset
 
@@ -11178,8 +11136,7 @@ solo
 
  la clase 
 \family sans
-slides (Foil\SpecialChar TeX
+FoilTeX
-)
 \family default
 \emph on
 .
@@ -11211,14 +11168,9 @@ reference "sec:slitex"
 .
  Si tu sistema no dispone de la clase 
 \family sans
-foils
+FoilTeX
 \family default
- [
+, tendrás que usar la clase 
-\family sans
-slides (Foil\SpecialChar TeX
-)
-\family default
-], tendrás que usar la clase 
 \family sans
 slides
 \family default
@@ -11232,7 +11184,11 @@ La clase
 \family sans
 foils
 \family default
- está diseñada para usar con la versión 2.1 de la clase \SpecialChar LaTeX
+ está diseñada para usar con la versión
+\begin_inset space ~
+\end_inset
+
+2.1 de la clase \SpecialChar LaTeX
  
 \family sans
 foils.cls
@@ -11248,8 +11204,7 @@ Para empezar
 \begin_layout Standard
 Obviamente, para usar esta clase, debes seleccionar 
 \family sans
-slides (Foil\SpecialChar TeX
+FoilTeX
-)
 \family default
  en el diálogo 
 \family sans
@@ -11575,7 +11530,7 @@ Foil
 
 \begin_layout Standard
 \begin_inset Flex Multiple Columns
-status collapsed
+status open
 
 \begin_layout Itemize
 
@@ -25549,7 +25504,7 @@ multicol
 \series default
 
 \begin_inset Index idx
-status open
+status collapsed
 
 \begin_layout Plain Layout
 \SpecialChar LaTeX
@@ -25830,7 +25785,7 @@ multicol
 \series default
 
 \begin_inset Index idx
-status open
+status collapsed
 
 \begin_layout Plain Layout
 \SpecialChar LaTeX
@@ -27699,29 +27654,7 @@ Jpgfdraw
 \family default
  ve al menú 
 \family sans
-Te
+TeX/LaTeX\SpecialChar menuseparator
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X/LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
 Set Normal Size
 \family default
@@ -27740,29 +27673,7 @@ Dibuja una forma.
 \begin_layout Enumerate
 Usa el menú 
 \family sans
-Te
+TeX/LaTeX\SpecialChar menuseparator
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X/LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX\SpecialChar menuseparator
 Shapepar
 \family default
  para exportar la forma a coordenadas.

lib/doc/es/Customization.lyx

@@ -6379,16 +6379,7 @@ Format
  Cualquier formato es aceptable, pero debería usarse normalmente el actual
  formato.
  (En \SpecialChar LyX
- 2.1 el formato actual es 48).
+ 2.2 el formato actual es 60).
- Debes tener en cuenta que el formato local no es soportado por versiones
- de \SpecialChar LyX
- anteriores a 1.6, por tanto no deberías usarlo si quieres poder exportar
- el documento a \SpecialChar LyX
- 1.5 o anteriores sin perder la información del formato local.
- Si quieres poder exportar a 1.6 —el formato local es soportado pero no hay
- IU par él—, deberías usar formato 11 y, por supuesto, usar solo estructuras
- que estuvieran disponibles en \SpecialChar LyX
- 1.6.
 \end_layout
 
 \begin_layout Standard
@@ -6553,8 +6544,7 @@ myclass.layout
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass{report}
-Class{report}
 \end_layout
 
 \begin_layout Standard
@@ -6564,8 +6554,7 @@ por la línea
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass[report, myclass.sty]{report (myclass)}
-Class[report, myclass.sty]{report (myclass)}
 \end_layout
 
 \begin_layout Standard
@@ -6751,8 +6740,7 @@ myclass.sty
 \begin_layout LyX-Code
 #
 \backslash
-Declare\SpecialChar LyX
+DeclareLyXModule{My Package} 
-Module{My Package} 
 \end_layout
 
 \begin_layout LyX-Code
@@ -6772,7 +6760,7 @@ Module{My Package}
 \end_layout
 
 \begin_layout LyX-Code
-Format 35
+Format 60
 \begin_inset Newline newline
 \end_inset
 
@@ -6882,8 +6870,7 @@ thesis.layout
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass[thesis,book]{thesis}
-Class[thesis,book]{thesis}
 \end_layout
 
 \begin_layout Standard
@@ -7301,22 +7288,7 @@ del T.
 \size small
 #  
 \backslash
-DeclareLaT
+DeclareLaTeXClass{Article (Standard Class)}
-\size default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size small
-eXClass{Article (Standard Class)}
 \end_layout
 
 \begin_layout LyX-Code
@@ -7525,22 +7497,7 @@ myarticle.layout
 \size small
 #  
 \backslash
-DeclareLaT
+DeclareLaTeXClass[article]{Article (con Mis Encabezados)}
-\size default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size small
-eXClass[article]{Article (con Mis Encabezados)}
 \end_layout
 
 \begin_layout LyX-Code
@@ -7596,22 +7553,7 @@ Article (con Mis Encabezados)
 \size small
 #  
 \backslash
-DeclareLaT
+DeclareLaTeXClass[article,foo.sty]{Article (con Mis Encabezados)}
-\size default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size small
-eXClass[article,foo.sty]{Article (con Mis Encabezados)}
 \end_layout
 
 \begin_layout LyX-Code
@@ -7665,22 +7607,7 @@ Así, para ser lo más explícito posible, la forma de la declaración del forma
 \size small
 #  
 \backslash
-DeclareLaT
+DeclareLaTeXClass[class,package.sty]{descripción del formato}
-\size default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size small
-eXClass[class,package.sty]{descripción del formato}
 \end_layout
 
 \begin_layout LyX-Code
@@ -7851,18 +7778,7 @@ Un módulo debe empezar con una línea como la siguiente:
 \begin_layout LyX-Code
 #
 \backslash
-DeclareL
+DeclareLyXModule[endnotes.sty]{Endnotes} 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-yXModule[endnotes.sty]{Endnotes} 
 \end_layout
 
 \begin_layout Standard
@@ -8111,7 +8027,7 @@ Format
 
 .
  El número para la versión actual de \SpecialChar LyX
- es formato 59.
+ es formato 60.
  Cada versión de \SpecialChar LyX
  es capaz de leer los formatos de versiones anteriores,
  de la misma forma que puede leer archivos producidos con versiones de \SpecialChar LyX
@@ -18070,7 +17986,7 @@ Command, Environment, None
 ] Cómo debería traducirse el estilo en \SpecialChar LaTeX
 .
 \begin_inset Foot
-status open
+status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Flex Code
@@ -18303,8 +18219,7 @@ end
 status collapsed
 
 \begin_layout Plain Layout
-\SpecialChar LyX
+LyxType
-Type
 \end_layout
 
 \end_inset
@@ -18329,7 +18244,21 @@ MultiPar
 
 \end_inset
 
- es falso.
+ es falso y 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ 
+\lang english
+to true
+\lang spanish
+.
  
 \begin_inset Flex Code
 status collapsed
@@ -18340,7 +18269,21 @@ MultiPar
 
 \end_inset
 
- se puede poner como verdadero para recuadros de estilos 
+ se puede poner como verdadero, o 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ 
+\lang english
+to fals
+\lang spanish
+e, para recuadros de estilos 
 \begin_inset Flex Code
 status collapsed
 
@@ -18359,8 +18302,7 @@ después
 status collapsed
 
 \begin_layout Plain Layout
-\SpecialChar LyX
+LyxType
-Type
 \end_layout
 
 \end_inset

lib/doc/es/EmbeddedObjects.lyx

@@ -24358,7 +24358,6 @@ arg   "label-insert"
  y se inserta un cuadro gris como este: 
 \begin_inset Graphics
 	filename clipart/etiqueta.png
-	scale 85
 
 \end_inset
 
@@ -24410,7 +24409,6 @@ arg   "dialog-show-new-inset ref"
  Se inserta un cuadro gris como este: 
 \begin_inset Graphics
 	filename clipart/referencia.png
-	scale 85
 
 \end_inset
 
@@ -30613,32 +30611,35 @@ sideways false
 status open
 
 \begin_layout Plain Layout
-\begin_inset ERT
+\noindent
-status collapsed
+\align center
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename ../clipart/without_fntright.pdf
 	width 100col%
+	scaleBeforeRotation
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -30677,32 +30678,35 @@ sideways false
 status open
 
 \begin_layout Plain Layout
-\begin_inset ERT
+\noindent
-status collapsed
+\align center
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename ../clipart/with_fntright.pdf
 	width 100col%
+	scaleBeforeRotation
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -30809,31 +30813,33 @@ status open
 
 \begin_layout Plain Layout
 \align center
-\begin_inset ERT
+\begin_inset Box Boxed
-status collapsed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename ../clipart/endnotes.pdf
+	width 100col%
+	scaleBeforeRotation
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset

lib/doc/es/Math.lyx

@@ -34683,6 +34683,38 @@ Maxima
 \end_inset
 
 
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ One needs to use proper delimiter insets 
+\begin_inset Formula $\left(\right)$
+\end_inset
+
+ instead of simple '(' ')' characters.
+\end_layout
+
+\end_inset
+
+ 
 \end_layout
 
 \begin_layout Itemize
@@ -34701,6 +34733,20 @@ Maxima
 \end_inset
 
 
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsection

lib/doc/es/Tutorial.lyx

@@ -5,28 +5,6 @@
 \save_transient_properties true
 \origin /systemlyxdir/doc/es/
 \textclass book
-\begin_preamble
-% DO NOT ALTER THIS PREAMBLE!!!
-%
-%This preamble is designed to ensure that the document prints
-% out as advertised. If you mess with this preamble,
-% parts of the document may not print out as expected.  If you
-% have problems LaTeXing this file, please contact 
-% the documentation team
-% email: lyx-docs@lists.lyx.org
-
-% Work around a bug in Babel-Spanish with \lim if non-TeX fonts are used:
-\@ifpackageloaded{fontspec}{\unaccentedoperators}{}
-
-% the pages of the TOC is numbered roman
-% and a pdf-bookmark for the TOC is added
-\let\myTOC\tableofcontents
-\renewcommand\tableofcontents{%
-  \frontmatter
-  \pdfbookmark[1]{\contentsname}{}
-  \myTOC
-  \mainmatter }
-\end_preamble
 \use_default_options false
 \maintain_unincluded_children false
 \language spanish
@@ -59,7 +37,7 @@
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen true
 \pdf_bookmarksopenlevel 1
-\pdf_breaklinks false
+\pdf_breaklinks true
 \pdf_pdfborder false
 \pdf_colorlinks true
 \pdf_backref false
@@ -557,7 +535,7 @@ como\SpecialChar endofsentence
 Comprueba el resultado final en PDF con 
 \family sans
 Documento\SpecialChar menuseparator
-Ver [PDF (pdflatex)]
+Ver
 \family default
  o con el botón 
 \begin_inset Info
@@ -569,29 +547,6 @@ arg   "buffer-view"
  \SpecialChar LyX
  lanzará un programa visor de PDF que abrirá una nueva ventana mostrándote
  el aspecto de tu documento cuando esté impreso.
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Puedes ahorrar tiempo dejando que el visor de PDF se siga ejecutando en
- segundo plano.
- De esta forma, puedes usar 
-\family sans
-Ver\SpecialChar menuseparator
-Actualizar
-\family default
- o el botón 
-\begin_inset Info
-type  "icon"
-arg   "buffer-update"
-\end_inset
-
- y simplemente pulsar sobre la ventana del visor (o restaurarla) después.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Itemize
@@ -607,6 +562,52 @@ al formato que quieras.
 ¡Enhorabuena! Has escrito e impreso tu primer documento \SpecialChar LyX
 .
  Todo lo demás son detalles.
+\begin_inset Newline newline
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+\lang english
+A hint
+\lang spanish
+:
+\series default
+ Puedes ahorrar tiempo dejando que el visor de PDF se siga ejecutando en
+ segundo plano.
+ De esta forma, puedes usar 
+\family sans
+Ver\SpecialChar menuseparator
+Actualizar
+\family default
+ o el botón 
+\begin_inset Info
+type  "icon"
+arg   "buffer-update"
+\end_inset
+
+ y simplemente pulsar sobre la ventana del visor después.
+ 
+\lang english
+Under Windows still use
+\lang spanish
+ 
+\family sans
+Documento\SpecialChar menuseparator
+Ver
+\family default
+ o 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
+\end_inset
+
+
+\lang english
+ respectively.
 \end_layout
 
 \begin_layout Subsection
@@ -1363,7 +1364,8 @@ Subsubsección
  y comprueba cómo los demás números de sección se actualizan.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
@@ -1648,7 +1650,8 @@ protegidos
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
@@ -1723,7 +1726,8 @@ Guía del usuario
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
@@ -2118,6 +2122,10 @@ plantilla
 \family default
 .
  Elige
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
 letter.lyx
 \family default
@@ -2309,12 +2317,17 @@ Libro
  este tutorial.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
 \series default
 : Arregla el título, la fecha y el autor en
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
 ejemplo_sin_lyx.lyx
 \end_layout
@@ -2411,7 +2424,11 @@ Sitúa el cursor en algún lugar de la sección 2 de tu documento.
 \end_layout
 
 \begin_layout LyX-Code
-Si quieres saber más acerca de este documento, mira la sección .
+Si quieres saber más acerca de este documento,
+\begin_inset Newline newline
+\end_inset
+
+mira la sección.
 \end_layout
 
 \begin_layout Standard
@@ -2684,7 +2701,8 @@ reference "sec:Clases-de-documento"
 
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
@@ -2751,7 +2769,11 @@ pie
 
 \begin_layout LyX-Code
 \SpecialChar LyX
- es un procesador de composición tipográfica de textos.
+ es un procesador de composición tipográfica de
+\begin_inset Newline linebreak
+\end_inset
+
+textos.
 \end_layout
 
 \begin_layout Standard
@@ -2895,7 +2917,8 @@ Convierte ahora tu nota al pie en texto, selecciónala y conviértela en una
  de nuevo para ver su aspecto.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
@@ -2947,7 +2970,11 @@ El Tutorial de Lyx, por el equipo de documentación de \SpecialChar LyX
 
 
 \family default
- como primera referencia.
+ como primera
+\begin_inset Newline linebreak
+\end_inset
+
+referencia.
  Observa que \SpecialChar LyX
  pone automáticamente un número en un recuadro antes de cada
  referencia.
@@ -3097,7 +3124,8 @@ Guía del usuario
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio:
@@ -3192,7 +3220,8 @@ Para deshacerte del índice, puedes borrar su marcador como cualquier otro
  carácter.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
@@ -3246,7 +3275,11 @@ Escribe en cualquier parte de tu documento:
 \end_layout
 
 \begin_layout LyX-Code
-Me gusta lo que dijo Einstein, E=mc^2, porque es tan sencillo\SpecialChar ldots
+Me gusta lo que dijo Einstein, E=mc^2, porque es
+\begin_inset Newline newline
+\end_inset
+
+tan sencillo\SpecialChar ldots
 
 \end_layout
 
@@ -3602,7 +3635,8 @@ _
  
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
@@ -4005,7 +4039,8 @@ Abajo
  cuadradas, otras fracciones, cualquier cosa.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
@@ -4154,11 +4189,7 @@ sin
 \family sans
 Retroceso
 \family default
- se borrará
+ se borrará toda la palabra.
-\begin_inset Formula $ $
-\end_inset
-
- toda la palabra.
  Ahora escribe 
 \begin_inset Quotes fld
 \end_inset
@@ -4509,7 +4540,8 @@ Retorno
  párrafos de tu documento—, que probablemente no es lo que querías.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
@@ -4521,13 +4553,14 @@ ejemplo_sin_lyx.lyx
  en modo presentación, y comprueba que se componen de manera diferente.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Ejercicio
 \series default
 : Utilizando las herramientas que has aprendido en esta sección, deberías
- de ser capaz de escribir una ecuación como ésta
+ de ser capaz de escribir una ecuación como ésta:
 \begin_inset Foot
 status collapsed
 
@@ -4547,7 +4580,7 @@ Casos
 
 \end_inset
 
-: 
+ 
 \begin_inset Formula 
 \[
 f(x)=\left\{ \begin{array}{cc}
@@ -5137,8 +5170,7 @@ Puede que desees convertir un documento \SpecialChar LyX
 \family sans
 Archivo\SpecialChar menuseparator
 Exportar\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX
-
 \family default
 .
  Se creará un archivo 
@@ -5206,8 +5238,7 @@ Preámbulo
 \begin_inset space ~
 \end_inset
 
-\SpecialChar LaTeX
+LaTeX
-
 \family default
  y escribe en la ventana que aparecerá.
  Todo lo que introduzcas se le pasará directamente a \SpecialChar LaTeX
@@ -5233,14 +5264,11 @@ Bibliografía
 \begin_inset space ~
 \end_inset
 
-Bib\SpecialChar TeX
+BibTeX
-
 \family default
  para incluir un archivo 
-\family typewriter
-Bib
 \family sans
-\SpecialChar TeX
+Bib\SpecialChar TeX
 
 \family default
 .
@@ -5257,10 +5285,8 @@ de
 Datos
 \family default
  puedes cargar archivos 
-\family typewriter
-Bib
 \family sans
-\SpecialChar TeX
+Bib\SpecialChar TeX
 
 \family default
 .
@@ -5323,8 +5349,7 @@ de
 \begin_inset space ~
 \end_inset
 
-\SpecialChar LaTeX
+LaTeX
-
 \family default
 .
  Pulsando sobre un error en dicho diálogo, se mostrará información detallada

lib/doc/es/UserGuide.lyx

@@ -3994,19 +3994,19 @@ Predeterminado
 \begin_layout Itemize
 
 \family sans
-A0 - A6
+A0 – A6
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-B0 - B6
+B0 – B6
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-C0 - C6
+C0 – C6
 \end_layout
 
 \begin_layout Itemize
@@ -4018,7 +4018,7 @@ Carta US, Oficio US, Ejecutivo US
 \begin_layout Itemize
 
 \family sans
-JIS B0 - JIS B6
+JIS B0 – JIS B6
 \end_layout
 
 \begin_layout Itemize
@@ -4507,7 +4507,7 @@ begin{
 \emph on
 environment
 \emph default
-} ...
+} \SpecialChar ldots
  
 \backslash
 end{
@@ -8613,12 +8613,14 @@ Literal
 \end_layout
 
 \begin_layout Verbatim
+
 Esto es entorno Literal.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 Las dos  líneas siguientes están vacías:
 \end_layout
 
@@ -8631,6 +8633,7 @@ Las dos  líneas siguientes están vacías:
 \end_layout
 
 \begin_layout Verbatim
+
 Casi todo está permitido en entorno Literal:"%&$§#~'`
 \backslash
 }][{|
@@ -8655,6 +8658,7 @@ con la diferencia de que los espacios aparecen en la salida como el carácter
 \end_layout
 
 \begin_layout Verbatim*
+
 Esto es entorno Literal*.
 \end_layout
 
@@ -18387,7 +18391,6 @@ verás un recuadro como este
 : 
 \begin_inset Graphics
 	filename clipart/notapie.png
-	scale 85
 	groupId botonesbh
 
 \end_inset
@@ -22614,7 +22617,6 @@ Flotantes ! Leyenda
  Un recuadro se muestra así: 
 \begin_inset Graphics
 	filename clipart/flotante.png
-	scale 85
 	groupId botonesbh
 
 \end_inset
@@ -24375,7 +24377,6 @@ b
  se ve 
 \begin_inset Graphics
 	filename ../clipart/SpaceMarker.png
-	scale 85
 	groupId botonesbh
 
 \end_inset
@@ -26952,7 +26953,6 @@ Aceptar
  se inserta un cuadro gris parecido a este: 
 \begin_inset Graphics
 	filename clipart/etiqueta.png
-	scale 85
 	groupId botonesbh
 
 \end_inset
@@ -27019,7 +27019,6 @@ Aceptar
  se inserta un recuadro gris parecido a este: 
 \begin_inset Graphics
 	filename clipart/referencia.png
-	scale 85
 	groupId botonesbh
 
 \end_inset
@@ -31785,7 +31784,7 @@ Módulos
 \begin_inset space ~
 \end_inset
 
-estilos:
+etornos:
 \end_layout
 
 \begin_layout Description
@@ -31838,6 +31837,9 @@ derecha
 
 \begin_layout Standard
 para las diferentes posiciones en el encabezado y en el pie de página.
+ 
+\lang english
+These environments can be selected in the environment pull-down box.
 \end_layout
 
 \begin_layout Standard
@@ -32334,7 +32336,11 @@ headheight}{altura}
 \end_layout
 
 \begin_layout Standard
-Altura es una longitud en unidades estándar.
+Altura es una longitud en unidades estándar (por ejemplo 
+\series bold
+1cm
+\series default
+).
  Si desconoces la cantidad de espacio necesaria, define tu encabezado o
  pie y haz una vista previa PDF del documento.
  Luego abres el 

lib/doc/fr/Additional.lyx

@@ -465,14 +465,12 @@ fasse tourner
 \family sans
 Fichier\SpecialChar menuseparator
 Exporter\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX
-
 \family default
 , (ou bien 
 \family sans
 Affichage\SpecialChar menuseparator
-Afficher le code \SpecialChar LaTeX
+Afficher le code LaTeX
-
 \family default
 ) puis regardez le préambule du fichier 
 \family typewriter
@@ -519,22 +517,6 @@ jour\SpecialChar menuseparator
 Format
 \end_layout
 
-\begin_layout Itemize
-
-\family sans
-Fichier\SpecialChar menuseparator
-Imprimer\SpecialChar ldots
-
-\end_layout
-
-\begin_layout Itemize
-
-\family sans
-Fichier\SpecialChar menuseparator
-Fax\SpecialChar ldots
-
-\end_layout
-
 \begin_layout Standard
 Elles n'invoqueront \SpecialChar LaTeX
  que si le fichier a changé depuis la dernière fois
@@ -643,9 +625,8 @@ Vous pouvez importer un fichier \SpecialChar LaTeX
  dans \SpecialChar LyX
  en utilisant le menu Fichier \SpecialChar menuseparator
 Importer\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTe
-
+X de \SpecialChar LyX
- de \SpecialChar LyX
 .
  Cela va appeler un programme nommé 
 \family typewriter
@@ -722,8 +703,7 @@ Code
 \begin_inset space ~
 \end_inset
 
-\SpecialChar TeX
+TeX
-
 \family default
 .
  
@@ -1438,7 +1418,7 @@ BottomBorder=2mm
 \end_layout
 
 \begin_layout Standard
-Ceci est la configuration pour des feuilles d'étiquette Avery®, référence
+Ceci est la configuration pour des feuilles d'étiquette Avery, référence
  #5360.
  Vous êtes maintenant prêt à imprimer des étiquettes, mais si vous devez
  insérer du code \SpecialChar LaTeX
@@ -1586,8 +1566,7 @@ log
 \begin_inset space ~
 \end_inset
 
-\SpecialChar LaTeX
+LaTeX
-
 \family default
 .
  Il y a quelques erreurs et avertissements assez fréquents.
@@ -1602,8 +1581,7 @@ log
 \begin_inset Quotes fld
 \end_inset
 
-\SpecialChar LaTeX
+LaTeX Warning
- Warning
 \begin_inset Quotes frd
 \end_inset
 
@@ -1646,8 +1624,7 @@ Vous pouvez en général les ignorer.
 \begin_inset Quotes fld
 \end_inset
 
-\SpecialChar LaTeX
+LaTeX Font Warning
- Font Warning
 \begin_inset Quotes frd
 \end_inset
 
@@ -1804,8 +1781,7 @@ Des avertissements sur des problèmes de saut de page.
 \begin_inset Quotes fld
 \end_inset
 
-\SpecialChar LaTeX
+LaTeX Error: File 'Xxxx' not found
- Error: File 'Xxxx' not found
 \begin_inset Quotes frd
 \end_inset
 
@@ -1887,8 +1863,7 @@ usepackage{}
 \begin_inset Quotes fld
 \end_inset
 
-\SpecialChar LaTeX
+LaTeX Error: Unknown option
- Error: Unknown option
 \begin_inset Quotes frd
 \end_inset
 
@@ -10273,11 +10248,8 @@ Diapos Foils (alias
 Foil
 \family default
 \noun on
-T
+\SpecialChar TeX
-\noun default
+
-e
-\noun on
-X
 \noun default
 )
 \begin_inset CommandInset label
@@ -10339,18 +10311,9 @@ Cette section concerne la classe
 \begin_inset Quotes fld
 \end_inset
 
-slides
+FoilTeX
 \family default
 
-\begin_inset space ~
-\end_inset
-
-(
-\family sans
-Foil\SpecialChar TeX
-
-\family default
-)
 \begin_inset Quotes frd
 \end_inset
 
@@ -10398,22 +10361,9 @@ reference "sec:slitex"
 foils
 \family default
  installée 
-\lang english
- [
 \family sans
-
+FoilTeX
-\begin_inset Quotes fld
-\end_inset
-
-slides (Foil\SpecialChar TeX
-)
 \family default
-
-\begin_inset Quotes frd
-\end_inset
-
-]
-\lang french
 , il vous faudra sûrement utiliser la classe 
 \family sans
 slides
@@ -10426,8 +10376,11 @@ La classe
 \family sans
 foils
 \family default
- est conçue pour être utilisée avec la version 2.1 du fichier de classe \SpecialChar LaTeX
+ est conçue pour être utilisée avec la version
+\begin_inset space ~
+\end_inset
 
+2.1 du fichier de classe \SpecialChar LaTeX
  
 \family sans
 foils.cls
@@ -10444,26 +10397,10 @@ Pour commencer
 \begin_layout Standard
 Bien entendu, pour utiliser cette classe de document, il vous faut sélectionner
  
-\begin_inset Quotes fld
-\end_inset
-
-
 \family sans
-slides
+FoilTe
-\begin_inset space ~
-\end_inset
-
-(FoilTe
 \family default
-X
+X dans le champ 
-\family sans
-)
-\family default
-
-\begin_inset Quotes frd
-\end_inset
-
- dans le champ 
 \family sans
 Classe
 \family default
@@ -10514,19 +10451,19 @@ foils
 
 \begin_layout Itemize
 La taille par défaut est de 20
-\begin_inset space ~
+\begin_inset space \thinspace{}
 \end_inset
 
 pt, les autres choix étant respectivement 17
-\begin_inset space ~
+\begin_inset space \thinspace{}
 \end_inset
 
 pt, 25
-\begin_inset space ~
+\begin_inset space \thinspace{}
 \end_inset
 
 pt et 30
-\begin_inset space ~
+\begin_inset space \thinspace{}
 \end_inset
 
 pt.
@@ -10552,11 +10489,9 @@ Romain
 \begin_layout Itemize
 
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
  accepte les formats de papier A4 et Letter, ainsi qu'un format particulier
  pour travailler avec des diapos 35mm.
  Les tailles A5, B5, 
@@ -10609,11 +10544,9 @@ page
  se comportent un peu différemment avec cette classe.
  
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
  propose en effet des possibilités plus étendues pour les en-têtes et pieds
  de page, comme l'insertion d'un logo défini par l'utilisateur.
  Voyez la section
@@ -10700,11 +10633,9 @@ fancyheadings
 \family default
 , et ce même si son utilisation est déconseillée par l'auteur de 
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
  car certaines incompatibilités apparaissent.
 \end_layout
 
@@ -10754,7 +10685,7 @@ pouces sur 11
 \end_inset
 
 pouces, ce qui donne le même rapport largeur/hauteur qu'une diapo 35
-\begin_inset space ~
+\begin_inset space \thinspace{}
 \end_inset
 
 mm, facilitant ainsi le travail avec ce support.
@@ -10788,11 +10719,9 @@ dvips
 \series default
  Cette option indique à 
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
  d'utiliser le pilote dvips pour effectuer les rotations des pages en format
  paysage.
  (Elle est automatiquement activée à la création d'un nouveau document 
@@ -10856,31 +10785,17 @@ foils
 .
  Il y a des environnements supplémentaires fournis par 
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
  ainsi que deux apportés par \SpecialChar LyX
 .
  Les environnements suivants sont partagés avec d'autres classes :
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Multiple Columns
-status collapsed
+status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{2}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -10991,17 +10906,6 @@ Légende
 Commentaire
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -11012,11 +10916,9 @@ En gros, il s'agit de tous les environnements, mis à part ceux de section.
  En effet, dans un diaporama, les sections sont en fait les diapos elles-mêmes.
  
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
  propose des commandes pour commencer de nouvelles diapos :
 \end_layout
 
@@ -11064,29 +10966,15 @@ De plus, les diapos sont souvent utilisées pour exposer des idées, ou de
  nouveaux théorèmes.
  De ce fait, 
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
  fournit aussi un ensemble d'outils pour les présenter :
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Multiple Columns
-status collapsed
+status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{2}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -11154,17 +11042,6 @@ Proposition*
 Définition*
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -11196,11 +11073,9 @@ ListeCroix
 \begin_layout Standard
 
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
 offre aussi de nombreuses possibilités pour les en-têtes et pieds de pages,
  qu'il vaut mieux définir dans le préambule, bien que vous puissiez le faire
  à tout moment dans le document.
@@ -11221,20 +11096,8 @@ Martin Vermeer
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Multiple Columns
-status collapsed
+status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{multicols}{2}
-\end_layout
-
-\end_inset
-
-
-\end_layout
 
 \begin_layout Itemize
 
@@ -11279,7 +11142,7 @@ En-tête_Gauche
 \end_layout
 
 \begin_deeper
-\begin_layout Standard
+\begin_layout Plain Layout
 \begin_inset space ~
 \end_inset
 
@@ -11287,17 +11150,6 @@ En-tête_Gauche
 \end_layout
 
 \end_deeper
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{multicols}
-\end_layout
-
 \end_inset
 
 
@@ -11613,11 +11465,9 @@ Figures et tableaux
 \begin_layout Standard
 
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
  redéfinit la notion de figures et tables flottantes afin qu'elles apparaissent
  exactement là où elles sont dans le texte plutôt qu'en haut des pages où
  en une quelconque autre position prédéfinie.
@@ -11653,11 +11503,9 @@ Restriction
 
 -Typeset by 
 \family sans
-\lang english
 Foil\SpecialChar TeX
 
 \family default
-\lang french
 -
 \begin_inset Quotes frd
 \end_inset
@@ -12096,11 +11944,8 @@ Diapos Slides (alias S
 \noun on
 li
 \noun default
-T
+\SpecialChar TeX
-\noun on
+)
-e
-\noun default
-X)
 \begin_inset CommandInset label
 LatexCommand label
 name "sec:slitex"
@@ -27538,29 +27383,7 @@ Jpgfdraw
 \family default
  , aller au menu 
 \family sans
-Te
+TeX/LaTeX\SpecialChar menuseparator
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X/LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
 Set Normal Size
 \family default
@@ -27575,29 +27398,7 @@ Tracer une forme.
 \begin_layout Enumerate
 Utiliser le menu 
 \family sans
-Te
+TeX/LaTeX\SpecialChar menuseparator
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X/LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX\SpecialChar menuseparator
 Shapepar
 \family default
  pour exporter la forme en coordonnées.

lib/doc/fr/Customization.lyx

@@ -6420,8 +6420,7 @@ format local
 Vous le trouverez via 
 \family sans
 Document\SpecialChar menuseparator
-Paramètres\SpecialChar ldots
+Paramètres\SpecialChar menuseparator
-\SpecialChar menuseparator
 Format local
 \family default
 .
@@ -6443,18 +6442,7 @@ Format
  N'importe quel format est admissible, mais on utilise d'habitude le format
  de la version de \SpecialChar LyX
  utilisée (pour \SpecialChar LyX
- 2.1, le format porte le numéro 48).
+ 2.2, le format porte le numéro 60).
- Vous devez savoir que le format local n'existe pas pour les versions de
- \SpecialChar LyX
- antérieures à 1.6, vous ne devez donc pas l'utiliser si vous envisagez
- d'exporter votre document en version 1.5 ou antérieure (en fait, sans perdre
- l'information de format local).
- Si vous souhaitez exporter vers \SpecialChar LyX
- version 1.6 — le format local est reconnu,
- mais il n'y a pas d'interface pour y accéder — vous devez alors utiliser
- le format 11 et bien entendu vous restreindre aux constructions de format
- qui étaient disponibles avec \SpecialChar LyX
- 1.6.
 \end_layout
 
 \begin_layout Standard
@@ -6598,8 +6586,7 @@ ma_classe.layout
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass{report}
-Class{report}
 \end_layout
 
 \begin_layout Standard
@@ -6609,8 +6596,7 @@ en :
 \begin_layout LyX-Code
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass[report, ma_classe.sty]{report (ma_classe)}
-Class[report, ma_classe.sty]{report (ma_classe)}
 \end_layout
 
 \begin_layout Standard
@@ -6679,8 +6665,7 @@ status collapsed
 
 \begin_layout Plain Layout
 Document\SpecialChar menuseparator
-Paramètres\SpecialChar ldots
+Paramètres\SpecialChar menuseparator
-\SpecialChar menuseparator
 Classe de document
 \end_layout
 
@@ -6825,8 +6810,7 @@ ma_classe.sty
 \lang english
 #
 \backslash
-Declare\SpecialChar LyX
+DeclareLyXModule{mon paquetage} 
-Module{mon paquetage} 
 \end_layout
 
 \begin_layout LyX-Code
@@ -6854,7 +6838,7 @@ Module{mon paquetage}
 \begin_layout LyX-Code
 
 \lang english
-Format 35
+Format 60
 \begin_inset Newline newline
 \end_inset
 
@@ -6999,8 +6983,7 @@ thesis.layout
 \lang english
 
 \backslash
-Declare\SpecialChar LaTeX
+DeclareLaTeXClass[thesis,book]{thesis}
-Class[thesis,book]{thesis}
 \end_layout
 
 \begin_layout Standard
@@ -7407,18 +7390,7 @@ Ne pas effacer la ligne ci-dessous ; configure compte dessus.
 \size small
 #  
 \backslash
-DeclareLaT
+DeclareLaTeXClass{Article (Standard Class)}
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXClass{Article (Standard Class)}
 \end_layout
 
 \begin_layout LyX-Code
@@ -7637,18 +7609,7 @@ mon_article.layout
 \size small
 #  
 \backslash
-DeclareLaT
+DeclareLaTeXClass[article]{Article (avec Mes En-têtes)}
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXClass[article]{Article (avec Mes En-têtes)}
 \end_layout
 
 \begin_layout LyX-Code
@@ -7705,18 +7666,7 @@ Article (avec Mes En-têtes)
 \size small
 #  
 \backslash
-DeclareLaT
+DeclareLaTeXClass[article,machin.sty]{Article (avec Mes En-têtes)}
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXClass[article,machin.sty]{Article (avec Mes En-têtes)}
 \end_layout
 
 \begin_layout LyX-Code
@@ -7780,18 +7730,7 @@ Donc, de la manière la plus explicite, la forme d'une déclaration de format
 \size small
 #  
 \backslash
-DeclareLaT
+DeclareLaTeXClass[class,package.sty]{description du format}
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXClass[class,package.sty]{description du format}
 \end_layout
 
 \begin_layout LyX-Code
@@ -7983,22 +7922,7 @@ La première ligne d'un module doit être rédigée comme suit:
 \begin_layout LyX-Code
 #
 \backslash
-DeclareL
+DeclareLyXModule[endnotes.sty]{Endnotes}
-\size small
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size default
-yXModule[endnotes.sty]{Endnotes}
 \end_layout
 
 \begin_layout Standard
@@ -8274,7 +8198,7 @@ Format
 
 \lang french
 .
- Le numéro de format du présent fichier est le numéro 59.
+ Le numéro de format du présent fichier est le numéro 60.
  mais chaque version de \SpecialChar LyX
  peut lire les fichiers de format d'une version
  plus ancienne, comme elle peut lire les documents crées avec une version
@@ -20139,8 +20063,7 @@ s, etc).
 status collapsed
 
 \begin_layout Plain Layout
-\SpecialChar LyX
+LyxType
-Type
 \end_layout
 
 \end_inset
@@ -20165,7 +20088,21 @@ MultiPar
 
 \end_inset
 
- à faux.
+ à faux et 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ 
+\lang english
+to true
+\lang french
+.
  
 \begin_inset Flex Code
 status collapsed
@@ -20176,7 +20113,21 @@ MultiPar
 
 \end_inset
 
- peut être positionné à vrai pour les inserts 
+ peut être positionné à vrai ou 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ 
+\lang english
+to false
+\lang french
+, pour les inserts 
 \begin_inset Flex Code
 status collapsed
 
@@ -20195,8 +20146,7 @@ après
 status collapsed
 
 \begin_layout Plain Layout
-\SpecialChar LyX
+LyxType
-Type
 \end_layout
 
 \end_inset

lib/doc/fr/EmbeddedObjects.lyx

@@ -1120,7 +1120,7 @@ status open
 \begin_inset Float figure
 wide false
 sideways false
-status open
+status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Caption Standard
@@ -1162,7 +1162,7 @@ Structure indéfinissable
 \begin_inset Float figure
 wide false
 sideways false
-status open
+status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Caption Standard
@@ -25022,8 +25022,6 @@ arg   "label-insert"
  Une boîte grise de ce genre : 
 \begin_inset Graphics
 	filename clipart/label.png
-	lyxscale 85
-	scale 85
 	scaleBeforeRotation
 
 \end_inset
@@ -25077,8 +25075,7 @@ arg   "dialog-show-new-inset ref"
  une.
  Une boîte grise de référence croisée comme celle-ci : 
 \begin_inset Graphics
-	filename ../clipart/reference.png
+	filename clipart/reference.png
-	scale 85
 	scaleBeforeRotation
 
 \end_inset
@@ -31482,19 +31479,27 @@ sideways false
 status open
 
 \begin_layout Plain Layout
-\begin_inset ERT
+\noindent
-status collapsed
+\align center
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename ../clipart/without_fntright.pdf
 	width 100col%
@@ -31503,12 +31508,6 @@ framebox{
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -31548,19 +31547,27 @@ sideways false
 status open
 
 \begin_layout Plain Layout
-\begin_inset ERT
+\noindent
-status collapsed
+\align center
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename ../clipart/with_fntright.pdf
 	width 100col%
@@ -31569,12 +31576,6 @@ framebox{
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -31683,32 +31684,33 @@ status open
 
 \begin_layout Plain Layout
 \align center
-\begin_inset ERT
+\begin_inset Box Boxed
-status collapsed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-framebox{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Graphics
 	filename ../clipart/endnotes.pdf
+	width 100col%
 	scaleBeforeRotation
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset

lib/doc/fr/Math.lyx

@@ -34725,6 +34725,38 @@ Maxima
 \end_inset
 
 
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ One needs to use proper delimiter insets 
+\begin_inset Formula $\left(\right)$
+\end_inset
+
+ instead of simple '(' ')' characters.
+\end_layout
+
+\end_inset
+
+ 
 \end_layout
 
 \begin_layout Itemize
@@ -34743,6 +34775,20 @@ Maxima
 \end_inset
 
 
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula $solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsection

lib/doc/fr/Tutorial.lyx

@@ -5,25 +5,6 @@
 \save_transient_properties true
 \origin /systemlyxdir/doc/fr/
 \textclass book
-\begin_preamble
-% DO NOT ALTER THIS PREAMBLE!!!
-%
-%This preamble is designed to ensure that the document prints
-% out as advertised. If you mess with this preamble,
-% parts of the document may not print out as expected.  If you
-% have problems LaTeXing this file, please contact 
-% the documentation team
-% email: lyx-docs@lists.lyx.org
-
-% the pages of the TOC is numbered roman
-% and a pdf-bookmark for the TOC is added
-\let\myTOC\tableofcontents
-\renewcommand\tableofcontents{%
-  \frontmatter
-  \pdfbookmark[1]{\contentsname}{}
-  \myTOC
-  \mainmatter }
-\end_preamble
 \use_default_options false
 \maintain_unincluded_children false
 \language french
@@ -56,7 +37,7 @@
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen true
 \pdf_bookmarksopenlevel 1
-\pdf_breaklinks false
+\pdf_breaklinks true
 \pdf_pdfborder false
 \pdf_colorlinks true
 \pdf_backref false
@@ -749,46 +730,7 @@ arg   "buffer-view"
  de la barre d'outils\SpecialChar endofsentence
  \SpecialChar LyX
  lancera une visionneuse PDF qui affichera l'aspect
- de votre document une fois imprimé
+ de votre document une fois imprimé;
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Vous pouvez gagner du temps en laissant tourner la visionneuse PDF en tâche
- de fond.
- Vous pourrez alors utiliser 
-\family sans
-Visualiser\SpecialChar menuseparator
-Mise
-\begin_inset space ~
-\end_inset
-
-à
-\begin_inset space ~
-\end_inset
-
-Jour
-\family default
- ou le bouton 
-\begin_inset Info
-type  "icon"
-arg   "buffer-update"
-\end_inset
-
- et simplement cliquer sur la fenêtre de la visionneuse PDF (ou la 
-\begin_inset Quotes fld
-\end_inset
-
-désiconifier
-\begin_inset Quotes frd
-\end_inset
-
-) ensuite.
-\end_layout
-
-\end_inset
-
-;
 \end_layout
 
 \begin_layout Itemize
@@ -814,6 +756,60 @@ Magnifique ! Vous venez d'écrire votre premier document \SpecialChar LyX
 \shape slanted
 \SpecialChar endofsentence
 
+\begin_inset Newline newline
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+\lang english
+A hint
+\lang french
+:
+\series default
+ Vous pouvez gagner du temps en laissant tourner la visionneuse PDF en tâche
+ de fond.
+ Vous pourrez alors utiliser 
+\family sans
+Visualiser\SpecialChar menuseparator
+Mise
+\begin_inset space ~
+\end_inset
+
+à
+\begin_inset space ~
+\end_inset
+
+Jour
+\family default
+ ou le bouton 
+\begin_inset Info
+type  "icon"
+arg   "buffer-update"
+\end_inset
+
+ et simplement cliquer sur la fenêtre de la visionneuse PDF ensuite.
+ 
+\lang english
+Under Windows still use
+\lang french
+ 
+\family sans
+Document\SpecialChar menuseparator
+Visionner
+\family default
+ ou 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
+\end_inset
+
+ 
+\lang english
+respectively.
 \end_layout
 
 \begin_layout Subsection
@@ -1004,7 +1000,7 @@ de
 \end_inset
 
 texte\SpecialChar menuseparator
-Personnalisé...
+Personnalisé 
 \family default
 (bouton 
 \begin_inset Info
@@ -1357,7 +1353,11 @@ Entrée
 \end_layout
 
 \begin_layout LyX-Code
-Ceci est une introduction pour mon premier document \SpecialChar LyX
+Ceci est une introduction pour mon premier
+\begin_inset Newline newline
+\end_inset
+
+document \SpecialChar LyX
 .
  
 \end_layout
@@ -1371,24 +1371,7 @@ Entrée
 \family sans
 Section
 \family default
- dans la boîte d'
+ dans la boîte d'Environnement.
-\family sans
-Environ
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
--
-\end_layout
-
-\end_inset
-
-nement
-\family default
-.
  \SpecialChar LyX
  affiche un 
 \begin_inset Quotes fld
@@ -1498,24 +1481,7 @@ Cliquez sur la deuxième ligne et choisissez
 \family sans
 SousSection
 \family default
- dans la boîte d'
+ dans la boîte d'Environnement.
-\family sans
-Environ
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
--
-\end_layout
-
-\end_inset
-
-nement
-\family default
-.
  \SpecialChar LyX
  numérote la sous-section 
 \begin_inset Quotes fld
@@ -1677,12 +1643,17 @@ SousSousSection
  
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Dans le fichier 
+: Dans le fichier 
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -1775,11 +1746,7 @@ Entrée
 \family sans
 ListePuces
 \family default
- dans la boîte d'
+ dans la boîte d'Environnement (
-\family sans
-Environnement
-\family default
- (
 \begin_inset Info
 type  "icon"
 arg   "layout Itemize"
@@ -2003,12 +1970,17 @@ Insécables
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Typographier la liste dans 
+: Typographier la liste dans 
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -2061,7 +2033,7 @@ Citation
 \SpecialChar LyX
 -Code
 \family default
-
+;
 \begin_inset Foot
 status collapsed
 
@@ -2079,8 +2051,8 @@ d'apprentissage
 
 \end_inset
 
-; cet environnement est le seul qui permette d'entrer plusieurs espaces
+ cet environnement est le seul qui permette d'entrer plusieurs espaces consécuti
- consécutives, pour pouvoir indenter le code.
+ves, pour pouvoir indenter le code.
  Vous pouvez écrire de la poésie avec l'environnement 
 \family sans
 Vers
@@ -2111,12 +2083,17 @@ l'Utilisateur
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Corrigez la typographie de la citation (
+: Corrigez la typographie de la citation (
 \family sans
 Cite
 \family default
@@ -2242,7 +2219,7 @@ Votre document est sans doute écrit en classe de document
 \family sans
 Article
 \family default
-
+.
 \begin_inset Foot
 status collapsed
 
@@ -2252,7 +2229,6 @@ C'est habituellement la classe de document implicite.
 
 \end_inset
 
-.
  Essayez de basculer vers d'autres classes (dans la fenêtre 
 \family sans
 Document\SpecialChar menuseparator
@@ -2575,7 +2551,7 @@ Description
 \family default
  vous sont déjà familiers.
  Vous pouvez vous entraîner un moment pour vous rendre compte du comportement
- des nouveaux environnements
+ des nouveaux environnements.
 \begin_inset Foot
 status collapsed
 
@@ -2585,7 +2561,8 @@ NdT : il est intéressant de noter ici que les environnements ont parfois
  \SpecialChar LyX
  et le document sont configurés pour travailler en Français.
  (ex : adresse de l'expéditeur affichée à droite mais comme il se doit imprimée
- à gauche ...)
+ à gauche \SpecialChar ldots
+)
 \end_layout
 
 \begin_layout Plain Layout
@@ -2599,7 +2576,6 @@ PDF
 
 \end_inset
 
-.
  L'environnement 
 \family sans
 Signature
@@ -2796,12 +2772,21 @@ Résumé
  
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Corrigez le titre, la date, et l'auteur dans le fichier 
+: Corrigez le titre, la date, et l'auteur dans le fichier
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -3148,7 +3133,7 @@ Nous disions que \SpecialChar LyX
 
 2.
  Relancez \SpecialChar LaTeX
-
+,
 \begin_inset Foot
 status collapsed
 
@@ -3176,7 +3161,7 @@ PDF
 
 \end_inset
 
-, et – voilà !
+ et – voilà !
 \begin_inset Foot
 status collapsed
 
@@ -3250,7 +3235,7 @@ l'Utilisateur
 \family sans
 Coller
 \family default
- dans votre document
+ dans votre document.
 \begin_inset Foot
 status collapsed
 
@@ -3276,15 +3261,20 @@ reference "sec:classes-de-documents"
 
 \end_inset
 
-.
+
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Corrigez les références à l'intérieur de 
+: Corrigez les références à l'intérieur de 
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -3509,12 +3499,17 @@ ez-le à son tour en note en marge.
  
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Corrigez la note de bas de page dans 
+: Corrigez la note de bas de page dans 
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -3558,7 +3553,11 @@ Le Manuel d'apprentissage de \SpecialChar LyX
 \begin_inset Quotes fld
 \end_inset
 
-L'Équipe de Documentation de \SpecialChar LyX
+L'Équipe de
+\begin_inset Newline newline
+\end_inset
+
+Documentation de \SpecialChar LyX
 
 \begin_inset Quotes frd
 \end_inset
@@ -3736,12 +3735,21 @@ l'Utilisateur
  pour de plus amples informations sur le sujet.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
-Exercice :
+Exercice
+\begin_inset space ~
+\end_inset
+
+:
 \series default
  Corrigez la bibliographie et la citation dans
+\begin_inset Newline newline
+\end_inset
+
+
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -3872,12 +3880,17 @@ Pour supprimer la table des matières de votre document, il vous suffit d'efface
  
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Corrigez la table des matières du fichier 
+: Corrigez la table des matières du fichier 
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -3913,7 +3926,7 @@ Palette
 Mathématique
 \family default
  vous permettra d'obtenir, facilement et rapidement, des écrits mathématiques
- d'aspect professionnel
+ d'aspect professionnel.
 \begin_inset Foot
 status collapsed
 
@@ -3930,7 +3943,7 @@ s.
 
 \end_inset
 
-.
+
 \end_layout
 
 \begin_layout Section
@@ -4348,12 +4361,17 @@ _
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Mettez l'équation n°1 du fichier 
+: Mettez l'équation n°1 du fichier 
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -4686,12 +4704,17 @@ Bas
  autres fractions, ou tout autre chose.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Mettez l'équation n° 2 de 
+: Mettez l'équation n° 2 de 
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -4879,12 +4902,17 @@ Fonctions
 .
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Mettez l'équation n° 3 de 
+: Mettez l'équation n° 3 de 
 \family typewriter
 exemple_brut.lyx
 \family default
@@ -5196,25 +5224,35 @@ e, ce que vous ne souhaitez probablement pas.
  
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : Mettez les différentes formules du fichier 
+: Mettez les différentes formules du fichier 
 \family typewriter
 exemple_brut.lyx
 \family default
  en mode hors ligne, et constatez les différences de typographie.
 \end_layout
 
-\begin_layout Standard
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
 
 \series bold
 Exercice
+\begin_inset space ~
+\end_inset
+
+
 \series default
- : En utilisant les différents outils dont vous avez appris le maniement
+: En utilisant les différents outils dont vous avez appris le maniement
- dans cette section, vous devriez pouvoir écrire une équation comme celle-ci
+ dans cette section, vous devriez pouvoir écrire une équation comme celle-ci:
 \begin_inset Foot
 status collapsed
 
@@ -5232,7 +5270,7 @@ cas.
 
 \end_inset
 
-:
+
 \begin_inset Formula 
 \[
 f(x)=\left\{ \begin{array}{cc}
@@ -5360,7 +5398,7 @@ type  "icon"
 arg   "tabular-insert"
 \end_inset
 
- de la barre d'outils) pour obtenir un tableau
+ de la barre d'outils) pour obtenir un tableau.
 \begin_inset Foot
 status collapsed
 
@@ -5388,7 +5426,6 @@ table
 
 \end_inset
 
-.
  Cliquez sur le tableau avec le 
 \emph on
 bouton droit
@@ -5663,8 +5700,7 @@ Code
 \begin_inset space ~
 \end_inset
 
-\SpecialChar TeX
+TeX
-
 \family default
  (bouton 
 \begin_inset Info
@@ -5850,8 +5886,7 @@ Vous pouvez importer des fichiers \SpecialChar LaTeX
 \family sans
 Fichier\SpecialChar menuseparator
 Importer\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX.
-.
 
 \family default
  Celle-ci appelle le programme 
@@ -5963,8 +5998,7 @@ Vous voudrez peut-être convertir un document \SpecialChar LyX
 \family sans
 Fichier\SpecialChar menuseparator
 Exporter\SpecialChar menuseparator
-\SpecialChar LaTeX
+LaTeX.
-.
 
 \family default
  Vous obtiendrez un fichier 
@@ -6024,16 +6058,12 @@ Si vous avez des commandes spéciales à mettre dans le préambule d'un fichier
  
 \family sans
 Document\SpecialChar menuseparator
-Paramètres
+Paramètres\SpecialChar menuseparator
-\family default
-, rubrique 
-\family sans
 Préambule
 \begin_inset space ~
 \end_inset
 
-\SpecialChar LaTeX
+LaTeX
-
 \family default
  fait apparaître une fenêtre dans laquelle vous pouvez taper ces commandes
  (ou une simple zone de texte, cela dépend de l'interface utilisée).
@@ -6069,11 +6099,10 @@ Bibliographie
 \begin_inset space ~
 \end_inset
 
-Bib\SpecialChar TeX
+BibTeX
-
 \family default
  pour inclure un fichier Bib\SpecialChar TeX
-
+.
 \begin_inset Foot
 status collapsed
 
@@ -6096,7 +6125,6 @@ Ne vous étonnez pas si l'ouverture de la fenêtre prend un peu de temps:
 
 \end_inset
 
-.
  Dans le champ 
 \family sans
 Base
@@ -6252,7 +6280,7 @@ frenchbsetup
 \begin_inset Newline newline
 \end_inset
 
-de votre distribution
+de votre distribution.
 \begin_inset Foot
 status collapsed
 
@@ -6270,7 +6298,6 @@ AtBeginDocument{}
 
 \end_inset
 
-.
  Vous pouvez également visiter le site de l'auteur de ce fichier, 
 \begin_inset CommandInset href
 LatexCommand href
@@ -6314,7 +6341,7 @@ oe{}
 oe{} en mode \SpecialChar TeX
 , ou bien en utilisant directement l'encodage implicite avec
  une touche ou une combinaison de touches qui appellent le bon code avec
- un clavier correctement configuré
+ un clavier correctement configuré.
 \begin_inset Foot
 status collapsed
 
@@ -6371,7 +6398,6 @@ que vous pouvez associer à une combinaison de touches non affectée.
 
 \end_inset
 
-.
  
 \end_layout
 

lib/doc/fr/UserGuide.lyx

@@ -4384,19 +4384,19 @@ Implicite
 \begin_layout Itemize
 
 \family sans
-A0 - A6
+A0 – A6
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-B0 - B6
+B0 – B6
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-C0 - C6
+C0 – C6
 \end_layout
 
 \begin_layout Itemize
@@ -4408,7 +4408,7 @@ lettre US, légal US, executive US
 \begin_layout Itemize
 
 \family sans
-JIS B0 - JIS B6
+JIS B0 – JIS B6
 \end_layout
 
 \begin_layout Itemize
@@ -4942,7 +4942,7 @@ begin{
 \emph on
 environnement
 \emph default
-} ...
+} \SpecialChar ldots
  
 \backslash
 end{
@@ -24131,7 +24131,7 @@ status open
 \begin_inset Float figure
 wide false
 sideways false
-status open
+status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Caption Standard
@@ -27949,8 +27949,7 @@ arg   "label-insert"
  de la palette.
  Une boîte grise de ce genre 
 \begin_inset Graphics
-	filename ../clipart/label.png
+	filename clipart/label.png
-	scale 85
 
 \end_inset
 
@@ -28033,8 +28032,7 @@ arg   "dialog-show-new-inset ref"
 .
  Une boîte grise de référence croisée de ce genre 
 \begin_inset Graphics
-	filename ../clipart/reference.png
+	filename clipart/reference.png
-	scale 85
 
 \end_inset
 
@@ -33088,7 +33086,7 @@ Personnalisation en-têtes/pieds de page
 \begin_inset space ~
 \end_inset
 
-styles suivants:
+environnements suivants:
 \end_layout
 
 \begin_layout Description
@@ -33141,6 +33139,9 @@ droit
 
 \begin_layout Standard
 pour paramétrer les différentes positions dans l'en-tête et le pied.
+ 
+\lang english
+These environments can be selected in the environment pull-down box.
 \end_layout
 
 \begin_layout Standard
@@ -33549,15 +33550,11 @@ où
 \begin_inset Quotes frd
 \end_inset
 
- est une taille en unités standard comme 
+ est une taille en unités standard (pour example 
-\family sans
+\series bold
-pt
+1cm
-\family default
+\series default
- ou 
+).
-\family sans
-mm
-\family default
-.
  Si vous ne voulez pas de ligne, positionnez l'épaisseur à 0
 \begin_inset space ~
 \end_inset

lib/doc/it/Intro.lyx

@@ -936,7 +936,7 @@ Alcuni staranno leggendo i manuali dopo averli stampati.
  generale.
  Per aprire una nota a piè di pagina, che si presenta così:
 \begin_inset Graphics
-	filename C:/Program Files (x86)/LyX 2.2/Resources/doc/it/clipart/it_footnoteQt4.png
+	filename ../clipart/footnote.png
 	scale 75
 
 \end_inset
@@ -959,7 +959,7 @@ in linea
 
 , invece, appaiono come box color grigio chiaro, analoghi a questo:
 \begin_inset Graphics
-	filename C:/Program Files (x86)/LyX 2.2/Resources/doc/it/clipart/it_referenceQt4.png
+	filename ../clipart/reference.png
 	scale 75
 
 \end_inset

lib/doc/ja/DummyDocument1.lyx

@@ -82,7 +82,7 @@ name "subsec:外部文書の第1小節"
 \end_layout
 
 \begin_layout Standard
-これは、ファイルが別の文書にどのように挿入されるかを示すための、短いダミー子文書です。
+これは，ファイルが別の文書にどのように挿入されるかを示すための，短いダミー子文書です．
 \end_layout
 
 \end_body

lib/doc/ja/DummyDocument2.lyx

@@ -76,7 +76,7 @@
 \end_layout
 
 \begin_layout Standard
-これは、ファイルが別の文書にどのように挿入されるかを示すための、もう一つの短いダミー子文書です。
+これは，ファイルが別の文書にどのように挿入されるかを示すための，もう一つの短いダミー子文書です．
 \end_layout
 
 \end_body

lib/doc/ja/Formula-numbering.lyx

@@ -61,7 +61,7 @@
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format pdf
+\default_output_format pdf3
 \output_sync 0
 \bibtex_command default
 \index_command default
@@ -111,7 +111,7 @@
 \begin_body
 
 \begin_layout Standard
-この文書は、二つの数式カテゴリの使い方を示すものです。一つのカテゴリにはアラビア数字、もう一つはローマ数字で番号が振られています。
+この文書は，二つの数式カテゴリの使い方を示すものです．一つのカテゴリにはアラビア数字，もう一つはローマ数字で番号が振られています．
 \end_layout
 
 \begin_layout Standard
@@ -294,8 +294,8 @@ height "1pt"
 \begin_inset VSpace medskip
 \end_inset
 
-この例を作成するには、ローマ数字の数式のカウンタをまず定義しなくてはなりません。そのためには、\SpecialChar LaTeX
+この例を作成するには，ローマ数字の数式のカウンタをまず定義しなくてはなりません．そのためには，\SpecialChar LaTeX
-プリアンブルに以下のように入力します。
+プリアンブルに以下のように入力します．
 \end_layout
 
 \begin_layout Standard
@@ -324,7 +324,7 @@ roman{rom}}
 \series bold
 equation
 \series default
-の値を保存するには、プリアンブルに以下のように入力します。
+の値を保存するには，プリアンブルに以下のように入力します．
 \end_layout
 
 \begin_layout Standard
@@ -366,7 +366,7 @@ theequation
 \end_layout
 
 \begin_layout Standard
-文書中で二つの連番スキームの間を切り替えるには、ローマ数字用に
+文書中で二つの連番スキームの間を切り替えるには，ローマ数字用に
 \end_layout
 
 \begin_layout Standard
@@ -392,7 +392,7 @@ therom}
 \end_layout
 
 \begin_layout Standard
-というコマンドをプリアンブルで定義し、アラビア数字用には
+というコマンドをプリアンブルで定義し，アラビア数字用には
 \end_layout
 
 \begin_layout Standard
@@ -418,24 +418,24 @@ org@theeq}
 \end_layout
 
 \begin_layout Standard
-と定義します。
+と定義します．
 \end_layout
 
 \begin_layout Standard
-各数式は、既定ではアラビア数字で連番が振られます。ローマ数字に切り替えるには\SpecialChar TeX
+各数式は，既定ではアラビア数字で連番が振られます．ローマ数字に切り替えるには\SpecialChar TeX
 コードで
 \series bold
 
 \backslash
 setrom
 \series default
-コマンドを挿入します。
+コマンドを挿入します．
 \series bold
 
 \backslash
 setarab
 \series default
-コマンドで連番はアラビア数字に切り替わります。
+コマンドで連番はアラビア数字に切り替わります．
 \end_layout
 
 \end_body

lib/doc/ja/MergedManuals.lyx

@@ -209,7 +209,7 @@ filename "Customization.lyx"
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
-filename "LFUNs.lyx"
+filename "../LFUNs.lyx"
 
 \end_inset
 

lib/doc/ja/Shortcuts.lyx

@@ -49,7 +49,7 @@ End
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format pdf
+\default_output_format pdf3
 \output_sync 0
 \bibtex_command default
 \index_command default

lib/examples/FeynmanDiagrams.lyx

@@ -170,10 +170,6 @@ propagators
 \end_inset
 
 , for example:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard

lib/examples/Foils.lyx

@@ -178,28 +178,16 @@ zerolistvertdimens{}
 \end_inset
 
 The new Itemize Bullet Selection popup
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 is tailor-made for use with the foils class
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 allowing you to select the bullet used
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -403,7 +391,7 @@ As you can see, we are still in the same lemma.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 

lib/examples/ItemizeBullets.lyx

@@ -94,28 +94,16 @@ You'll see pretty quickly that bullet settings can be quite complex if you
 itemize
 \emph default
  is the standard environment for bullet lists
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 it has its own counter that limits it to 4 levels
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 each level can have its own bullet shape
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -134,10 +122,6 @@ Also note that \SpecialChar LyX
 not
 \emph default
  check the environment depths for you
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper

lib/examples/aa_sample.lyx

@@ -556,10 +556,6 @@ key "Abernethy2003"
 
 ).
  Using Baker's notation:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard

lib/examples/beamer.lyx

@@ -106,9 +106,6 @@ V.
 \end_layout
 
 \begin_layout Frame
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -175,10 +172,6 @@ Beamer
 \end_inset
 
  class, you can produce presentation slides, which
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -228,7 +221,7 @@ and much more \SpecialChar ldots
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -249,10 +242,6 @@ Purpose of this presentation
 
 \begin_layout Frame
 This presentation
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -316,10 +305,6 @@ The global structure
 
 \begin_layout Frame
 A presentation usually consists of
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -341,7 +326,7 @@ We describe these global segments in what follows.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -424,10 +409,6 @@ TitleGraphic
 
 .
  
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -555,7 +536,7 @@ Title
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -596,10 +577,6 @@ Beamer
 .
  Everything inside a frame is put on one slide (which itself might consist
  of sub-slides).
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -716,7 +693,7 @@ Default Overlay Specifications
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -771,10 +748,6 @@ label
 \end_inset
 
  (as done here).
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -826,10 +799,6 @@ overlays
 \end_inset
 
 ).
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -859,7 +828,7 @@ Here's the proof!
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -876,10 +845,6 @@ Keeping frames together
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -934,7 +899,7 @@ So please avoid this
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -968,10 +933,6 @@ Separator
 \end_inset
 
  paragraph style.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1051,7 +1012,7 @@ myframe
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1073,10 +1034,6 @@ Special frame types
 \begin_layout PlainFrame
 \SpecialChar LyX
  provides two special frame types:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1138,7 +1095,7 @@ fragile
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1155,10 +1112,6 @@ Sectioning a presentation
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1210,7 +1163,7 @@ modes
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1227,10 +1180,6 @@ Parts have special meaning
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1293,7 +1242,7 @@ header will also only show the sections of
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1310,10 +1259,6 @@ Re-arranging frames
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1362,7 +1307,7 @@ Navigate
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1379,10 +1324,6 @@ The appendix
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1398,10 +1339,6 @@ header
 \begin_layout Itemize
 An appendix is inserted as usual in \SpecialChar LyX
 :
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1423,10 +1360,6 @@ Start Appendix Here
 \end_deeper
 \begin_layout Itemize
 Typical content of the appendix is the bibliography
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1485,10 +1418,6 @@ What are overlays?
 Basically, the overlay concept allows to change the slide content dynamically.
  You can uncover things/text piecewise, fade out content, highlight things,
  replace text, images etc.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1542,7 +1471,7 @@ Really, use them!
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1573,10 +1502,6 @@ Beamer
 
  provides many different overlay types.
  The most important ones are:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1611,7 +1536,7 @@ We give examples for these types in what follows, but begin with some general
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1692,10 +1617,6 @@ article
 \end_inset
 
  etc.)
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1737,10 +1658,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1810,10 +1727,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1903,7 +1816,7 @@ Note that \SpecialChar LyX
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1955,10 +1868,6 @@ Overlay Specifications
 \end_inset
 
 , the quote will only appear on (sub-)slide 2:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1993,7 +1902,7 @@ This is how the concept works, basically.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2034,10 +1943,6 @@ hiding
  is just covered (and the space is reserved).
  If we would have hidden the quote on the last slide and not covered, it
  would only have taken space on appearance:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2067,12 +1972,16 @@ Home art gone, and ta’en thy wages
 \end_layout
 
 \end_deeper
+\begin_layout Frame
+
+\end_layout
+
 \begin_layout Frame
 You can see how this text moves when the quote is un-hidden.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2153,10 +2062,6 @@ transparent
 \end_inset
 
  mode, you can see covered text greyed-out:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2201,7 +2106,7 @@ Beamer
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2222,10 +2127,6 @@ Default overlay/action specifications vs.
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2279,10 +2180,6 @@ g.,
 
  will uncover all items in a list step by step (with a start offset of 1)
  if they have no individual item specification:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2341,7 +2238,7 @@ Beamer
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2382,10 +2279,6 @@ This frame uses a specific default overlay specification
 \begin_layout Frame
 which causes each overlay-aware paragraph \SpecialChar ldots
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2427,7 +2320,7 @@ A block
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2464,10 +2357,6 @@ Default overlay/action specifications vs.
 \noindent
 And this frame uses a specific default overlay specification \SpecialChar ldots
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2490,7 +2379,7 @@ And this frame uses a specific default overlay specification \SpecialChar ldots
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2522,10 +2411,6 @@ Pause
 
  layout lets you mark a point where all following content will be covered
  (by default for one slide, with regard to the content preceding the pause):
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2581,7 +2466,7 @@ Pause Number
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2614,10 +2499,6 @@ Beamer
  provide you with paragraph layouts whose purpose it is to show/hide
  whole paragraphs or sequences of paragraphs on specific slides.
  These are particularly:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2647,10 +2528,6 @@ Uncovered
 
  layout which uncovers all content on the specified slides \SpecialChar ldots
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2706,10 +2583,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2740,10 +2613,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2759,7 +2628,7 @@ as demonstrated here.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2823,10 +2692,6 @@ Text Style
 
  in \SpecialChar LyX
 :
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3038,7 +2903,7 @@ Insert
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3079,10 +2944,6 @@ Text Style
 
 ) are overlay-aware.
  
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3231,10 +3092,6 @@ Specific environments
 
 \begin_layout Frame
 Specific environments, particularly suited for presentations are:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3264,7 +3121,7 @@ We sketch them briefly in what follows.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3303,10 +3160,6 @@ hints
 
 .
  The class provides 3 pre-defined blocks with different look:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3409,7 +3262,7 @@ alert
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3426,20 +3279,12 @@ Handling Blocks
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 In \SpecialChar LyX
-, blocks have a similar user interface than frames, which means that
+, blocks have a similar user interface to frames, which means that
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3470,10 +3315,6 @@ Separator
 \end_inset
 
  paragraph style
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3529,7 +3370,7 @@ Blocks are overlay-aware
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3546,10 +3387,6 @@ Theorem-style environments
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3562,10 +3399,6 @@ Theorem-style environments
 Theorems look similar to blocks in the output, but they have a fixed title
  (depending on the type).
  
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3595,10 +3428,6 @@ Additional Theorem Text
 \end_inset
 
 , you can add some extra text to this fixed title
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3621,7 +3450,7 @@ An example with additional text (brackets added automatically)
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3642,17 +3471,10 @@ Columns
 
 \begin_layout Frame
 Sometimes it is useful to divide a presentation into columns
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout ColumnsTopAligned
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -3736,10 +3558,6 @@ Column
 
 \begin_layout Frame
 Note:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3843,10 +3661,6 @@ mode
  is a specific output route.
  There are several modes for different purposes.
  We just want to highlight three:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3911,7 +3725,7 @@ beamer
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3959,19 +3773,11 @@ presentation
 \end_inset
 
  mode.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 What does this mean?
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3991,7 +3797,7 @@ article
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4034,7 +3840,7 @@ article
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4057,10 +3863,6 @@ So what?
 This is actually pretty useful! You can set up a single document and produce
  both a presentation and – using the article mode – a handout.
  
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4095,7 +3897,7 @@ and so on \SpecialChar ldots
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4117,10 +3919,6 @@ Examples
 \begin_layout Frame
 As said, many elements are mode-aware.
  
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4226,10 +4024,6 @@ PresentationMode
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4305,7 +4099,7 @@ And much more of this sort \SpecialChar ldots
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4327,10 +4121,6 @@ Setting up an article
 \begin_layout Frame
 Setting up a beamer article with \SpecialChar LyX
  is easy.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4387,7 +4177,7 @@ And that's it.
 \end_deeper
 \begin_layout Frame
 Check out the accompanying beamer-article example document for this presentation.
- You can find it in the same folder than this document.
+ You can find it in the same folder as this document.
 \end_layout
 
 \begin_layout Section
@@ -4405,10 +4195,6 @@ Themes
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4499,7 +4285,7 @@ key "beamer-ug"
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4521,10 +4307,6 @@ Themes can be modified
 \begin_layout Frame
 But you do not need to write a theme from scratch if you want to alter the
  look.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4656,9 +4438,6 @@ newblock
 \end_layout
 
 \begin_layout Frame
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 

lib/examples/beamerlyxexample1.lyx

@@ -262,10 +262,6 @@ Outline
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -366,17 +362,10 @@ Tournaments Consist of Jousts Between Knights
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Columns
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -566,10 +555,6 @@ What is a Tournament?
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -616,7 +601,7 @@ In every joust one knight wins.
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -633,17 +618,10 @@ Tournaments are Complete Directed Graphs
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Columns
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -871,10 +849,6 @@ tournament
  
 \color inherit
 is a
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -894,7 +868,7 @@ any two different vertices.
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -921,10 +895,6 @@ Tournaments Arise Naturally in Different Situations
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -939,10 +909,6 @@ Applications in Ordering Theory
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -957,7 +923,7 @@ The comparison relation may be cyclic, however.
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -974,10 +940,6 @@ Applications in Sociology
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -992,7 +954,7 @@ Reviewers decide for any two candidates whom they prefer.
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1009,10 +971,6 @@ Applications in Structural Complexity Theory
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1053,10 +1011,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1193,10 +1147,6 @@ the Approximation Problem
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1333,10 +1283,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1351,10 +1297,6 @@ t,onlytextwidth
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1428,10 +1370,6 @@ Example Input
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1821,10 +1759,6 @@ Example Output
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2051,10 +1985,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2069,10 +1999,6 @@ Variants of Path Finding Problems
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2288,10 +2214,6 @@ Logspace Turing Machines
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2460,7 +2382,7 @@ end{pgfpicture}
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2477,10 +2399,6 @@ Logspace Turing Machines Are Quite Powerful
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2495,10 +2413,6 @@ Deterministic logspace machines can compute
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2530,10 +2444,6 @@ Non-deterministic logspace machines can compute
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2552,7 +2462,7 @@ satisfiability with two literals per clause.
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2589,10 +2499,6 @@ The Complexity Class Hierarchy
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2981,7 +2887,7 @@ end{pgfpicture}
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3014,10 +2920,6 @@ Limit the Circuit Depth
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3057,10 +2959,6 @@ t
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3083,10 +2981,6 @@ Circuit Class
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3103,9 +2997,6 @@ unbounded fan-in
 
 \end_deeper
 \begin_layout Examples
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -3148,10 +3039,6 @@ Circuit Class
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3168,9 +3055,6 @@ bounded fan-in
 
 \end_deeper
 \begin_layout Examples
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -3220,10 +3104,6 @@ Circuit Class
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3240,9 +3120,6 @@ bounded fan-in
 
 \end_deeper
 \begin_layout Examples
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -3289,10 +3166,6 @@ Are Equally Difficult
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3318,10 +3191,6 @@ Are Equally Difficult
 
 \begin_layout Corollary
 For directed graphs, we can solve
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3387,10 +3256,6 @@ But Not Trivial
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3410,7 +3275,7 @@ But Not Trivial
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3464,10 +3329,6 @@ Definition of the Tournament Reachability Problem
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3489,10 +3350,6 @@ contain all triples
 \end_inset
 
  such that
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3526,7 +3383,7 @@ there exists a path from
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3543,10 +3400,6 @@ The Tournament Reachability Problem is Very Easy
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3572,10 +3425,6 @@ Implications
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3640,10 +3489,6 @@ the Distance Problem
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3665,10 +3510,6 @@ contain all tuples
 \end_inset
 
  such that 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3706,7 +3547,7 @@ the distance of
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3723,10 +3564,6 @@ The Tournament Distance Problem is Hard
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3792,7 +3629,7 @@ in logarithmic space, iff
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3813,10 +3650,6 @@ Proof That
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3847,10 +3680,6 @@ t,onlytextwidth
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3895,10 +3724,6 @@ Reduce
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3967,7 +3792,7 @@ Query:
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3994,10 +3819,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5153,10 +4974,6 @@ Approximators Compute Paths that Are Nearly As Short As a Shortest Path
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5174,10 +4991,6 @@ approximation scheme for
  
 \color inherit
 gets as input
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5224,7 +5037,7 @@ a path from
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -5245,10 +5058,6 @@ the Tournament Shortest Path Problem
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5354,10 +5163,6 @@ Just a frame with a program code listing
 
 \begin_layout FragileFrame
 This is some program code:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5437,10 +5242,6 @@ Summary
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5455,10 +5256,6 @@ Summary
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5529,7 +5326,7 @@ in tournaments is
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -5546,10 +5343,6 @@ Outlook
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5624,10 +5417,6 @@ For Further Reading
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5860,10 +5649,6 @@ Definition of Independence Number of a Graph
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5898,7 +5683,7 @@ Tournaments have independence number 1.
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -5919,10 +5704,6 @@ Graphs With Bounded Independence Number
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -5963,7 +5744,7 @@ at most
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -5999,7 +5780,7 @@ for approximating the shortest path in graphs with independence number at
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -6083,10 +5864,6 @@ Is Party Unknown.
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -6103,10 +5880,6 @@ Is Party Unknown.
 
 \begin_layout Corollary
 For undirected graphs, we can solve
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -6242,10 +6015,6 @@ The Approximation Scheme is Optimal
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -6267,9 +6036,6 @@ Suppose there exists an approximation scheme for
 \end_layout
 
 \begin_layout Proof
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 

lib/examples/beamerposter.lyx

@@ -125,9 +125,6 @@ You can use any beamer element, especially the use of blocks is advisable.
 \end_layout
 
 \begin_layout Frame
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -378,10 +375,6 @@ status collapsed
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -546,10 +539,6 @@ Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -564,10 +553,6 @@ t
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -599,10 +584,6 @@ Enumerated Lists
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -657,10 +638,6 @@ Contact
 \end_inset
 
  
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -795,10 +772,6 @@ Some items and some math
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -835,7 +808,7 @@ some items
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -853,10 +826,6 @@ More items \SpecialChar ldots
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -886,7 +855,7 @@ some items
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -904,10 +873,6 @@ status collapsed
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper

lib/examples/ca/ItemizeBullets.lyx

@@ -92,28 +92,16 @@ Comprobareu deseguida que la configuració dels pics pot arribar a ser prou
 Enumeració* (itemize)
 \emph default
  és l'entorn estàndard per a llistes amb pics sense numerar
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 Té el seu comptador propi, limitat a quatre nivells
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 Cada nivell té el seu símbols o pics com a marca
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -132,10 +120,6 @@ A més heu de tenir en compte que el \SpecialChar LyX
 no
 \emph default
  comproba la profunditat de l'entorn
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper

lib/examples/de/FeynmanDiagrams.lyx

@@ -174,10 +174,6 @@ Propagatoren
 \end_inset
 
  fungieren zum Beispiel:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard

lib/examples/de/ItemizeBullets.lyx

@@ -110,28 +110,16 @@ Sie werden recht bald sehen, daß das Anpassen von Aufzählungszeichen recht
 Die Standardumgebung für Listen mit  Aufzählungszeichen ist 
 \emph on
 Auflistung
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 sie hat einen eigenen Zähler mit 4 Stufen
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 jede Stufe kann ihr eigenes Aufzählungszeichen haben
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -150,10 +138,6 @@ jede Stufe kann ihr eigenes Aufzählungszeichen haben
 nicht
 \emph default
 , ob die Stufen richtig sind
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper

lib/examples/de/Lebenslauf.lyx

@@ -170,10 +170,6 @@ Arbeitserfahrungen
  Leerzeichen einfügen.
  Dies ist ein \SpecialChar LyX
 -Mangel.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper

lib/examples/de/linguistics.lyx

@@ -218,10 +218,6 @@ key "covington"
 \end_inset
 
 : Dieses Paket wird benötigt, um nummerierte Beispiele und Glossen zu erzeugen.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -255,10 +251,6 @@ convington
  selbst nicht unterstützt).
  Das Paket ist darüber hinaus aber auch generell nützlich, um das Aussehen
  von Listen (Aufzählungen, Auflistungen, Beschreibungen) anzupassen.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -292,10 +284,6 @@ Bedeutung
 .
  Das Paket erlaubt es, kontextsensible Anführungszeichen zu generieren (bspw.
  je nach aktuell verwendeter Sprache).
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -325,10 +313,6 @@ key "float"
 : Dieses Paket brauchen wir für die OT-Tableaux und das Tableaux-Verzeichnis.
  Es sollte Bestandteil jeder \SpecialChar LaTeX
 -Distribution sein.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -356,10 +340,6 @@ key "forest"
 \end_inset
 
 : Dieses Paket wird zur Erzeugung von Strukturbäumen verwendet.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -744,10 +724,6 @@ Einstellungen\SpecialChar ldots
 -Vorspann
 \family default
  kopieren:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_layout Quote
@@ -930,7 +906,25 @@ Glossen (und Beispiele) in Beamer-Präsentationen
 \end_layout
 
 \begin_layout Standard
-Leider arbeiten das Paket 
+Wenn Sie das Linguistik-Modul in einer Beamer-Präsentation verwenden wollen,
+ beachten Sie bitte folgendes:
+\end_layout
+
+\begin_layout Itemize
+Für Glossen müssen Sie in Beamer immer einen 
+\begin_inset Quotes gld
+\end_inset
+
+fragilen
+\begin_inset Quotes grd
+\end_inset
+
+ Rahmen verwenden.
+ 
+\end_layout
+
+\begin_layout Itemize
+Ältere Versionen des Pakets 
 \emph on
 covington
 \emph default
@@ -938,7 +932,7 @@ covington
 \emph on
 Beamer
 \emph default
--Klasse von Haus aus nicht gut zusammen, da beide die Befehle 
+-Klasse arbeiten von Haus aus nicht gut zusammen, da beide die Befehle 
 \family typewriter
 
 \backslash
@@ -950,8 +944,9 @@ example
 \backslash
 examples
 \family default
- zu definieren versuchen, was eine \SpecialChar LaTeX
+ zu definieren versuchen, was in diesen älteren Versionen eine \SpecialChar LaTeX
--Fehlermeldung erzeugt.
+-Fehlermeldung
+ erzeugt, sobald sie Glossen oder Beispiele einfügen.
  Sie können das Problem beheben, indem Sie in 
 \family sans
 Dokument\SpecialChar menuseparator
@@ -961,6 +956,7 @@ Lokales Format
  folgenden Code kopieren:
 \end_layout
 
+\begin_deeper
 \begin_layout Quote
 \begin_inset listings
 lstparams "basicstyle={\footnotesize\ttfamily},tabsize=4"
@@ -1062,18 +1058,14 @@ OK
 \end_layout
 
 \begin_layout Standard
-Beachten Sie auch, dass Sie für Glossen in Beamer einen 
+Ab 
-\begin_inset Quotes gld
+\emph on
-\end_inset
+covington
-
+\emph default
-fragilen
+ 1.1 besteht dieses Problem nicht mehr.
-\begin_inset Quotes grd
-\end_inset
-
- Rahmen verwenden müssen.
- 
 \end_layout
 
+\end_deeper
 \begin_layout Section
 Tableaux für Optimalitätstheorie
 \end_layout
@@ -1982,7 +1974,7 @@ Es fehlt ein Symbol: der (2005 in das IPA aufgenommene) labiodentale Flap.
 \emph on
 Tipa-
 \emph default
-Pakete noch nicht; daher kann es auch nicht von LyX unterstützt werden.
+Paket noch nicht; daher kann es auch nicht von LyX unterstützt werden.
 \end_layout
 
 \end_inset

lib/examples/de/tufte-handout.lyx

@@ -122,29 +122,7 @@ Ein Beispiel zur Verwendung der Tufte-Handout-Klasse
 \end_layout
 
 \begin_layout Author
-Die Tufte-LaTe
+Die Tufte-LaTeX-Entwickler und das LyX-Team
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X-Entwickler und das Ly
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X-Team
 \end_layout
 
 \begin_layout Abstract

lib/examples/es/ItemizeBullets.lyx

@@ -95,28 +95,16 @@ Vas a comprobar enseguida que la configuración de marcas puede llega a ser
 Enumeración* (itemize)
 \emph default
  es el entorno estándar para las listas con marcas sin numerar
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 Tiene su propio contador, limitado a cuatro niveles
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 Cada nivel tiene su propio símbolo como marca
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -135,10 +123,6 @@ Además ten en cuenta que \SpecialChar LyX
 no
 \emph default
  comprueba la profundidad de entorno
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper

lib/examples/es/modernCV.lyx

@@ -1379,7 +1379,7 @@ Puedes insertar entradas de referencias bibliográficas (entorno Bibliografía):
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 

lib/examples/es/tufte-handout.lyx

@@ -152,29 +152,7 @@ Un ejemplo de uso del estilo Tufte-Handout
 \end_layout
 
 \begin_layout Author
-Desarrolladores de Tufte-LaTe
+Desarrolladores de Tufte-LaTeX y Equipo LyX
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X y Equipo Ly
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X
 \end_layout
 
 \begin_layout Abstract

lib/examples/fr/FeynmanDiagrams.lyx

@@ -182,10 +182,6 @@ propagateurs
 \end_inset
 
 , par exemple:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard

lib/examples/fr/Foils.lyx

@@ -179,28 +179,16 @@ zerolistvertdimens{}
 La fenêtre de sélection de la forme des puces Format\SpecialChar menuseparator
 Document\SpecialChar menuseparator
 Puces
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 est idéale avec la classe foils
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 vous permettant de choisir la puce
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -482,7 +470,7 @@ As you can see, we are still in the same lemma.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 

lib/examples/fr/ListesPuces.lyx

@@ -134,28 +134,16 @@ Vous verrez vite que vous pouvez rendre le réglage des puces assez complexe.
 ListePuces
 \family default
  est l'environnement standard pour les listes à puces
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 il a son propre compteur limité à 4 niveaux
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 chaque niveau peut avoir sa propre forme de puce
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -182,10 +170,6 @@ chaque niveau peut avoir sa propre forme de puce
 ne vérifie pas
 \emph default
  tout seul la profondeur de l'environnement
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper

lib/examples/fr/beamer.lyx

@@ -131,9 +131,6 @@ V.
 \end_layout
 
 \begin_layout Frame
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -200,10 +197,6 @@ Beamer
 \end_inset
 
 , vous pouvez créer, en vue d'une présentation, des diapositives qui
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -253,7 +246,7 @@ et beaucoup plus \SpecialChar ldots
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -274,10 +267,6 @@ Objectifs de cette présentation
 
 \begin_layout Frame
 Cette présentation
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -342,10 +331,6 @@ La structure globale
 
 \begin_layout Frame
 Une présentation comporte d'habitude
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -367,7 +352,7 @@ Ces éléments sont décrits ci-après
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -449,10 +434,6 @@ GraphiqueTitre
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -551,10 +532,6 @@ Date raccourcie\SpecialChar breakableslash
 
  Celles-ci sont utilisées dans le menu latéral ou les en-têtes (si le thème
  affiche de tels éléments)
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -585,7 +562,7 @@ Titre
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -625,10 +602,6 @@ Beamer
 
 : tout ce qui est dans un cadre est affiché sur une diapositive (qui peut
  elle-même comporter plusieurs sous-diapos)
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -738,7 +711,7 @@ Spécifications de recouvrement {implicites}
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -792,10 +765,6 @@ label
 \end_inset
 
  (comme il est fait ici)
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -846,10 +815,6 @@ recouvrement
 \end_inset
 
 )
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -879,7 +844,7 @@ Voici la preuve!
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -903,9 +868,6 @@ Contrôler le contenu des cadres
 \end_layout
 
 \begin_layout Frame
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -962,7 +924,7 @@ ion (sur une diapositive différente), mais ne sera pas aligné correctement
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -996,10 +958,6 @@ Séparateur
 \end_inset
 
  de paragraphe
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1081,7 +1039,7 @@ myframe
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1103,10 +1061,6 @@ Types de cadres particuliers
 \begin_layout PlainFrame
 \SpecialChar LyX
  offre deux types de cadres particuliers:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1168,7 +1122,7 @@ fragile
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1185,10 +1139,6 @@ Structuration d'une présentation
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1241,7 +1191,7 @@ modes
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1261,9 +1211,6 @@ Les parties ont une signification particulière
 \end_layout
 
 \begin_layout Frame
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -1321,7 +1268,7 @@ Ceci signifie par exemple que, si vous utilisez des parties, une table des
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1338,10 +1285,6 @@ Réarranger les cadres
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1390,7 +1333,7 @@ Navigation
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1407,10 +1350,6 @@ L'annexe
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1423,10 +1362,6 @@ Les annexes peuvent être utile pour un contenu additionnel ou mis en réserve.
 \begin_layout Itemize
 Une annexe est insérée comme d'habitude dans \SpecialChar LyX
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1448,10 +1383,6 @@ Début annexe(s) ici
 \end_deeper
 \begin_layout Itemize
 Un contenu typique de l'annexe est la bibliographie
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1512,10 +1443,6 @@ Fondamentalement, les recouvrements permettent de modifier le contenu d'un
  Vous pouvez révéler des objets ou du texte par morceaux, faire s'atténuer
  du contenu, mettre des éléments en évidence, remplacer du texte, des images,
  etc.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1571,7 +1498,7 @@ Vraiment, faites-le!
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1602,10 +1529,6 @@ Beamer
 
  fournit de nombreux types de recouvrement différents.
  Les plus importants sont:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1640,7 +1563,7 @@ Nous donnons des exemples de ces types dans ce qui suit, mais nous commencerons
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1721,10 +1644,6 @@ article
 \end_inset
 
 , etc.)
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1755,10 +1674,6 @@ status collapsed
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1827,10 +1742,6 @@ status collapsed
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1921,7 +1832,7 @@ Notez que \SpecialChar LyX
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -1973,10 +1884,6 @@ Spécifications de recouvrement
 \end_inset
 
 , la citation n’apparaîtra que sur la (sous-)diapo 2:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2019,7 +1926,7 @@ Voilà comment fonctionne le concept, fondamentalement
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2060,10 +1967,6 @@ caché
  est réservé).
  Si nous avions caché la citation sur la diapo précédente au lieu de la
  couvrir, elle n’aurait pris sa place qu'en apparaissant:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2101,12 +2004,16 @@ Home art gone, and ta’en thy wages
 \end_layout
 
 \end_deeper
+\begin_layout Frame
+
+\end_layout
+
 \begin_layout Frame
 Vous pouvez voir comment le texte bouge quand la citation est révélée.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2183,10 +2090,6 @@ transparent
 \end_inset
 
 , le texte couvert est grisé.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2239,7 +2142,7 @@ Beamer
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2276,10 +2179,6 @@ normales
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2325,10 +2224,6 @@ g.,
 
  découvrira tous les éléments de la liste un par un (avec un décalage initial
  de 1) s'il n'y a pas de spécification particulière pour un élément:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2387,7 +2282,7 @@ Beamer
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2440,10 +2335,6 @@ normales
 \noindent
 Ce cadre utilise une spécification de recouvrement implicite qui provoquera,
  pour chaque paragraphe sensible au recouvrement
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2485,7 +2376,7 @@ Un bloc
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2537,10 +2428,6 @@ normales
 \begin_layout Frame
 \noindent
 Et ce cadre utilise une spécification de recouvrement implicite 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2562,7 +2449,7 @@ Et ce cadre utilise une spécification de recouvrement implicite
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2594,10 +2481,6 @@ Pause
 
  vous permet de marquer un endroit à partir duquel le contenu sera couvert
  (implicitement sur une diapo, par rapport au contenu précédent):
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2653,7 +2536,7 @@ Numéro de pause
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2687,10 +2570,6 @@ Beamer
  des paragraphes entiers ou des séquences de paragraphes sur des diapos
  spécifiques.
  Ceux-ci sont:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2720,10 +2599,6 @@ Découvrir
 
  découvre la totalité du contenu dans la diapo spécifiée\SpecialChar ldots
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2781,10 +2656,6 @@ status collapsed
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2815,10 +2686,6 @@ status collapsed
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -2834,7 +2701,7 @@ comme illustré ici.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -2898,10 +2765,6 @@ status collapsed
 
  en \SpecialChar LyX
 :
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3113,7 +2976,7 @@ Insertion
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3153,10 +3016,6 @@ Style de texte
 \end_inset
 
 ) sont sensibles au recouvrement.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3303,10 +3162,6 @@ Environnements spécifiques
 
 \begin_layout Frame
 Des environnements particulièrement adaptés aux présentations sont les suivants:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3336,7 +3191,7 @@ Ils sont brièvement décrits ci-après.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3375,10 +3230,6 @@ indices
 
 .
  La classe fournit 3 blocs pré-définis d'apparence différente:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3481,7 +3332,7 @@ alerte
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3498,10 +3349,6 @@ Gestion des blocs
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3509,10 +3356,6 @@ Gestion des blocs
 En \SpecialChar LyX
 , l'interface des blocs est similaire à celui des cadres, ce qui signifie
  que
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3544,10 +3387,6 @@ Séparateur
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3604,7 +3443,7 @@ Les blocs sont sensibles au recouvrement
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3621,10 +3460,6 @@ Les environnements de théorèmes
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3638,10 +3473,6 @@ Les environnements de théorèmes
 Les théorèmes ressemblent aux blocs lors du rendu, mais leur titre est figé
  (en fonction du type de théorème).
  
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3671,10 +3502,6 @@ Texte de théorème complémentaire
 \end_inset
 
 , vous pouvez compléter le titre figé
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3698,7 +3525,7 @@ uement)
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -3719,17 +3546,10 @@ Les colonnes
 
 \begin_layout Frame
 Il est quelquefois utile de diviser une présentation en colonnes.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout ColumnsTopAligned
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout
 
@@ -3813,10 +3633,6 @@ Colonne
 
 \begin_layout Frame
 Note:
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3920,10 +3736,6 @@ mode
  est une chemin spécifique vers un rendu.
  Il y a plusieurs modes avec des objectifs différents, nous en retiendrons
  particulièrement trois: 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -3988,7 +3800,7 @@ beamer
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4037,19 +3849,11 @@ présentation
 \end_inset
 
 .
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 Qu'est-ce que cela signifie?
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4070,7 +3874,7 @@ article
 \end_deeper
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4113,7 +3917,7 @@ article
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4136,10 +3940,6 @@ Et alors?
 C'est très pratique! Vous pouvez construire un seul document et produire
  à la fois une présentation et – en utilisant le mode article – une version
  papier.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4176,7 +3976,7 @@ et cetera \SpecialChar ldots
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4197,11 +3997,6 @@ Exemples
 
 \begin_layout Frame
 Comme on l'a vu, beaucoup d'éléments sont sensibles au mode.
- 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4315,10 +4110,6 @@ ModePrésentation
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4403,7 +4194,7 @@ Et beaucoup plus de choses de ce style \SpecialChar ldots
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4424,10 +4215,6 @@ Construction d'un article
 
 \begin_layout Frame
 Construire un article beamer est facile.
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4506,10 +4293,6 @@ Les thèmes
 \end_inset
 
 
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4603,7 +4386,7 @@ key "beamer-ug"
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -4625,10 +4408,6 @@ Les thèmes peuvent être modifiés
 \begin_layout Frame
 Mais vous n'êtes pas obligé de construire un thème à partir de rien si vous
  voulez modifier l'apparence
-\begin_inset Separator latexpar
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -4766,9 +4545,6 @@ newblock
 \end_layout
 
 \begin_layout Frame
-\begin_inset Separator latexpar
-\end_inset
-
 
 \end_layout